Updates header and footer

app/assets/stylesheets/participacion.scss

@@ -229,7 +229,7 @@ header {
   background-position: 50% 50%;
   background-size: cover;
   color: $text;
-  min-height: rem-calc(600);
+  min-height: rem-calc(624);
 
   &.results {
     min-height: rem-calc(48);
@@ -543,9 +543,14 @@ footer {
   a {
     color: white;
 
-    &.link:hover {
+    &:hover {
       color: white;
       opacity: .5;
+      transition: opacity 275ms;
+    }
+
+    &:active, &:focus {
+      color: white;
     }
   }
 
@@ -554,7 +559,14 @@ footer {
       text-decoration: underline;
 
       &:hover {
-        color: rgba(255,255,255,.6);
+        color: white;
+        opacity: .5;
+        transition: opacity 275ms;
+      }
+
+      &:active, &:focus {
+        color: white;
+        opacity: 1;
       }
     }
   }
@@ -752,6 +764,13 @@ form {
   }
 }
 
+.captcha {
+
+  label {
+    display: none;
+  }
+}
+
 // 09. Alerts
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -1122,13 +1141,23 @@ table {
 
 .page {
   background: white;
-  min-height: 100%;
+  min-height: rem-calc(600);
 
   .menu {
     margin-top: rem-calc(24);
 
+    ul {
+      list-style-type: none;
+      margin-left: 0;
+
+      & ul {
+        margin-left: rem-calc(12);
+      }
+    }
+
     a {
       display: block;
+      font-size: rem-calc(13);
       margin-bottom: rem-calc(12);
     }
   }
@@ -1137,7 +1166,12 @@ table {
     margin-top: rem-calc(24);
     text-align: justify;
 
-    ul {
+    h1, h2, h3, h4, h5, h6 {
+      text-align: left;
+    }
+
+    ul, ol {
+      margin-left: rem-calc(12);
 
       li {
         font-size: rem-calc(13);
@@ -1146,8 +1180,3 @@ table {
     }
   }
 }
-
-
-
-
-

app/views/layouts/_footer.html.erb

@@ -9,9 +9,13 @@
 
         <p class="footer-description">
           <%= t("layouts.footer.description",
-            open_source: link_to(t('layouts.footer.open_source'), t('layouts.footer.open_source_url'), target: 'blank'),
+            more_info: link_to(t("layouts.footer.more_info"), t("layouts.footer.more_info_url")),
-            github_url:  link_to(t('layouts.footer.github_url'), t('layouts.footer.github_url'), target: 'blank')).html_safe
+            open_source: link_to(t("layouts.footer.open_source"), t("layouts.footer.open_source_url"), target: "blank"),
+            github:  link_to(t("layouts.footer.github"), t("layouts.footer.github_url"), target: "blank")).html_safe
           %>
+          <br>
+          <%= t("layouts.footer.contact_us") %>
+          <%= mail_to "web.gobiernoabierto@madrid.es" %>
         </p>
       </div>
 
@@ -35,7 +39,9 @@
 
     <div class="subfooter row">
       <div class="small-12 column">
-        <%= t("layouts.footer.copyright", year: Time.now.year) %>
+        <%= t("layouts.footer.copyright", year: Time.now.year) %>&nbsp;|&nbsp;
+        <%= link_to t("layouts.footer.privacy"), "/privacy" %>&nbsp;|&nbsp;
+        <%= link_to t("layouts.footer.conditions"), "/conditions" %>
       </div>
     </div>
   </div>

app/views/layouts/_header.html.erb

@@ -3,9 +3,9 @@
     <div class="row">
       <%= render "shared/locale_switcher" %>
       <div class="external-links">
-        <%= link_to t("layouts.header.participation"), root_path, class: "selected" %>&nbsp;|
+        <%= link_to t("layouts.header.participation"), root_path, class: ("selected" unless current_page?("/transparency") || current_page?("/opendata")) %>&nbsp;|
-        <%= link_to t("layouts.header.external_link_transparency"), "/transparency" %>&nbsp;|
+        <%= link_to t("layouts.header.external_link_transparency"), "/transparency", class: ("selected" if current_page?("/transparency")) %>&nbsp;|
-        <%= link_to t("layouts.header.external_link_opendata"), "/opendata" %>
+        <%= link_to t("layouts.header.external_link_opendata"), "/opendata", class: ("selected" if current_page?("/opendata")) %>
       </div>
     </div>
   </section>
@@ -38,10 +38,7 @@
           <%#= link_to t("layouts.header.initiatives"), "#" %>
         </div> -->
         <div class="small-12 medium-2 column end">
-          <%= link_to t("layouts.header.how_it_works"), "/how_it_works" %>
+          <%= link_to t("layouts.header.more_information"), "/more_information" %>
-        </div>
-        <div class="small-12 medium-2 column end">
-          <%= link_to t("layouts.header.help"), "/help" %>
         </div>
         <div class="small-12 medium-2 column end">
           <%= link_to t("layouts.header.external_link_blog"), t("layouts.header.external_link_blog_url"), target: "_blank" %>