diff --git a/config/modules.yml b/config/modules.yml index fef05082..5346884d 100644 --- a/config/modules.yml +++ b/config/modules.yml @@ -7,6 +7,7 @@ services: - @config - @template - @dbal.conn + - @pagination - @request - %core.php_ext% - %core.root_path% @@ -177,6 +178,7 @@ services: - @cache - @config - @dbal.conn + - @pagination - @request - @template - %core.root_path% diff --git a/modules/announcements.php b/modules/announcements.php index 0e524bd0..6ecd405c 100644 --- a/modules/announcements.php +++ b/modules/announcements.php @@ -56,6 +56,9 @@ class announcements extends module_base /** @var \phpbb\db\driver */ protected $db; + /** @var \phpbb\pagination */ + protected $pagination; + /** @var \phpbb\request\request */ protected $request; @@ -76,18 +79,20 @@ class announcements extends module_base * @param \phpbb\config\config $config phpBB config * @param \phpbb\template $template phpBB template * @param \phpbb\db\driver $db Database driver + * @param \phpbb\pagination $pagination phpBB pagination * @param \phpbb\request\request $request phpBB request * @param string $phpEx php file extension * @param string $phpbb_root_path phpBB root path * @param \phpbb\user $user phpBB user object */ - public function __construct($auth, $cache, $config, $template, $db, $request, $phpEx, $phpbb_root_path, $user) + public function __construct($auth, $cache, $config, $template, $db, $pagination, $request, $phpEx, $phpbb_root_path, $user) { $this->auth = $auth; $this->cache = $cache; $this->config = $config; $this->template = $template; $this->db = $db; + $this->pagination = $pagination; $this->request = $request; $this->php_ext = $phpEx; $this->phpbb_root_path = $phpbb_root_path; @@ -280,6 +285,7 @@ class announcements extends module_base 'REPLIES' => $fetch_news[$i]['topic_replies'], 'TOPIC_VIEWS' => $fetch_news[$i]['topic_views'], 'A_ID' => $i, + 'TOPIC_IMG_STYLE' => $folder_img, 'TOPIC_FOLDER_IMG' => $this->user->img($folder_img, $folder_alt), 'TOPIC_FOLDER_IMG_SRC' => $this->user->img($folder_img, $folder_alt, false, '', 'src'), 'TOPIC_FOLDER_IMG_ALT' => $this->user->lang[$folder_alt], @@ -302,7 +308,7 @@ class announcements extends module_base 'S_HAS_ATTACHMENTS' => (!empty($fetch_news[$i]['attachments'])) ? true : false, )); - phpbb_generate_template_pagination($this->template, $view_topic_url, 'announcements_center_row.pagination', 'start', $fetch_news[$i]['topic_replies'] + 1, $this->config['posts_per_page'], 1, true, true); + $this->pagination->generate_template_pagination($view_topic_url, 'announcements_center_row.pagination', 'start', $fetch_news[$i]['topic_replies'] + 1, $this->config['posts_per_page'], 1, true, true); if(!empty($fetch_news[$i]['attachments'])) @@ -319,7 +325,7 @@ class announcements extends module_base $this->template->assign_vars(array( 'AP_PAGINATION' => $pagination, 'TOTAL_ANNOUNCEMENTS' => ($total_announcements == 1) ? $this->user->lang['VIEW_LATEST_ANNOUNCEMENT'] : sprintf($this->user->lang['VIEW_LATEST_ANNOUNCEMENTS'], $total_announcements), - 'AP_PAGE_NUMBER' => phpbb_on_page($this->template, $this->user, '', $total_announcements, $this->config['board3_number_of_announcements_' . $module_id], $start)) + 'AP_PAGE_NUMBER' => $this->pagination->on_page('', $total_announcements, $this->config['board3_number_of_announcements_' . $module_id], $start)) ); } } @@ -378,7 +384,7 @@ class announcements extends module_base 'S_HAS_ATTACHMENTS' => (!empty($fetch_news[$i]['attachments'])) ? true : false, )); - phpbb_generate_template_pagination($this->template, $view_topic_url, 'announcements_center_row.pagination', 'start', $fetch_news[$i]['topic_replies'] + 1, $this->config['posts_per_page'], 1, true, true); + $this->pagination->generate_template_pagination($view_topic_url, 'announcements_center_row.pagination', 'start', $fetch_news[$i]['topic_replies'] + 1, $this->config['posts_per_page'], 1, true, true); if(!empty($fetch_news[$i]['attachments'])) { @@ -395,7 +401,7 @@ class announcements extends module_base $this->template->assign_vars(array( 'AP_PAGINATION' => $pagination, 'TOTAL_ANNOUNCEMENTS' => ($total_announcements == 1) ? $this->user->lang['VIEW_LATEST_ANNOUNCEMENT'] : sprintf($this->user->lang['VIEW_LATEST_ANNOUNCEMENTS'], $total_announcements), - 'AP_PAGE_NUMBER' => phpbb_on_page($this->template, $this->user, '', $total_announcements, $this->config['board3_number_of_announcements_' . $module_id], $start)) + 'AP_PAGE_NUMBER' => $this->pagination->on_page('', $total_announcements, $this->config['board3_number_of_announcements_' . $module_id], $start)) ); } } diff --git a/modules/forumlist.php b/modules/forumlist.php index ae050dd7..5f7d5aaa 100644 --- a/modules/forumlist.php +++ b/modules/forumlist.php @@ -90,7 +90,11 @@ class forumlist extends module_base */ public function get_template_center($module_id) { - display_forums('', $this->config['load_moderators'], false); + if (!function_exists('display_forums')) + { + include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext); + } + \display_forums('', $this->config['load_moderators'], false); $this->template->assign_vars(array( 'FORUM_IMG' => $this->user->img('forum_read', 'NO_NEW_POSTS'), diff --git a/modules/news.php b/modules/news.php index 1a559e36..0aeeeee4 100644 --- a/modules/news.php +++ b/modules/news.php @@ -53,6 +53,9 @@ class news extends module_base /** @var \phpbb\db\driver */ protected $db; + /** @var \phpbb\pagination */ + protected $pagination; + /** @var \phpbb\request\request */ protected $request; @@ -75,18 +78,20 @@ class news extends module_base * @param \phpbb\cache $cache phpBB cache system * @param \phpbb\config\config $config phpBB config * @param \phpbb\db\driver $db phpBB db driver + * @param \phpbb\pagination $pagination phpBB pagination * @param \phpbb\request\request $request phpBB request * @param \phpbb\template $template phpBB template * @param string $phpbb_root_path phpBB root path * @param string $phpEx php file extension * @param \phpbb\user $user phpBB user object */ - public function __construct($auth, $cache, $config, $db, $request, $template, $phpbb_root_path, $phpEx, $user) + public function __construct($auth, $cache, $config, $db, $pagination, $request, $template, $phpbb_root_path, $phpEx, $user) { $this->auth = $auth; $this->cache = $cache; $this->config = $config; $this->db = $db; + $this->pagination = $pagination; $this->request = $request; $this->template = $template; $this->phpbb_root_path = $phpbb_root_path; @@ -255,7 +260,7 @@ class news extends module_base // Grab icons $icons = $this->cache->obtain_icons(); - phpbb_generate_template_pagination($this->template, $view_topic_url, 'pagination', 'np', $fetch_news[$i]['topic_replies'], $this->config['board3_number_of_news_' . $module_id], $start); + $this->pagination->generate_template_pagination($view_topic_url, 'pagination', 'np', $fetch_news[$i]['topic_replies'], $this->config['board3_number_of_news_' . $module_id], $start); $this->template->assign_block_vars('news_row', array( 'ATTACH_ICON_IMG' => ($fetch_news[$i]['attachment'] && $this->config['allow_attachments']) ? $this->user->img('icon_topic_attach', $this->user->lang['TOTAL_ATTACHMENTS']) : '', @@ -309,7 +314,7 @@ class news extends module_base $this->template->assign_vars(array( 'NP_PAGINATION' => $pagination, 'TOTAL_NEWS' => ($total_news == 1) ? sprintf($this->user->lang['VIEW_FORUM_TOPICS'][1], $total_news) : sprintf($this->user->lang['VIEW_FORUM_TOPICS'][2], $total_news), - 'NP_PAGE_NUMBER' => phpbb_on_page($this->template, $this->user, $view_topic_url, $total_news, $this->config['board3_number_of_news_' . $module_id], $start)) + 'NP_PAGE_NUMBER' => $this->pagination->on_page($view_topic_url, $total_news, $this->config['board3_number_of_news_' . $module_id], $start)) ); } } @@ -356,7 +361,7 @@ class news extends module_base 'S_HAS_ATTACHMENTS' => (!empty($fetch_news[$i]['attachments'])) ? true : false, )); - phpbb_generate_template_pagination($this->template, $view_topic_url, 'news_row.pagination', 'start', $fetch_news[$i]['topic_replies'] + 1, $this->config['posts_per_page'], 1, true, true); + $this->pagination->generate_template_pagination($view_topic_url, 'news_row.pagination', 'start', $fetch_news[$i]['topic_replies'] + 1, $this->config['posts_per_page'], 1, true, true); if(!empty($fetch_news[$i]['attachments'])) { @@ -373,7 +378,7 @@ class news extends module_base $this->template->assign_vars(array( 'NP_PAGINATION' => $pagination, 'TOTAL_NEWS' => ($total_news == 1) ? $this->user->lang['VIEW_FORUM_TOPIC'] : $this->user->lang('VIEW_FORUM_TOPICS', $total_news), - 'NP_PAGE_NUMBER' => phpbb_on_page($this->template, $this->user, '', $total_news, $this->config['board3_number_of_news_' . $module_id], $start)) + 'NP_PAGE_NUMBER' => $this->pagination->on_page('', $total_news, $this->config['board3_number_of_news_' . $module_id], $start)) ); } } diff --git a/styles/prosilver/template/event/overall_header_head_append.html b/styles/prosilver/template/event/overall_header_head_append.html index 86922c9a..37158abc 100755 --- a/styles/prosilver/template/event/overall_header_head_append.html +++ b/styles/prosilver/template/event/overall_header_head_append.html @@ -1 +1,4 @@ - + + + + diff --git a/styles/prosilver/template/portal/modules/announcements_center.html b/styles/prosilver/template/portal/modules/announcements_center.html index f3cd3902..9fa8fee8 100644 --- a/styles/prosilver/template/portal/modules/announcements_center.html +++ b/styles/prosilver/template/portal/modules/announcements_center.html @@ -8,7 +8,7 @@
{L_NO_ANNOUNCEMENTS} -
+

id="a" name="a{announcements_center_row.A_ID}">{NEWEST_POST_IMG}{READ_POST_IMG} {announcements_center_row.ATTACH_ICON_IMG} {L_VIEW_TOPIC_POLL}: {announcements_center_row.TITLE}

{announcements_center_row.PAGINATION} diff --git a/styles/prosilver/template/portal/modules/announcements_center_compact.html b/styles/prosilver/template/portal/modules/announcements_center_compact.html index 1bb70070..7e5bcdd6 100644 --- a/styles/prosilver/template/portal/modules/announcements_center_compact.html +++ b/styles/prosilver/template/portal/modules/announcements_center_compact.html @@ -10,32 +10,41 @@ {$CC_BLOCK_H_L} -
style="width: 44%"style="width: 60%">{$TITLE}
+
{$TITLE}
-
{L_REPLIES}
-
{L_VIEWS}
+
{L_REPLIES}
+
{L_VIEWS}
-
{L_LAST_POST}
+
{L_LAST_POST}
{$CC_BLOCK_H_R} -
    +
    • -
      -
      {NEWEST_POST_IMG} {announcements_center_row.ATTACH_ICON_IMG} {L_VIEW_TOPIC_POLL}{announcements_center_row.TITLE}{L_VIEW_UNREAD_POST} - {announcements_center_row.PAGINATION} -
      {L_POSTED} {L_POST_BY_AUTHOR} {announcements_center_row.POSTER_FULL} » {announcements_center_row.TIME} - -
      {L_FORUM}: {announcements_center_row.FORUM_NAME} - -
      {L_GLOBAL_ANNOUNCEMENT} +
      +
      + + {NEWEST_POST_IMG} - {L_REPLIES}: {announcements_center_row.REPLIES} • {L_VIEWS}: {announcements_center_row.TOPIC_VIEWS} +
      + {announcements_center_row.ATTACH_ICON_IMG} + {L_VIEW_TOPIC_POLL} + {announcements_center_row.TITLE} + {L_VIEW_UNREAD_POST} + {announcements_center_row.PAGINATION} +
      {L_POSTED} {L_POST_BY_AUTHOR} {announcements_center_row.POSTER_FULL} » {announcements_center_row.TIME} + +
      {L_FORUM}: {announcements_center_row.FORUM_NAME} + +
      {L_GLOBAL_ANNOUNCEMENT} + + {L_REPLIES}: {announcements_center_row.REPLIES} • {L_VIEWS}: {announcements_center_row.TOPIC_VIEWS} +
      -
      {announcements_center_row.REPLIES} {L_REPLIES}
      -
      {announcements_center_row.TOPIC_VIEWS} {L_VIEWS}
      +
      {announcements_center_row.REPLIES} {L_REPLIES}
      +
      {announcements_center_row.TOPIC_VIEWS} {L_VIEWS}
      -
      {L_LAST_POST}{L_POST_BY_AUTHOR} {announcements_center_row.USERNAME_FULL_LAST} {NEWEST_POST_IMG}{READ_POST_IMG}
      +
      {L_LAST_POST}{L_POST_BY_AUTHOR} {announcements_center_row.USERNAME_FULL_LAST} {NEWEST_POST_IMG}{READ_POST_IMG}
      {announcements_center_row.LAST_POST_TIME}
      diff --git a/styles/prosilver/template/portal/modules/attachments_center.html b/styles/prosilver/template/portal/modules/attachments_center.html index bc1a7462..25ccda7b 100644 --- a/styles/prosilver/template/portal/modules/attachments_center.html +++ b/styles/prosilver/template/portal/modules/attachments_center.html @@ -1,5 +1,5 @@ {$C_BLOCK_H_L}{$TITLE}{$C_BLOCK_H_R} -
      +
      {L_FILENAME}
      diff --git a/styles/prosilver/template/portal/modules/clock_side.html b/styles/prosilver/template/portal/modules/clock_side.html index 0f0e9478..e7adb227 100644 --- a/styles/prosilver/template/portal/modules/clock_side.html +++ b/styles/prosilver/template/portal/modules/clock_side.html @@ -1,32 +1,32 @@ {$LR_BLOCK_H_L} {$TITLE}{$LR_BLOCK_H_R} -
      -
      -
      -
      -
      -
      -
      +
      +
      +
      +
      +
      +
      +
      -
      -
      -
      -
      +
      +
      +
      +
      -
      -
      -
      -
      -
      +
      +
      +
      +
      +
      -
      -
      -
      -
      +
      +
      +
      +
      -
      +
      {$LR_BLOCK_F_L}{$LR_BLOCK_F_R} diff --git a/styles/prosilver/template/portal/modules/donation_center.html b/styles/prosilver/template/portal/modules/donation_center.html index 4544503d..d0396fd3 100644 --- a/styles/prosilver/template/portal/modules/donation_center.html +++ b/styles/prosilver/template/portal/modules/donation_center.html @@ -1,11 +1,11 @@ {$C_BLOCK_H_L}{$TITLE}{$C_BLOCK_H_R}
        -
      • -
        +
      • +
        {SITENAME} {L_DONATION_TEXT}
        -
        +
        @@ -16,7 +16,7 @@ - + checked="checked" /> checked="checked" />
        {poll.poll_option.POLL_OPTION_RESULT}
        @@ -25,7 +25,7 @@
         
        -

        {L_TOTAL_VOTES} : {poll.TOTAL_VOTES}

        +

        {L_TOTAL_VOTES} : {poll.TOTAL_VOTES}

        diff --git a/styles/prosilver/template/portal/modules/portal_clock.js b/styles/prosilver/template/portal/modules/portal_clock.js index a5279c65..7ca0b85d 100644 --- a/styles/prosilver/template/portal/modules/portal_clock.js +++ b/styles/prosilver/template/portal/modules/portal_clock.js @@ -127,27 +127,27 @@ phpbb.b3pClock = function() { var secR = now.getSeconds() % 10; if (hour !== hour_cur) { - phpbb.b3pFlipClock('#portal-clock-front-hours-up', '#portal-clock-front-hours-down', hour, 'double'); + phpbb.b3pFlipClock('.portal-clock-front-hours-up', '.portal-clock-front-hours-down', hour, 'double'); hour_cur = hour; } if (minR !== minR_cur) { - phpbb.b3pFlipClock('#portal-clock-front-minutes-up-right', '#portal-clock-front-minutes-down-right', minR, 'single'); + phpbb.b3pFlipClock('.portal-clock-front-minutes-up-right', '.portal-clock-front-minutes-down-right', minR, 'single'); minR_cur = minR; } if (minL !== minL_cur) { - phpbb.b3pFlipClock('#portal-clock-front-minutes-up-left', '#portal-clock-front-minutes-down-left', minL, 'single'); + phpbb.b3pFlipClock('.portal-clock-front-minutes-up-left', '.portal-clock-front-minutes-down-left', minL, 'single'); minL_cur = minL; } if (secR !== secR_cur) { - phpbb.b3pFlipClock('#portal-clock-front-seconds-up-right', '#portal-clock-front-seconds-down-right', secR, 'single'); + phpbb.b3pFlipClock('.portal-clock-front-seconds-up-right', '.portal-clock-front-seconds-down-right', secR, 'single'); secR_cur = secR; } if (secL !== secL_cur) { - phpbb.b3pFlipClock('#portal-clock-front-seconds-up-left', '#portal-clock-front-seconds-down-left', secL, 'single'); + phpbb.b3pFlipClock('.portal-clock-front-seconds-up-left', '.portal-clock-front-seconds-down-left', secL, 'single'); secL_cur = secL; } }; diff --git a/styles/prosilver/template/portal/modules/recent_center.html b/styles/prosilver/template/portal/modules/recent_center.html index 2f470b4e..29264983 100644 --- a/styles/prosilver/template/portal/modules/recent_center.html +++ b/styles/prosilver/template/portal/modules/recent_center.html @@ -1,20 +1,20 @@ {$C_BLOCK_H_L}{$TITLE}{$C_BLOCK_H_R} -
        +
        • -
          +
          - - + + - -
          + {latest_announcements.TITLE} @@ -23,7 +23,7 @@ + {latest_hot_topics.TITLE} diff --git a/styles/prosilver/template/portal/modules/user_menu_side.html b/styles/prosilver/template/portal/modules/user_menu_side.html index d3a92fa7..6ba1bf8f 100644 --- a/styles/prosilver/template/portal/modules/user_menu_side.html +++ b/styles/prosilver/template/portal/modules/user_menu_side.html @@ -26,7 +26,7 @@
        • - {L_NOTIFICATIONS} [{NOTIFICATIONS_COUNT}] + {L_NOTIFICATIONS} [{NOTIFICATIONS_COUNT}]
        • diff --git a/styles/prosilver/template/portal/modules/welcome_center.html b/styles/prosilver/template/portal/modules/welcome_center.html index 4ca1d6b9..059f3fba 100644 --- a/styles/prosilver/template/portal/modules/welcome_center.html +++ b/styles/prosilver/template/portal/modules/welcome_center.html @@ -1,5 +1,5 @@ {$C_BLOCK_H_L}{$TITLE}{$C_BLOCK_H_R} -
          +
          {PORTAL_WELCOME_MSG}
          diff --git a/styles/prosilver/template/portal/modules/whois_online_center.html b/styles/prosilver/template/portal/modules/whois_online_center.html index e58e2e0e..ef5ed7a8 100644 --- a/styles/prosilver/template/portal/modules/whois_online_center.html +++ b/styles/prosilver/template/portal/modules/whois_online_center.html @@ -1,7 +1,7 @@ {$C_BLOCK_H_L}{$TITLE}{$TITLE}{$C_BLOCK_H_R}
          • -
            +

            {TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})
            {RECORD_USERS}

            {LOGGED_IN_USER_LIST}
            {L_LEGEND}: {PORTAL_LEGEND}

            diff --git a/styles/prosilver/template/portal/portal_body.html b/styles/prosilver/template/portal/portal_body.html index c22e3d96..67bfb358 100644 --- a/styles/prosilver/template/portal/portal_body.html +++ b/styles/prosilver/template/portal/portal_body.html @@ -10,11 +10,12 @@
          - +
          -
          +
          -
          + + - + - - - - - - - - - - + + + + + +
          + + + + + + + + + + +
          + + - + - +
          - +
          -
          + + - + -
          +
            +
          • @@ -25,31 +26,15 @@ -
          - - - - - - - - - - - + +
          +
          @@ -64,13 +49,30 @@
          -
          +
          @@ -81,14 +83,15 @@ -
          +
            +
          • @@ -99,11 +102,12 @@ -
          +
          diff --git a/styles/prosilver/theme/portal.css b/styles/prosilver/theme/portal.css index acb502d1..ff8f1f51 100644 --- a/styles/prosilver/theme/portal.css +++ b/styles/prosilver/theme/portal.css @@ -68,6 +68,29 @@ span.portal-corners-top-inner, span.portal-corners-bottom-inner{ list-style-type: none; } +/** +* Replacement for table layout +*/ +#portal-left, #portal-right { + position: relative; + float: left; +} + +#portal-center-wrapper { + width: 100%; + float: left; + display: block; +} + +#portal-column-area { + width: 100%; + margin: 0 auto; +} + +#portal-left { + margin-left: -100%; +} + /* * top spacing between portal body table and headerbar spacing is usually 10px */ @@ -92,6 +115,10 @@ span.portal-corners-top-inner, span.portal-corners-bottom-inner{ padding: 1px 0 1px 12px; } +#portal-body #viewpoll { + margin-left: 0px; +} + /** * margin spacing as in default prosilver for the forumlist */ @@ -99,6 +126,10 @@ span.portal-corners-top-inner, span.portal-corners-bottom-inner{ margin-bottom: 4px; } +.portal-no-margin { + margin: 0; +} + /* RTL language fixes */ .rtl .portal-navigation ul li a{ background-image: url("./images/portal/arrowbullet_rtl.gif"); @@ -108,48 +139,60 @@ span.portal-corners-top-inner, span.portal-corners-bottom-inner{ /* Portal clock -------------------------------------- */ -#portal-clock { - position: relative; - width: 100%; +.portal-clock-wrapper { + text-align: center; + min-height: 5em; + margin: 0 10%; } -#portal-clock-front, #portal-clock-back { +.portal-clock { + position: relative; + width: 100%; + margin-top: 10px; + margin-bottom: 10px; +} + +.portal-clock * img { + float: left; +} + +.portal-clock-front, .portal-clock-back { position: absolute; top: 0px; } -#portal-clock-front-upper div { +.portal-clock-front-upper div { height: 21px; position: absolute; vertical-align: bottom; visibility: hidden; } -#portal-clock-front-lower div { +.portal-clock-front-lower div { height: 20px; position: absolute; vertical-align: top; visibility: hidden; } -#portal-clock-back-upper div { +.portal-clock-back-upper div { position: absolute; vertical-align: bottom; } -#portal-clock-back-lower div { +.portal-clock-back-lower div { position: absolute; vertical-align: top; } -#portal-clock-back-seconds-up-left, #portal-clock-back-seconds-up-right, -#portal-clock-front-minutes-up-left, #portal-clock-front-minutes-up-right, -#portal-clock-back-minutes-up-left, #portal-clock-back-minutes-up-right, -#portal-clock-front-seconds-up-left, #portal-clock-front-seconds-up-right, -#portal-clock-back-minutes-down-left, #portal-clock-back-minutes-down-right, -#portal-clock-back-seconds-down-left, #portal-clock-back-seconds-down-right, -#portal-clock-front-minutes-down-left, #portal-clock-front-minutes-down-right, -#portal-clock-front-seconds-down-left, #portal-clock-front-seconds-down-right { +.portal-clock-back-seconds-up-left, .portal-clock-back-seconds-up-right, +.portal-clock-front-minutes-up-left, .portal-clock-front-minutes-up-right, +.portal-clock-back-minutes-up-left, .portal-clock-back-minutes-up-right, +.portal-clock-front-seconds-up-left, .portal-clock-front-seconds-up-right, +.portal-clock-back-minutes-down-left, .portal-clock-back-minutes-down-right, +.portal-clock-back-seconds-down-left, .portal-clock-back-seconds-down-right, +.portal-clock-front-minutes-down-left, .portal-clock-front-minutes-down-right, +.portal-clock-front-seconds-down-left, .portal-clock-front-seconds-down-right { width: 21px; height: 21px; background-position: 0 0; @@ -158,91 +201,91 @@ span.portal-corners-top-inner, span.portal-corners-bottom-inner{ /* Minutes start -------------------------------------- */ -#portal-clock-back-minutes-up-left{ +.portal-clock-back-minutes-up-left{ background-position: 0 0; margin: 0 0 0 43px; } -#portal-clock-back-minutes-up-right { +.portal-clock-back-minutes-up-right { background-position: 0 -43px; margin: 0 0 0 64px; } -#portal-clock-front-minutes-up-left { +.portal-clock-front-minutes-up-left { background-position: 0 0; margin: 0 0 0 43px; } -#portal-clock-front-minutes-up-right { +.portal-clock-front-minutes-up-right { background-position: 0 -43px; margin: 0 0 0 63px; } -#portal-clock-back-minutes-down-left{ +.portal-clock-back-minutes-down-left{ background-position: 0 -22px; margin: 21px 0 0 43px; } -#portal-clock-back-minutes-down-right { +.portal-clock-back-minutes-down-right { background-position: 0 -65px; margin: 21px 0 0 64px; } -#portal-clock-front-minutes-down-left { +.portal-clock-front-minutes-down-left { background-position: 0 -22px; margin: 21px 0 0 42px; } -#portal-clock-front-minutes-down-right { +.portal-clock-front-minutes-down-right { background-position: 0 -65px; margin: 21px 0 0 63px; } /* Seconds start ---------------------------------------- */ -#portal-clock-back-seconds-up-left{ +.portal-clock-back-seconds-up-left{ background-position: 0 0; margin: 0 0 0 85px; } -#portal-clock-back-seconds-up-right { +.portal-clock-back-seconds-up-right { background-position: 0 -43px; margin: 0 0 0 106px; } -#portal-clock-front-seconds-up-left { +.portal-clock-front-seconds-up-left { background-position: 0 0; margin: 0 0 0 84px; } -#portal-clock-front-seconds-up-right { +.portal-clock-front-seconds-up-right { background-position: 0 -43px; margin: 0 0 0 105px; } -#portal-clock-back-seconds-down-left{ +.portal-clock-back-seconds-down-left{ background-position: 0 -22px; margin: 21px 0 0 85px; } -#portal-clock-back-seconds-down-right { +.portal-clock-back-seconds-down-right { background-position: 0 -65px; margin: 21px 0 0 106px; } -#portal-clock-front-seconds-down-left { +.portal-clock-front-seconds-down-left { background-position: 0 -22px; margin: 21px 0 0 84px; } -#portal-clock-front-seconds-down-right { +.portal-clock-front-seconds-down-right { background-position: 0 -65px; margin: 21px 0 0 105px; } /* Hours start ---------------------------------------- */ -#portal-clock-back-hours-up, #portal-clock-front-hours-up { +.portal-clock-back-hours-up, .portal-clock-front-hours-up { width: 42px; height: 21px; background: url(./images/portal/portal_clock_double.png) no-repeat; @@ -252,7 +295,7 @@ span.portal-corners-top-inner, span.portal-corners-bottom-inner{ margin: 0 0 0 0; } -#portal-clock-back-hours-down, #portal-clock-front-hours-down { +.portal-clock-back-hours-down, .portal-clock-front-hours-down { width: 42px; height: 20px; background: url(./images/portal/portal_clock_double.png) no-repeat; diff --git a/styles/prosilver/theme/responsive.css b/styles/prosilver/theme/responsive.css new file mode 100644 index 00000000..8edfb950 --- /dev/null +++ b/styles/prosilver/theme/responsive.css @@ -0,0 +1,55 @@ +@media only screen and (max-width: 895px), only screen and (max-device-width: 895px) +{ + #portal-right { margin-left: 0 !important; } + #portal-center { + margin-right: 0 !important; + padding-right: 0 !important; + } +} + +.responsive-portal-announcements dd.views { display: none !important; } +dd.responsive-portal-announcements { display: none !important; } + +.responsive-portal-announcements dd.posts, .responsive-portal-announcements dd.views { + display: none !important; +} + +dt#a { width: 125% !important; } +.responsive-portal-announcements dt { width: 125% !important; } + +@media only screen and (max-width: 950px), only screen and (max-device-width: 950px) +{ + dd.responsive-portal-news { display: none !important; } + + .responsive-portal-news dd.posts, .responsive-portal-news dd.views { + display: none !important; + } + + .responsive-portal-news dt { width: 125% !important; } + dt#n { width: 125% !important; } + .topiclist .topics, .topiclist .posts { display: none !important; } + #portal-forumlist dl.icon dt { width: 125% !important; } +} + +@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) +{ + .responsive-portal-news dd.lastpost, .responsive-portal-announcements dd.lastpost { display: none !important; } + .responsive-portal-news dt .list-inner, .responsive-portal-announcements dt .list-inner { margin-right: 0px !important; } + .responsive-portal-news dt, .responsive-portal-announcements dt { width: 100% !important; } + dt#n, dt#a { width: 100% !important; } + + .portal-responsive-poll .resultbar { + display: none !important; + } + + .portal-responsive-poll dt { width: 45% !important; } + .portal-responsive-poll dd { + width: 45% !important; + float: right !important; + } + + #portal-forumlist dl.icon dt { width: 100% !important; } + #portal-left ul.topiclist dd, #portal-right ul.topiclist dd { display: block !important; } + .portal-responsive-show { display: block !important; } + .portal-responsive-hide { display: none !important; } +}