diff options
| author |   Tristan Darricau <github@nicofuma.fr> | 2017-09-07 14:44:21 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2017-09-07 14:44:21 +0200 |
| commit | c52bb42dcf3267dbe17cb79b654315d49a55f7bb (patch) | |
| tree | fb91881de7eb95738272fbdd7b10611db7adef1e | |
| parent | Merge pull request #4913 from kasimi/ticket/15333 (diff) | |
| parent | [ticket/15309] Add margin to pagination (diff) | |
| download | phpbb-c52bb42dcf3267dbe17cb79b654315d49a55f7bb.tar.gz phpbb-c52bb42dcf3267dbe17cb79b654315d49a55f7bb.tar.bz2 phpbb-c52bb42dcf3267dbe17cb79b654315d49a55f7bb.zip | |
Merge pull request #4919 from sdschulze/ticket/15309
[ticket/15309] Fix pagination overlap in prosilver via "left-box"
* github.com:phpbb/phpbb:
[ticket/15309] Add margin to pagination
[ticket/15309] Right-align responsive pagination for consistency
[ticket/15309] Fix pagination overlap
| -rw-r--r-- | phpBB/styles/prosilver/template/search_results.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/viewforum_body.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 3 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/responsive.css | 9 |
4 files changed, 5 insertions, 13 deletions
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index 997bc28b4b..6bc5c72a87 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -114,7 +114,7 @@ <!-- IF searchresults.TOPIC_REPLIES --><span class="responsive-show left-box" style="display: none;">{L_REPLIES}{L_COLON} <strong>{searchresults.TOPIC_REPLIES}</strong></span><!-- ENDIF --> <!-- ENDIF --> - <div class="responsive-hide"> + <div class="responsive-hide left-box"> <!-- IF searchresults.S_HAS_POLL --><i class="icon fa-bar-chart fa-fw" aria-hidden="true"></i><!-- ENDIF --> <!-- IF searchresults.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i><!-- ENDIF --> {L_POST_BY_AUTHOR} {searchresults.TOPIC_AUTHOR_FULL} » {searchresults.FIRST_POST_TIME} » {L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a> diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index b57f48ba15..7b27a1d904 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -190,11 +190,11 @@ <!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --><br />{L_POSTED} {L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a><!-- ENDIF --> </div> <!-- IF topicrow.REPLIES --> - <span class="responsive-show" style="display: none;">{L_REPLIES}{L_COLON} <strong>{topicrow.REPLIES}</strong></span> + <span class="responsive-show left-box" style="display: none;">{L_REPLIES}{L_COLON} <strong>{topicrow.REPLIES}</strong></span> <!-- ENDIF --> <!-- ENDIF --> - <div class="topic-poster responsive-hide"> + <div class="topic-poster responsive-hide left-box"> <!-- IF topicrow.S_HAS_POLL --><i class="icon fa-bar-chart fa-fw" aria-hidden="true"></i><!-- ENDIF --> <!-- IF topicrow.ATTACH_ICON_IMG --><i class="icon fa-paperclip fa-fw" aria-hidden="true"></i><!-- ENDIF --> {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index ed2cc369b1..348355e8c4 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -886,7 +886,8 @@ fieldset.fields1 dl.pmlist dd.recipients { /* Pagination in viewforum for multipage topics */ .row .pagination { display: block; - margin-top: -12px; + margin-top: 3px; + margin-bottom: 3px; } .row .pagination > ul { diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index 76033a5ce1..250d0b7f7a 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -580,12 +580,3 @@ width: 80px; } } - -@media (max-width: 992px) { - .row .pagination { - text-align: left; - float: left; - margin-top: 4px; - margin-bottom: 4px; - } -} |