Merge pull request #1626 from akvo/#1617-google-translate

[#1617] google translate CSS tweaks
akvo · Jun 23, 2015 · e9b33f2 · e9b33f2
2 parents 41f9c67 + 4d5dda2
commit e9b33f2
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/akvo/rsr/static/styles-src/main.css b/akvo/rsr/static/styles-src/main.css
@@ -1602,6 +1602,10 @@ body.translationBarActive .nav {
   padding-top: 39px; }
 body.translationBarActive .navbar-brand {
   margin-top: 39px; }
+body.translationBarActive article, body.translationBarActive .updateMain, body.translationBarActive .organisationDetail, body.translationBarActive #map {
+  padding-top: 39px; }
+body.translationBarActive div.skiptranslate ~ article, body.translationBarActive div.skiptranslate ~ .updateMain, body.translationBarActive div.skiptranslate ~ .organisationDetail, body.translationBarActive div.skiptranslate ~ #map {
+  padding-top: 0px; }
 
 /* Cookie */
 #cookie-law {

diff --git a/akvo/rsr/static/styles-src/main.scss b/akvo/rsr/static/styles-src/main.scss
@@ -2022,12 +2022,23 @@ dd {
 body {
     &.translationBarActive {
         .nav {
-            padding-top:39px;
+            padding-top: 39px;
+        }
+        .navbar-brand {
+            margin-top: 39px;
+        }
+        article,
+        .updateMain,
+        .organisationDetail,
+        #map {
+            padding-top: 39px;
+        }
+        div.skiptranslate ~ article,
+        div.skiptranslate ~ .updateMain,
+        div.skiptranslate ~ .organisationDetail,
+        div.skiptranslate ~ #map {
+            padding-top: 0px;
         }
-
-       .navbar-brand {
-            margin-top:39px
-       }
     }
 }
 

diff --git a/akvo/templates/navigation/header.html b/akvo/templates/navigation/header.html
@@ -72,6 +72,7 @@ <h1>Akvo RSR</h1> {# Text is just a placeholder, svg from css #}
         </li>
         <li><a href="{% url 'sign_out' %}"><i class="fa fa-sign-out"></i> {% trans 'Sign out' %}</a></li>
         {% endif %}
+        {% if not rsr_page or not rsr_page.google_translation %}
         <li>
           <div class="dropdown langDropdown">
             <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-expanded="false">
@@ -88,7 +89,7 @@ <h1>Akvo RSR</h1> {# Text is just a placeholder, svg from css #}
             </ul>
           </div>
         </li>
-        {% if rsr_page and rsr_page.google_translation = True %}
+        {% else %}
           <li>
             <div class="dropdown langDropdown">
               <div id="google_translate_element"></div>