aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2017-02-15 00:45:59 +0100
committerFlorian Dold <florian.dold@gmail.com>2017-02-15 00:45:59 +0100
commitf6a9fda62511c88ad1dec7dfe4f13e9318ffc430 (patch)
treec38bed96a7bfa87b1708ed615c33e7fc4f6eac19
parentba9b2a94aaa8876bf479d157e9624afbea976eb7 (diff)
downloadwww-f6a9fda62511c88ad1dec7dfe4f13e9318ffc430.tar.gz
www-f6a9fda62511c88ad1dec7dfe4f13e9318ffc430.zip
fix responsive design language bar
-rw-r--r--common/navigation.j2.inc23
-rw-r--r--styles.css12
2 files changed, 34 insertions, 1 deletions
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index a1bda4bf..336936f3 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -1,5 +1,26 @@
1 <div class="navbar navbar-fixed-top navbar-taler" role="navigation"> 1 <div class="navbar navbar-fixed-top navbar-taler" role="navigation">
2 <div class="navbar-header"> 2 <div class="navbar-header">
3 <button class="btn btn-default dropdown-toggle mobile-lang" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
4 <img src="{{ url('images/'+lang+'.png') }}"/></img>
5 <span class="caret"></span>
6 </button>
7 <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
8 <li>
9 <a href="{{ self_localized('en') }}"><img src="{{ url('images/gb.png') }}" height="15" width="23" alt="English">English</a>
10 </li>
11 <li>
12 <a href="{{ self_localized('de') }}"><img src="{{ url('images/de.png') }}" height="15" width="25" alt="Deutsch">Deutsch</a>
13 </li>
14 <li>
15 <a href="{{ self_localized('fr') }}"><img src="{{ url('images/fr.png') }}" height="15" width="22" alt="Français">Français</a>
16 </li>
17 <li>
18 <a href="{{ self_localized('it') }}"><img src="{{ url('images/it.png') }}" height="15" width="22" alt="Italiano">Italiano</a>
19 </li>
20 <li>
21 <a href="{{ self_localized('es') }}"><img src="{{ url('images/es.png') }}" height="15" width="23" alt="Español">Español</a>
22 </li>
23 </ul>
3 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#main-navbar"> 24 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#main-navbar">
4 <span class="sr-only">Toggle navigation</span> 25 <span class="sr-only">Toggle navigation</span>
5 <span class="icon-bar"></span> 26 <span class="icon-bar"></span>
@@ -18,7 +39,7 @@
18 <li class="m_developers"><a href="{{ url_localized('developers.html') }}">{{ _("Developers") }}</a></li> 39 <li class="m_developers"><a href="{{ url_localized('developers.html') }}">{{ _("Developers") }}</a></li>
19 <li class="m_about"><a href="{{ url_localized('about.html') }}">{{ _("About&nbsp;us") }}</a></li> 40 <li class="m_about"><a href="{{ url_localized('about.html') }}">{{ _("About&nbsp;us") }}</a></li>
20 <li> 41 <li>
21 <div class="dropdown"> 42 <div class="dropdown nav-lang">
22 <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> 43 <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
23 <img src="{{ url('images/'+lang+'.png') }}"/></img> 44 <img src="{{ url('images/'+lang+'.png') }}"/></img>
24 <span class="caret"></span> 45 <span class="caret"></span>
diff --git a/styles.css b/styles.css
index 6b6d3c29..833df030 100644
--- a/styles.css
+++ b/styles.css
@@ -16,3 +16,15 @@ html {
16.c_intro { 16.c_intro {
17 height: 100vh; 17 height: 100vh;
18} 18}
19
20/* don't show the language selector in the dropdown on mobile devices,
21 * since it's in the top bar already.
22 */
23.in .nav-lang {
24 display: none;
25}
26
27.mobile-lang {
28 margin-left:5px;
29 margin-top: 8px;
30}