diff options
author | PayBas <contact@paybas.com> | 2014-06-13 14:38:41 +0200 |
---|---|---|
committer | PayBas <contact@paybas.com> | 2014-06-13 14:38:41 +0200 |
commit | 93c39477e02d3f0f78f9da234908b37e47ecf2c5 (patch) | |
tree | aaa529b30cff834da98bc6b4c3ea30fa649d5602 /phpBB/styles/prosilver | |
parent | f17eee19de3b8f59f2a20fe2fcb76db84bfbbfe3 (diff) | |
download | forums-93c39477e02d3f0f78f9da234908b37e47ecf2c5.tar forums-93c39477e02d3f0f78f9da234908b37e47ecf2c5.tar.gz forums-93c39477e02d3f0f78f9da234908b37e47ecf2c5.tar.bz2 forums-93c39477e02d3f0f78f9da234908b37e47ecf2c5.tar.xz forums-93c39477e02d3f0f78f9da234908b37e47ecf2c5.zip |
[ticket/12613] Replaced topic-actions with action-bar
PHPBB3-12613
Diffstat (limited to 'phpBB/styles/prosilver')
-rw-r--r-- | phpBB/styles/prosilver/template/search_results.html | 2 | ||||
-rw-r--r-- | phpBB/styles/prosilver/template/ucp_notifications.html | 6 | ||||
-rw-r--r-- | phpBB/styles/prosilver/template/ucp_pm_message_header.html | 2 | ||||
-rw-r--r-- | phpBB/styles/prosilver/template/viewforum_body.html | 6 | ||||
-rw-r--r-- | phpBB/styles/prosilver/template/viewtopic_body.html | 6 | ||||
-rw-r--r-- | phpBB/styles/prosilver/theme/bidi.css | 4 | ||||
-rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 18 | ||||
-rw-r--r-- | phpBB/styles/prosilver/theme/content.css | 2 | ||||
-rw-r--r-- | phpBB/styles/prosilver/theme/cp.css | 4 | ||||
-rw-r--r-- | phpBB/styles/prosilver/theme/responsive.css | 12 |
10 files changed, 17 insertions, 45 deletions
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index 6ee25682ab..9d6c25b177 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -14,7 +14,7 @@ <!-- IF .pagination or SEARCH_MATCHES or PAGE_NUMBER --> <form method="post" action="{S_SEARCH_ACTION}"> - <div class="topic-actions"> + <div class="action-bar"> <!-- IF SEARCH_MATCHES --> <div class="search-box"> diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html index 70944f37e9..85ec046e16 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications.html +++ b/phpBB/styles/prosilver/template/ucp_notifications.html @@ -42,9 +42,9 @@ </table> <!-- ELSE --> <!-- IF .notification_list --> - <div class="topic-actions"> + <div class="action-bar"> <div class="pagination"> - <!-- IF U_MARK_ALL --><a href="{U_MARK_ALL}">{L_NOTIFICATIONS_MARK_ALL_READ}</a> • <!-- ENDIF --> + <!-- IF U_MARK_ALL --><a href="{U_MARK_ALL}" class="mark">{L_NOTIFICATIONS_MARK_ALL_READ}</a> • <!-- ENDIF --> {L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>] <!-- IF .pagination --> <!-- INCLUDE pagination.html --> @@ -89,7 +89,7 @@ </ul> </div> - <div class="topic-actions"> + <div class="action-bar"> <div class="pagination"> {L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>] <!-- IF .pagination --> diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_header.html b/phpBB/styles/prosilver/template/ucp_pm_message_header.html index c6c5533f3c..ce86c3c138 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html +++ b/phpBB/styles/prosilver/template/ucp_pm_message_header.html @@ -6,7 +6,7 @@ <div class="inner"> <!-- IF FOLDER_STATUS and FOLDER_MAX_MESSAGES neq 0 --><p>{FOLDER_STATUS}</p><!-- ENDIF --> - <div class="topic-actions"> + <div class="action-bar"> <!-- IF U_POST_REPLY_PM or U_POST_NEW_TOPIC or U_FORWARD_PM --> <div class="buttons"> <!-- IF U_POST_REPLY_PM --> diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index 1cc6f93bab..aa92a235c5 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -35,7 +35,7 @@ <!-- ENDIF --> <!-- IF S_DISPLAY_POST_INFO or .pagination or TOTAL_POSTS or TOTAL_TOPICS --> - <div class="topic-actions" <!-- IF S_HAS_SUBFORUM -->style="margin-top: 2em;"<!-- ENDIF -->> + <div class="action-bar" <!-- IF S_HAS_SUBFORUM -->style="margin-top: 2em;"<!-- ENDIF -->> <!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO --> <div class="buttons"> @@ -58,7 +58,7 @@ <!-- ENDIF --> <div class="pagination"> - <!-- IF not S_IS_BOT and U_MARK_TOPICS and .topicrow --><a href="{U_MARK_TOPICS}" accesskey="m" data-ajax="mark_topics_read">{L_MARK_TOPICS_READ}</a> • <!-- ENDIF --> + <!-- IF not S_IS_BOT and U_MARK_TOPICS and .topicrow --><a href="{U_MARK_TOPICS}" class="mark" accesskey="m" data-ajax="mark_topics_read">{L_MARK_TOPICS_READ}</a> • <!-- ENDIF --> {TOTAL_TOPICS} <!-- IF .pagination --> <!-- INCLUDE pagination.html --> @@ -220,7 +220,7 @@ <!-- ENDIF --> <!-- IF .topicrow and not S_DISPLAY_ACTIVE --> - <div class="topic-actions"> + <div class="action-bar"> <!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO --> <div class="buttons"> <a href="{U_POST_NEW_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->post-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->"> diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 6ed0dd6bab..1d68a95cd4 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -25,7 +25,7 @@ </div> <!-- ENDIF --> -<div class="topic-actions"> +<div class="action-bar"> <div class="buttons"> <!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO --> @@ -51,7 +51,7 @@ <!-- IF .pagination or TOTAL_POSTS --> <div class="pagination"> - <!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> • <!-- ENDIF -->{TOTAL_POSTS} + <!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}" class="mark">{L_VIEW_UNREAD_POST}</a> • <!-- ENDIF -->{TOTAL_POSTS} <!-- IF .pagination --> <!-- INCLUDE pagination.html --> <!-- ELSE --> @@ -337,7 +337,7 @@ <!-- ENDIF --> <!-- EVENT viewtopic_body_topic_actions_before --> -<div class="topic-actions"> +<div class="action-bar"> <div class="buttons"> <!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO --> <a href="{U_POST_REPLY_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->"> diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index b1e1e10c3c..f3902b363d 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -641,10 +641,6 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a { margin-left: 0; } -.rtl #cp-main .pagination { - float: left; -} - .rtl #cp-main .buttons { margin-right: 0; margin-left: 0; diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 12297e095b..62aecf4607 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -804,22 +804,6 @@ fieldset.fields1 dl.pmlist dd.recipients { /* Action-bars (container for post/reply buttons, pagination, etc.) ---------------------------------------- */ -.topic-actions { - margin-bottom: 3px; - font-size: 1.1em; - height: 28px; - min-height: 28px; -} -div[class].topic-actions { - height: auto; -} - -.topic-actions:after { - clear: both; - content: ''; - display: block; -} - .action-bar { font-size: 11px; margin: 4px 0; @@ -836,7 +820,7 @@ div[class].topic-actions { .pagination { float: right; font-size: 11px; - margin-top: 5px; + margin-top: 3px; text-align: right; width: auto; } diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 6865af564d..9d87d3217f 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -767,7 +767,7 @@ dl.pmlist dd { margin-bottom: 2px; } -.topic-actions div.dl_links { +.action-bar div.dl_links { padding: 10px 0 0 10px; } diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css index 59887de302..452c2c625e 100644 --- a/phpBB/styles/prosilver/theme/cp.css +++ b/phpBB/styles/prosilver/theme/cp.css @@ -59,10 +59,6 @@ ul.cplist { border-bottom: none; } -#cp-main .pagination { - margin: 0; -} - #cp-main .postbody p { font-size: 1.1em; } diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index 324c5a206b..7117e2c435 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -197,10 +197,6 @@ ul.topiclist li.row dt a.subforum { /* Pagination ----------------------------------------*/ -.pagination { - margin: 5px 0; -} - .pagination > ul { margin: 5px 0 0; } @@ -509,21 +505,21 @@ fieldset.display-actions { margin: 0; } - .topic-actions > .pagination, fieldset.jumpbox, .action-bar > .pagination { + .action-bar > .pagination, fieldset.jumpbox { text-align: center; } - .topic-actions > .pagination, .action-bar > .pagination { + .action-bar > .pagination { float: none; clear: both; padding-bottom: 1px; } - .topic-actions > .pagination li.page-jump { + .action-bar > .pagination li.page-jump { margin: 0 2px; } - .topic-actions > div.search-box, p.jumpbox-return { + .action-bar > div.search-box, p.jumpbox-return { display: none; } |