Merge pull request #4629 from hubaishan/ticket/14975

[ticket/14975] Correct RTL style css
This commit is contained in:
Marc Alexander 2017-02-22 21:49:13 +01:00
commit cf439f2173
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
4 changed files with 19 additions and 8 deletions

View file

@ -1,4 +1,4 @@
<div class="dropdown-container dropdown-container-{S_CONTENT_FLOW_BEGIN} dropdown-button-control sort-tools"> <div class="dropdown-container dropdown-container-left dropdown-button-control sort-tools">
<span title="{L_SORT_OPTIONS}" class="button button-secondary dropdown-trigger dropdown-select"> <span title="{L_SORT_OPTIONS}" class="button button-secondary dropdown-trigger dropdown-select">
<i class="icon fa-sort-amount-asc fa-fw" aria-hidden="true"></i> <i class="icon fa-sort-amount-asc fa-fw" aria-hidden="true"></i>
<span class="caret"><i class="icon fa-sort-down fa-fw" aria-hidden="true"></i></span> <span class="caret"><i class="icon fa-sort-down fa-fw" aria-hidden="true"></i></span>

View file

@ -37,7 +37,7 @@
<ul class="dropdown-contents"> <ul class="dropdown-contents">
<!-- BEGIN jumpbox_forums --> <!-- BEGIN jumpbox_forums -->
<!-- IF jumpbox_forums.FORUM_ID neq -1 --> <!-- IF jumpbox_forums.FORUM_ID neq -1 -->
<li><a href="{jumpbox_forums.LINK}" class="<!-- IF jumpbox_forums.level -->jumpbox-sub-link<!-- ELSEIF jumpbox_forums.S_IS_CAT -->jumpbox-cat-link<!-- ELSE -->jumpbox-forum-link<!-- ENDIF -->"><!-- BEGIN level --><span class="spacer"></span><!-- END level --> <span><!-- IF jumpbox_forums.level --> &#8627; &nbsp;<!-- ENDIF --> {jumpbox_forums.FORUM_NAME}</span></a></li> <li><a href="{jumpbox_forums.LINK}" class="<!-- IF jumpbox_forums.level -->jumpbox-sub-link<!-- ELSEIF jumpbox_forums.S_IS_CAT -->jumpbox-cat-link<!-- ELSE -->jumpbox-forum-link<!-- ENDIF -->"><!-- BEGIN level --><span class="spacer"></span><!-- END level --> <span><!-- IF jumpbox_forums.level --><!-- IF S_CONTENT_DIRECTION eq 'rtl' -->&#8626;<!-- ELSE -->&#8627;<!-- ENDIF --> &nbsp;<!-- ENDIF --> {jumpbox_forums.FORUM_NAME}</span></a></li>
<!-- ENDIF --> <!-- ENDIF -->
<!-- END jumpbox_forums --> <!-- END jumpbox_forums -->
</ul> </ul>

View file

@ -16,13 +16,13 @@
<!-- ENDIF --> <!-- ENDIF -->
<!-- BEGIN pagination --> <!-- BEGIN pagination -->
<!-- IF pagination.S_IS_PREV --> <!-- IF pagination.S_IS_PREV -->
<li class="arrow previous"><a class="button button-icon-only" href="{pagination.PAGE_URL}" rel="prev" role="button"><i class="icon fa-chevron-left fa-fw" aria-hidden="true"></i><span class="sr-only">{L_PREVIOUS}</span></a></li> <li class="arrow previous"><a class="button button-icon-only" href="{pagination.PAGE_URL}" rel="prev" role="button"><i class="icon fa-chevron-{S_CONTENT_FLOW_BEGIN} fa-fw" aria-hidden="true"></i><span class="sr-only">{L_PREVIOUS}</span></a></li>
<!-- ELSEIF pagination.S_IS_CURRENT --> <!-- ELSEIF pagination.S_IS_CURRENT -->
<li class="active"><span>{pagination.PAGE_NUMBER}</span></li> <li class="active"><span>{pagination.PAGE_NUMBER}</span></li>
<!-- ELSEIF pagination.S_IS_ELLIPSIS --> <!-- ELSEIF pagination.S_IS_ELLIPSIS -->
<li class="ellipsis" role="separator"><span>{L_ELLIPSIS}</span></li> <li class="ellipsis" role="separator"><span>{L_ELLIPSIS}</span></li>
<!-- ELSEIF pagination.S_IS_NEXT --> <!-- ELSEIF pagination.S_IS_NEXT -->
<li class="arrow next"><a class="button button-icon-only" href="{pagination.PAGE_URL}" rel="next" role="button"><i class="icon fa-chevron-right fa-fw" aria-hidden="true"></i><span class="sr-only">{L_NEXT}</span></a></li> <li class="arrow next"><a class="button button-icon-only" href="{pagination.PAGE_URL}" rel="next" role="button"><i class="icon fa-chevron-{S_CONTENT_FLOW_END} fa-fw" aria-hidden="true"></i><span class="sr-only">{L_NEXT}</span></a></li>
<!-- ELSE --> <!-- ELSE -->
<li><a class="button" href="{pagination.PAGE_URL}" role="button">{pagination.PAGE_NUMBER}</a></li> <li><a class="button" href="{pagination.PAGE_URL}" role="button">{pagination.PAGE_NUMBER}</a></li>
<!-- ENDIF --> <!-- ENDIF -->

View file

@ -13,6 +13,10 @@
text-align: left; text-align: left;
} }
.rtl p.jumpbox-return {
float: right;
}
.rtl div.rules ul { .rtl div.rules ul {
margin-left: 0; margin-left: 0;
margin-right: 20px; margin-right: 20px;
@ -118,6 +122,11 @@
float: left; float: left;
} }
.rtl .jumpbox .dropdown-contents a {
margin-right: 0;
margin-left: 20px;
}
/* Notifications /* Notifications
-----------------------------------------*/ -----------------------------------------*/
.rtl .notification_list ul li img { .rtl .notification_list ul li img {
@ -595,11 +604,12 @@ li.breadcrumbs span:first-child > a {
*/ */
.rtl .caret { .rtl .caret {
float: right; border-right: 1px solid;
border-right-color: inherit;
border-left: none;
right: 6px;
} }
/* Post control buttons /* Post control buttons
--------------------------------------------- */ --------------------------------------------- */
.rtl .post-buttons { .rtl .post-buttons {
@ -914,7 +924,8 @@ li.breadcrumbs span:first-child > a {
float: right; float: right;
} }
.button-search-end { .rtl .button-search-end {
border-radius: 4px 0 0 4px;
border-left-width: 1px; border-left-width: 1px;
border-right-width: 0; border-right-width: 0;
} }