From 47e178b564b7a5758f9cd1f6c6a52ea6b83073c1 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 8 Sep 2014 17:23:37 +0200 Subject: [PATCH 1/2] [ticket/365] Remove more inline CSS from prosilver files B3P-365 --- .../template/portal/modules/custom_center.html | 6 +++--- .../template/portal/modules/custom_side.html | 4 ++-- .../template/portal/modules/links_side.html | 2 +- .../template/portal/modules/main_menu_side.html | 2 +- .../template/portal/modules/stylechanger_side.html | 2 +- .../template/portal/modules/welcome_center.html | 4 ++-- styles/prosilver/theme/portal.css | 12 ++++++++++++ 7 files changed, 22 insertions(+), 10 deletions(-) diff --git a/styles/prosilver/template/portal/modules/custom_center.html b/styles/prosilver/template/portal/modules/custom_center.html index 48074ae0..d52726f1 100644 --- a/styles/prosilver/template/portal/modules/custom_center.html +++ b/styles/prosilver/template/portal/modules/custom_center.html @@ -1,8 +1,8 @@ {$C_BLOCK_H_L}{$TITLE}{$C_BLOCK_H_R} -
+
-
-
{$CUSTOM_CODE}
+
+
{$CUSTOM_CODE}
diff --git a/styles/prosilver/template/portal/modules/custom_side.html b/styles/prosilver/template/portal/modules/custom_side.html index ce084de0..09405e3b 100644 --- a/styles/prosilver/template/portal/modules/custom_side.html +++ b/styles/prosilver/template/portal/modules/custom_side.html @@ -1,7 +1,7 @@ {$LR_BLOCK_H_L} {$TITLE}{$LR_BLOCK_H_R}
-
-
{$CUSTOM_CODE}
+
+
{$CUSTOM_CODE}
{$LR_BLOCK_F_L}{$LR_BLOCK_F_R} \ No newline at end of file diff --git a/styles/prosilver/template/portal/modules/links_side.html b/styles/prosilver/template/portal/modules/links_side.html index 52588784..d22f5f83 100644 --- a/styles/prosilver/template/portal/modules/links_side.html +++ b/styles/prosilver/template/portal/modules/links_side.html @@ -4,7 +4,7 @@
  • onclick="window.open('{portallinks.LINK_URL}'); return false;">{portallinks.LINK_TITLE}
    • - {L_LINKS_NO_LINKS}
    + {L_LINKS_NO_LINKS}
    diff --git a/styles/prosilver/template/portal/modules/main_menu_side.html b/styles/prosilver/template/portal/modules/main_menu_side.html index f149eb37..99efd49e 100644 --- a/styles/prosilver/template/portal/modules/main_menu_side.html +++ b/styles/prosilver/template/portal/modules/main_menu_side.html @@ -12,7 +12,7 @@
      - {L_MENU_NO_LINKS}
      + {L_MENU_NO_LINKS}
    diff --git a/styles/prosilver/template/portal/modules/stylechanger_side.html b/styles/prosilver/template/portal/modules/stylechanger_side.html index 3583b4a2..475fc765 100644 --- a/styles/prosilver/template/portal/modules/stylechanger_side.html +++ b/styles/prosilver/template/portal/modules/stylechanger_side.html @@ -1,6 +1,6 @@ {$LR_BLOCK_H_L} {$TITLE}{$LR_BLOCK_H_R} - {STYLE_SELECT}
    diff --git a/styles/prosilver/template/portal/modules/welcome_center.html b/styles/prosilver/template/portal/modules/welcome_center.html index aae6c610..130708f2 100644 --- a/styles/prosilver/template/portal/modules/welcome_center.html +++ b/styles/prosilver/template/portal/modules/welcome_center.html @@ -1,8 +1,8 @@ {$C_BLOCK_H_L}{$TITLE}{$C_BLOCK_H_R}
    -
    -
    {PORTAL_WELCOME_MSG}
    +
    +
    {PORTAL_WELCOME_MSG}
    diff --git a/styles/prosilver/theme/portal.css b/styles/prosilver/theme/portal.css index 4b2258ec..24e2cb02 100644 --- a/styles/prosilver/theme/portal.css +++ b/styles/prosilver/theme/portal.css @@ -118,6 +118,18 @@ padding-left: 10px; } +.portal-module-postbody { + width: 100%; +} + +.portal-module-content { + min-height: 1em; +} + +.portal-stylechanger-select { + width: 150px; +} + .portal-paypal-icon { background-image: url("./images/portal/paypal.gif"); background-repeat: no-repeat; From cd1f77a48a27bf1ad157c4560ca9e59858fe4c4e Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 9 Sep 2014 20:25:55 +0200 Subject: [PATCH 2/2] [ticket/365] Move inline CSS of whois online to portal.css B3P-365 --- .../template/portal/modules/whois_online_center.html | 4 ++-- .../template/portal/modules/whois_online_side.html | 4 +++- styles/prosilver/theme/portal.css | 7 +++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/styles/prosilver/template/portal/modules/whois_online_center.html b/styles/prosilver/template/portal/modules/whois_online_center.html index 3305d12d..67705be7 100644 --- a/styles/prosilver/template/portal/modules/whois_online_center.html +++ b/styles/prosilver/template/portal/modules/whois_online_center.html @@ -1,8 +1,8 @@ {$C_BLOCK_H_L}{$TITLE}{$TITLE}{$C_BLOCK_H_R}
    • -
      -

      {TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})
      {RECORD_USERS}

      {LOGGED_IN_USER_LIST} +

      +

      {TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})
      {RECORD_USERS}

      {LOGGED_IN_USER_LIST}
      {L_LEGEND}{L_COLON} {PORTAL_LEGEND}

      • diff --git a/styles/prosilver/template/portal/modules/whois_online_side.html b/styles/prosilver/template/portal/modules/whois_online_side.html index 9d938376..387adec7 100644 --- a/styles/prosilver/template/portal/modules/whois_online_side.html +++ b/styles/prosilver/template/portal/modules/whois_online_side.html @@ -1,3 +1,5 @@ {$LR_BLOCK_H_L} {$TITLE}{$TITLE}{$LR_BLOCK_H_R} -

      {TOTAL_USERS_ONLINE}

      {LOGGED_IN_USER_LIST}

      +
      +

      {TOTAL_USERS_ONLINE}

      {LOGGED_IN_USER_LIST}

      +
      {$LR_BLOCK_F_L}{$LR_BLOCK_F_R} diff --git a/styles/prosilver/theme/portal.css b/styles/prosilver/theme/portal.css index 24e2cb02..5fd508fc 100644 --- a/styles/prosilver/theme/portal.css +++ b/styles/prosilver/theme/portal.css @@ -130,6 +130,13 @@ width: 150px; } +.portal-whois-online-content { + border-left: 0 !important; +} +.portal-whois-online-content p { + margin: 0 5px 0 5px; +} + .portal-paypal-icon { background-image: url("./images/portal/paypal.gif"); background-repeat: no-repeat;