Merge branch 'master' into reorganize_header

app/assets/stylesheets/participacion.scss

@@ -482,6 +482,24 @@ footer {
 // 08. Forms
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
+form.locale-form {
+  display: inline-block;
+  position: relative;
+
+  select {
+    background-image: url("language_select.png");
+
+    &.js-locale-switcher {
+      background-color: transparent;
+      border: 0;
+      color: white;
+      outline: none;
+      padding-left: rem-calc(3);
+      padding-right: rem-calc(24);
+    }
+  }
+}
+
 form {
 
   label {

app/views/shared/_locale_switcher.html.erb

@@ -1,10 +1,8 @@
 <div class="locale">
-  <span>
-    <%= t("layouts.header.language") %>
-    <form>
-      <select class="js-locale-switcher" name='locale-switcher'>
-        <%= available_locale_options_for_select %>
-      </select>
-    </form>
-  </span>
+  <span class="inline-block"><%= t("layouts.header.locale") %></span>
+  <form class="locale-form">
+    <select class="js-locale-switcher" name="locale-switcher">
+      <%= available_locale_options_for_select %>
+    </select>
+  </form>
 </div>