Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2017-01-07 00:18:43 +01:00
commit f8d5b3c417
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
3 changed files with 14 additions and 4 deletions

View file

@ -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}

View file

@ -261,6 +261,10 @@
margin-right: 0;
}
.rtl .topic-poster {
float: right;
padding-left: 0.5em;
}
/* Action Bar styles
---------------------------------------- */

View file

@ -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