Permalink
Browse files

Merge pull request #1606 from kyoshino/bug-962061-footer-rtl

Fix Bug 962061 - Fix the footer RTL layout (language switcher: ltr direction is hard-coded)
  • Loading branch information...
2 parents a28281a + 5e9985b commit 6b3b1bfad294789f43427c50cb5814a75cd34043 @sgarrity sgarrity committed Feb 27, 2014
@@ -3,13 +3,13 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. -#}
{% if translations|length > 1 %}
-<form id="lang_form" dir="ltr" method="get" action="#">
+<form id="lang_form" method="get" action="#">
<label for="language">{{ _('Other languages:') }}</label>
<select id="language" name="lang" dir="ltr">
{% for code, label in translations|dictsort -%}
{# Don't escape the label as it may include entity references
# like "Português (do&nbsp;Brasil)" (Bug 861149) #}
- <option value="{{ code }}"{{ code|ifeq(LANG, " selected") }}>{{ label|safe }}</option>
+ <option lang="{{ code }}" value="{{ code }}"{{ code|ifeq(LANG, " selected") }}>{{ label|safe }}</option>
{% endfor %}
</select>
<noscript>
@@ -57,8 +57,12 @@
}
/* RTL support */
-html[dir="rtl"] {
- #colophon .secondary li:not(:first-child) {
+html[dir="rtl"] #colophon {
+ .secondary li:not(:first-child) {
border-width: 0 1px 0 0;
}
+
+ .footer-lang {
+ float: none;
+ }
}
@@ -947,7 +947,15 @@ nav.menu-bar {
}
}
+}
+html[dir="rtl"] #colophon {
+ .footer-logo,
+ .footer-nav,
+ .footer-license,
+ .footer-lang {
+ float: right;
+ }
}
/* {{{ MWC badge */
@@ -1042,6 +1050,12 @@ nav.menu-bar {
}
}
+ html[dir="rtl"] #colophon {
+ .footer-logo {
+ float: none;
+ }
+ }
+
}
@@ -1228,6 +1242,15 @@ nav.menu-bar {
}
}
+ html[dir="rtl"] #colophon {
+ .footer-logo,
+ .footer-nav,
+ .footer-license,
+ .footer-lang {
+ float: none;
+ }
+ }
+
#nav-main {
#nav-main-menu li {
@@ -686,7 +686,15 @@ nav.menu-bar {
}
}
+}
+html[dir="rtl"] #colophon {
+ .footer-logo,
+ .footer-nav,
+ .footer-license,
+ .footer-lang {
+ float: right;
+ }
}
/* }}} */

0 comments on commit 6b3b1bf

Please sign in to comment.