diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-02-22 21:49:13 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-02-22 21:49:13 +0100 |
| commit | cf439f21735bfc6e05db04529b2f2bea2c25c9ef (patch) | |
| tree | fa78e14235af237dc3c62c0744c4e1abb17e7b96 | |
| parent | dbf7f2b7eee993c4d7df38abad1f917928694c7d (diff) | |
| parent | 3331581ee5218e54e2e5541af1c6321654a59dbc (diff) | |
| download | forums-cf439f21735bfc6e05db04529b2f2bea2c25c9ef.tar forums-cf439f21735bfc6e05db04529b2f2bea2c25c9ef.tar.gz forums-cf439f21735bfc6e05db04529b2f2bea2c25c9ef.tar.bz2 forums-cf439f21735bfc6e05db04529b2f2bea2c25c9ef.tar.xz forums-cf439f21735bfc6e05db04529b2f2bea2c25c9ef.zip | |
Merge pull request #4629 from hubaishan/ticket/14975
[ticket/14975] Correct RTL style css
| -rw-r--r-- | phpBB/styles/prosilver/template/display_options.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/jumpbox.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/pagination.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/bidi.css | 19 |
4 files changed, 19 insertions, 8 deletions
diff --git a/phpBB/styles/prosilver/template/display_options.html b/phpBB/styles/prosilver/template/display_options.html index d1ec3dcef1..a426d08845 100644 --- a/phpBB/styles/prosilver/template/display_options.html +++ b/phpBB/styles/prosilver/template/display_options.html @@ -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"> <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> diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html index 724a963264..284334defd 100644 --- a/phpBB/styles/prosilver/template/jumpbox.html +++ b/phpBB/styles/prosilver/template/jumpbox.html @@ -37,7 +37,7 @@ <ul class="dropdown-contents"> <!-- BEGIN jumpbox_forums --> <!-- 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 --> ↳ <!-- 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' -->↲<!-- ELSE -->↳<!-- ENDIF --> <!-- ENDIF --> {jumpbox_forums.FORUM_NAME}</span></a></li> <!-- ENDIF --> <!-- END jumpbox_forums --> </ul> diff --git a/phpBB/styles/prosilver/template/pagination.html b/phpBB/styles/prosilver/template/pagination.html index 78b0df84e0..5d484517ad 100644 --- a/phpBB/styles/prosilver/template/pagination.html +++ b/phpBB/styles/prosilver/template/pagination.html @@ -16,13 +16,13 @@ <!-- ENDIF --> <!-- BEGIN pagination --> <!-- 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 --> <li class="active"><span>{pagination.PAGE_NUMBER}</span></li> <!-- ELSEIF pagination.S_IS_ELLIPSIS --> <li class="ellipsis" role="separator"><span>{L_ELLIPSIS}</span></li> <!-- 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 --> <li><a class="button" href="{pagination.PAGE_URL}" role="button">{pagination.PAGE_NUMBER}</a></li> <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index f23af1b5fc..860c2f6cb4 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -13,6 +13,10 @@ text-align: left; } +.rtl p.jumpbox-return { + float: right; +} + .rtl div.rules ul { margin-left: 0; margin-right: 20px; @@ -118,6 +122,11 @@ float: left; } +.rtl .jumpbox .dropdown-contents a { + margin-right: 0; + margin-left: 20px; +} + /* Notifications -----------------------------------------*/ .rtl .notification_list ul li img { @@ -595,11 +604,12 @@ li.breadcrumbs span:first-child > a { */ .rtl .caret { - float: right; + border-right: 1px solid; + border-right-color: inherit; + border-left: none; + right: 6px; } - - /* Post control buttons --------------------------------------------- */ .rtl .post-buttons { @@ -914,7 +924,8 @@ li.breadcrumbs span:first-child > a { float: right; } -.button-search-end { +.rtl .button-search-end { + border-radius: 4px 0 0 4px; border-left-width: 1px; border-right-width: 0; } |