From 29918884386d8acb738ccbc93c7e7457b5ddf3b4 Mon Sep 17 00:00:00 2001
From: hubaishan <saeed@hubaishan.com>
Date: Tue, 10 Jan 2017 12:27:25 +0300
Subject: [PATCH 1/3] [ticket/14975] Correct RTL style css
display_options.html corrected to move (display and sorting option) to right
jumpbox.html corrected to change arrow direction to left in RTL
pagination.html corrected to change arrows direction on RTL
bidi.css more edittions to correct remain style mistakes
PHPBB3-14975
---
.../prosilver/template/display_options.html | 2 +-
phpBB/styles/prosilver/template/jumpbox.html | 2 +-
.../styles/prosilver/template/pagination.html | 4 ++--
phpBB/styles/prosilver/theme/bidi.css | 22 +++++++++++++++++--
4 files changed, 24 insertions(+), 6 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 f09493ab3b..78ecb1e6b6 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -13,6 +13,10 @@
text-align: left;
}
+p.jumpbox-return {
+ float: right;
+}
+
.rtl div.rules ul {
margin-left: 0;
margin-right: 20px;
@@ -118,6 +122,11 @@
float: left;
}
+.jumpbox .dropdown-contents a {
+ margin-right: 0px;
+ margin-left: 20px;
+}
+
/* Notifications
-----------------------------------------*/
.rtl .notification_list ul li img {
@@ -261,6 +270,10 @@
margin-right: 0;
}
+.rtl .topic-poster {
+ float: right;
+ padding-left: 0.5em;
+}
/* Action Bar styles
---------------------------------------- */
@@ -596,7 +609,11 @@ li.breadcrumbs span:first-child > a {
*/
.rtl .caret {
- float: right;
+ left: -6px;
+ right: inherit;
+ border-right: 1px solid;
+ border-right-color: inherit;
+ border-left: none;
}
@@ -915,9 +932,10 @@ li.breadcrumbs span:first-child > a {
float: right;
}
-.button-search-end {
+.rtl .button-search-end {
border-left-width: 1px;
border-right-width: 0;
+ border-radius: 4px 0 0 4px;
}
.rtl .search-header .button-search-end {
From f47d2441518e0608b87749ee2cee819d5d0644bb Mon Sep 17 00:00:00 2001
From: Saeed Hubaishan <hubaishan@users.noreply.github.com>
Date: Mon, 30 Jan 2017 07:39:25 +0300
Subject: [PATCH 2/3] [ticket/14975] add missing .rtl
[ticket/14975] add missing .rtl and resolve conflict
[PHPBB3-14975]
---
phpBB/styles/prosilver/theme/bidi.css | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index 78ecb1e6b6..3268c71515 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -13,7 +13,7 @@
text-align: left;
}
-p.jumpbox-return {
+.rtl p.jumpbox-return {
float: right;
}
@@ -122,7 +122,7 @@ p.jumpbox-return {
float: left;
}
-.jumpbox .dropdown-contents a {
+.rtl .jumpbox .dropdown-contents a {
margin-right: 0px;
margin-left: 20px;
}
@@ -270,11 +270,6 @@ p.jumpbox-return {
margin-right: 0;
}
-.rtl .topic-poster {
- float: right;
- padding-left: 0.5em;
-}
-
/* Action Bar styles
---------------------------------------- */
.rtl .action-bar .button {
From 3331581ee5218e54e2e5541af1c6321654a59dbc Mon Sep 17 00:00:00 2001
From: Saeed Hubaishan <hubaishan@users.noreply.github.com>
Date: Wed, 22 Feb 2017 13:30:48 +0300
Subject: [PATCH 3/3] [ticket/14975] Changes requested by hanakin
[ticket/14975] Changes requested by hanakin
[PHPBB3-14975]
---
phpBB/styles/prosilver/theme/bidi.css | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index 3268c71515..860c2f6cb4 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -123,7 +123,7 @@
}
.rtl .jumpbox .dropdown-contents a {
- margin-right: 0px;
+ margin-right: 0;
margin-left: 20px;
}
@@ -604,15 +604,12 @@ li.breadcrumbs span:first-child > a {
*/
.rtl .caret {
- left: -6px;
- right: inherit;
border-right: 1px solid;
border-right-color: inherit;
border-left: none;
+ right: 6px;
}
-
-
/* Post control buttons
--------------------------------------------- */
.rtl .post-buttons {
@@ -928,9 +925,9 @@ li.breadcrumbs span:first-child > a {
}
.rtl .button-search-end {
+ border-radius: 4px 0 0 4px;
border-left-width: 1px;
border-right-width: 0;
- border-radius: 4px 0 0 4px;
}
.rtl .search-header .button-search-end {