Merge branch 'release/v2.0.33'

voxe · Oct 4, 2014 · 466f935 · 466f935
2 parents c6f10bd + c40f015
commit 466f935
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/app/assets/stylesheets/web/app.css.sass b/app/assets/stylesheets/web/app.css.sass
@@ -500,18 +500,16 @@ a.button
   margin-top: 2px
   margin-left: 10px
 
+#languages
+  a
+    margin-left: 2px
+
 #appstores
   position: fixed
   bottom: 5px
   right: 5px
   z-index: 2
 
-#languages
-  position: fixed
-  bottom: 5px
-  left: 5px
-  z-index: 2
-
 #user-profile img
   margin-right: 4px
 

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -15,14 +15,6 @@
   %body{:class => "#{controller_name} #{action_name}"}
     = render 'layouts/partials/facebook'
 
-    #languages
-      = link_to url_for(locale: 'en') do
-        = image_tag 'tiny_flags/en.gif'
-      = link_to url_for(locale: 'fr') do
-        = image_tag 'tiny_flags/fr.gif'
-      = link_to url_for(locale: 'pt-BR') do
-        = image_tag 'tiny_flags/br.gif'
-
     #appstores
       = link_to_app_store image_tag("web/app-store-fr-small.png")
       = link_to_android_market image_tag("web/android-market-small.png")
@@ -40,6 +32,14 @@
             <img src="//ssl.gstatic.com/images/icons/gplus-16.png" alt="Google+" style="border:0;width:16px;height:16px;"/></a>
 
         %ul#nav
+          %li#languages
+            = link_to url_for(locale: 'en') do
+              = image_tag 'tiny_flags/en.gif'
+            = link_to url_for(locale: 'fr') do
+              = image_tag 'tiny_flags/fr.gif'
+            = link_to url_for(locale: 'pt-BR') do
+              = image_tag 'tiny_flags/br.gif'
+          %li ·
           %li= link_to t("navigation.candidates"), new_backoffice_my_profile_path
           %li ·
           %li= link_to "Blog", "http://blog.voxe.org"
@@ -50,6 +50,7 @@
           %li ·
           %li= link_to t("navigation.API"), platform_path, target: "_blank"
           %li ·
+
       #top
         = link_to image_tag('icons/32.png', valign: "middle"), root_path
     = yield