aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2017-01-07 00:18:40 +0100
committerMarc Alexander <admin@m-a-styles.de>2017-01-07 00:18:40 +0100
commite096137537d1526ae914c73c66619cd1821c2f7a (patch)
treec3dc29abbb78f5ce638aca83e297884293e3692c
parent7074876f3298df301bad89c1a55c4265aad4c710 (diff)
parentba82dfa49ec585c9f9498c5a7f2d8ea8038e7143 (diff)
downloadforums-e096137537d1526ae914c73c66619cd1821c2f7a.tar
forums-e096137537d1526ae914c73c66619cd1821c2f7a.tar.gz
forums-e096137537d1526ae914c73c66619cd1821c2f7a.tar.bz2
forums-e096137537d1526ae914c73c66619cd1821c2f7a.tar.xz
forums-e096137537d1526ae914c73c66619cd1821c2f7a.zip
Merge pull request #4620 from marc1706/ticket/14772
[ticket/14772] Use float to prevent pagination overwriting topic time
-rw-r--r--phpBB/styles/prosilver/template/viewforum_body.html2
-rw-r--r--phpBB/styles/prosilver/theme/bidi.css4
-rw-r--r--phpBB/styles/prosilver/theme/common.css12
3 files changed, 14 insertions, 4 deletions
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index 9824989687..7df57106e1 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -192,7 +192,7 @@
<!-- 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">
+ <div class="topic-poster 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} &raquo; {topicrow.FIRST_POST_TIME}
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index f09493ab3b..5e9b4cfb2d 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -261,6 +261,10 @@
margin-right: 0;
}
+.rtl .topic-poster {
+ float: right;
+ padding-left: 0.5em;
+}
/* Action Bar styles
---------------------------------------- */
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 8505ac13f9..4765230f6c 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -878,7 +878,7 @@ fieldset.fields1 dl.pmlist dd.recipients {
/* Pagination in viewforum for multipage topics */
.row .pagination {
display: block;
- margin-top: -12px;
+ margin-top: 0.3em;
}
.row .pagination > ul {
@@ -887,8 +887,14 @@ fieldset.fields1 dl.pmlist dd.recipients {
.row .pagination li a, .row .pagination li span {
border-radius: 2px;
- padding: 1px 3px;
- font-size: 9px;
+ padding: 1px 3px;
+ font-size: 9px;
+}
+
+.topic-poster {
+ float: left;
+ padding-right: 0.5em;
+ margin-top: 0.3em;
}
/* jQuery popups