diff options
| author | Cesar G <prototech91@gmail.com> | 2015-11-15 11:39:18 -0800 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2015-11-15 11:39:18 -0800 |
| commit | cbf9408e66eeddf2d53b87427bf8cb1f3d013a5c (patch) | |
| tree | 9a8a38de3c5c45e72107cf68404f3ed306b8e66f | |
| parent | 780e472458a3cba7c875f194bd6a37733ae195e3 (diff) | |
| parent | 34cf35759980b78d572a5f10c664545aab928d58 (diff) | |
| download | forums-cbf9408e66eeddf2d53b87427bf8cb1f3d013a5c.tar forums-cbf9408e66eeddf2d53b87427bf8cb1f3d013a5c.tar.gz forums-cbf9408e66eeddf2d53b87427bf8cb1f3d013a5c.tar.bz2 forums-cbf9408e66eeddf2d53b87427bf8cb1f3d013a5c.tar.xz forums-cbf9408e66eeddf2d53b87427bf8cb1f3d013a5c.zip | |
Merge pull request #3960 from hanakin/ticket/14229
[ticket/14229]Responsive topic specific paging
| -rw-r--r-- | phpBB/styles/prosilver/template/viewforum_body.html | 14 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 3 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/content.css | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/links.css | 1 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/responsive.css | 24 |
5 files changed, 37 insertions, 9 deletions
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index f36e17369e..61b5620598 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -189,6 +189,13 @@ <!-- IF topicrow.REPLIES --><span class="responsive-show left-box" style="display: none;">{L_REPLIES}{L_COLON} <strong>{topicrow.REPLIES}</strong></span><!-- ENDIF --> <!-- ENDIF --> + <div class="responsive-hide"> + <!-- 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} + <!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --> » {L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a><!-- ENDIF --> + </div> + <!-- IF .topicrow.pagination --> <div class="pagination"> <span><i class="icon fa-clone fa-fw" aria-hidden="true"></i></span> @@ -205,13 +212,6 @@ </div> <!-- ENDIF --> - <div class="responsive-hide"> - <!-- 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} - <!-- IF topicrow.S_POST_GLOBAL and FORUM_ID != topicrow.FORUM_ID --> » {L_IN} <a href="{topicrow.U_VIEW_FORUM}">{topicrow.FORUM_NAME}</a><!-- ENDIF --> - </div> - <!-- EVENT topiclist_row_append --> </div> </dt> diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index e5a147f034..af8fa33632 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -807,7 +807,6 @@ fieldset.fields1 dl.pmlist dd.recipients { ---------------------------------------- */ .pagination { float: right; - margin-top: 3px; text-align: right; width: auto; } @@ -876,7 +875,7 @@ fieldset.fields1 dl.pmlist dd.recipients { /* Pagination in viewforum for multipage topics */ .row .pagination { display: block; - margin-top: 0; + margin-top: -12px; } .row .pagination > ul { diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 6de5126ca1..ef18e26ef1 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -149,6 +149,10 @@ dl.row-item dt, dl.row-item dd { min-height: 35px; } +dl.row-item dt a { + display: inline; +} + dl a.row-item-link { /* topic row icon links */ display: block; width: 30px; diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css index 02a4ae73a0..a018bbc792 100644 --- a/phpBB/styles/prosilver/theme/links.css +++ b/phpBB/styles/prosilver/theme/links.css @@ -73,6 +73,7 @@ a.topictitle { font-size: 1.2em; font-weight: bold; text-decoration: none; + display: inline; } a.topictitle:hover { diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index 826972fdac..6d74c5772e 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -280,6 +280,11 @@ margin: 5px 0 0; } + .row .pagination { + margin-top: 2px; + margin-bottom: 2px; + } + .row .pagination .ellipsis + li { display: none !important; } @@ -557,3 +562,22 @@ .postbody { width: 70%; } } +@media (min-width: 701px) and (max-width: 950px) { + .row .pagination { + margin-top: 2px; + margin-bottom: 2px; + } + + ul.topiclist dt { + margin-right: -410px; + } + + ul.topiclist dt .list-inner { + margin-right: 410px; + } + + dd.posts, dd.topics, dd.views { + width: 80px; + } +} + |