aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-09-14 14:42:53 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-09-14 14:42:53 +0200
commitfe0e9b2e4c0b83aa00a3f7bbecc82446a7f28bc0 (patch)
tree235bd25ef9d63fe945e076b6d2eca2b54e0e2f03
parent3303ce511f44a26f35db4c290dad519397efb11a (diff)
parent71def7cda6b3ce7b1ff06f0c1ce934798aeae200 (diff)
downloadforums-fe0e9b2e4c0b83aa00a3f7bbecc82446a7f28bc0.tar
forums-fe0e9b2e4c0b83aa00a3f7bbecc82446a7f28bc0.tar.gz
forums-fe0e9b2e4c0b83aa00a3f7bbecc82446a7f28bc0.tar.bz2
forums-fe0e9b2e4c0b83aa00a3f7bbecc82446a7f28bc0.tar.xz
forums-fe0e9b2e4c0b83aa00a3f7bbecc82446a7f28bc0.zip
Merge pull request #3837 from hanakin/ticket/14107
[ticket/14107] Fix dropdown rtl states
-rw-r--r--phpBB/styles/prosilver/template/jumpbox.html4
-rw-r--r--phpBB/styles/prosilver/template/viewtopic_body.html2
-rw-r--r--phpBB/styles/prosilver/theme/bidi.css6
3 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html
index 15c69aeed2..5053c9a55f 100644
--- a/phpBB/styles/prosilver/template/jumpbox.html
+++ b/phpBB/styles/prosilver/template/jumpbox.html
@@ -11,7 +11,7 @@
<!-- IF S_DISPLAY_JUMPBOX -->
- <div class="jumpbox dropdown-container dropdown-container-{S_CONTENT_FLOW_END}<!-- IF not S_IN_MCP --> dropdown-up<!-- ENDIF --> dropdown-{S_CONTENT_FLOW_BEGIN} dropdown-button-control" id="jumpbox">
+ <div class="jumpbox dropdown-container dropdown-container-right<!-- IF not S_IN_MCP --> dropdown-up<!-- ENDIF --> dropdown-{S_CONTENT_FLOW_BEGIN} dropdown-button-control" id="jumpbox">
<span title="<!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->" class="dropdown-trigger button dropdown-select">
<!-- IF S_IN_MCP and S_MERGE_SELECT -->{L_SELECT_TOPICS_FROM}<!-- ELSEIF S_IN_MCP -->{L_MODERATE_FORUM}<!-- ELSE -->{L_JUMP_TO}<!-- ENDIF -->
</span>
@@ -29,4 +29,4 @@
<!-- ELSE -->
<br /><br />
-<!-- ENDIF --> \ No newline at end of file
+<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index b7506608d9..05a643482f 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -371,7 +371,7 @@
<!-- INCLUDE viewtopic_topic_tools.html -->
<!-- IF .quickmod -->
- <div class="dropdown-container dropdown-container-{S_CONTENT_FLOW_BEGIN} dropdown-up dropdown-{S_CONTENT_FLOW_END} dropdown-button-control" id="quickmod">
+ <div class="dropdown-container dropdown-container-left dropdown-up dropdown-{S_CONTENT_FLOW_END} dropdown-button-control" id="quickmod">
<span title="{L_QUICK_MOD}" class="dropdown-trigger button icon-button modtools-icon dropdown-select">{L_QUICK_MOD}</span>
<div class="dropdown hidden">
<div class="pointer"><div class="pointer-inner"></div></div>
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index f3468ebcf2..47d4823fdb 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -88,7 +88,7 @@
/* Dropdown menu
---------------------------------------- */
-.rtl .dropdown-container.topic-tools {
+.rtl .dropdown-container.topic-tools, .rtl .dropdown-container-left {
float: right;
}
@@ -114,12 +114,12 @@
text-align: right;
}
-.rtl .dropdown-extended .header .header_settings {
+.rtl .dropdown-extended .header .header_settings, .rtl .dropdown-container-right {
float: left;
}
/* Notifications
-----------------------------------------*/
+-----------------------------------------*/
.rtl .notification_list ul li img {
float: right;
margin-left: 5px;