mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-07 20:08:53 +00:00
Merge branch '3.2.x'
This commit is contained in:
commit
5e06278f62
4 changed files with 14 additions and 22 deletions
|
@ -189,7 +189,9 @@
|
|||
{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} « <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{topicrow.LAST_POST_TIME}</a>
|
||||
<!-- 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 left-box" style="display: none;">{L_REPLIES}{L_COLON} <strong>{topicrow.REPLIES}</strong></span><!-- ENDIF -->
|
||||
<!-- IF topicrow.REPLIES -->
|
||||
<span class="responsive-show" style="display: none;">{L_REPLIES}{L_COLON} <strong>{topicrow.REPLIES}</strong></span>
|
||||
<!-- ENDIF -->
|
||||
<!-- ENDIF -->
|
||||
|
||||
<div class="topic-poster responsive-hide">
|
||||
|
|
|
@ -285,11 +285,6 @@
|
|||
margin-left: 5px;
|
||||
}
|
||||
|
||||
.rtl .topic-poster {
|
||||
float: right;
|
||||
padding-left: 0.5em;
|
||||
}
|
||||
|
||||
/* Action Bar styles
|
||||
---------------------------------------- */
|
||||
.rtl .action-bar .button {
|
||||
|
|
|
@ -957,7 +957,7 @@ fieldset.fields1 dl.pmlist dd.recipients {
|
|||
/* Pagination in viewforum for multipage topics */
|
||||
.row .pagination {
|
||||
display: block;
|
||||
margin-top: 0.3em;
|
||||
margin-top: -12px;
|
||||
}
|
||||
|
||||
.row .pagination > ul {
|
||||
|
@ -971,12 +971,6 @@ fieldset.fields1 dl.pmlist dd.recipients {
|
|||
padding: 1px 3px;
|
||||
}
|
||||
|
||||
.topic-poster {
|
||||
float: left;
|
||||
padding-right: 0.5em;
|
||||
margin-top: 0.3em;
|
||||
}
|
||||
|
||||
/* jQuery popups
|
||||
---------------------------------------- */
|
||||
.phpbb_alert {
|
||||
|
|
|
@ -311,11 +311,6 @@
|
|||
margin: 5px 0 0;
|
||||
}
|
||||
|
||||
.row .pagination {
|
||||
margin-top: 2px;
|
||||
margin-bottom: 2px;
|
||||
}
|
||||
|
||||
.row .pagination .ellipsis + li {
|
||||
display: none !important;
|
||||
}
|
||||
|
@ -628,10 +623,6 @@
|
|||
}
|
||||
|
||||
@media (min-width: 701px) and (max-width: 950px) {
|
||||
.row .pagination {
|
||||
margin-top: 2px;
|
||||
margin-bottom: 2px;
|
||||
}
|
||||
|
||||
ul.topiclist dt {
|
||||
margin-right: -410px;
|
||||
|
@ -647,4 +638,14 @@
|
|||
width: 80px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 992px) {
|
||||
.row .pagination {
|
||||
text-align: left;
|
||||
float: left;
|
||||
margin-top: 4px;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
}
|
||||
|
||||
/* stylelint-enable */
|
||||
|
|
Loading…
Add table
Reference in a new issue