Improves styles and texts for footer

This commit is contained in:
Alberto Garcia Cabeza
2015-09-10 13:13:28 +02:00
parent 02c101cd97
commit 98937e4467
4 changed files with 44 additions and 56 deletions

View File

@@ -262,7 +262,8 @@ h6 {
} }
.footer { .footer {
background: $brand; background: #DEE0E2;
border-top: rem-calc(10) solid $brand;
} }
// 04. Header // 04. Header
@@ -542,6 +543,7 @@ header {
} }
.top-links { .top-links {
background: #0B0C0C;
color: white; color: white;
font-size: rem-calc(14); font-size: rem-calc(14);
@@ -609,61 +611,55 @@ header {
// - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - -
footer { footer {
color: white; color: #171819;
padding: rem-calc(24) 0 rem-calc(48) 0; padding: rem-calc(48) 0;
.logo { .logo {
@include logo; @include logo;
a { a {
color: #454A4C;
line-height: rem-calc(36); line-height: rem-calc(36);
padding-left: 0; padding-left: 0;
text-decoration: none;
} }
} }
h4 { p {
color: white; font-size: rem-calc(14);
font-weight: normal;
} }
a { a, a:active, a:focus {
color: white; color: #454A4C;
text-decoration: underline;
&:hover { &:hover {
color: white; color: #171819;
opacity: .5;
transition: opacity 275ms;
}
&:active, &:focus {
color: white;
}
}
.footer-description {
a {
text-decoration: underline;
&:hover {
color: white;
opacity: .5;
transition: opacity 275ms;
}
&:active, &:focus {
color: white;
opacity: 1;
}
} }
} }
.footer-sections { .footer-sections {
padding-left: 0; padding-left: 0;
} }
h4 {
a {
border-bottom: 1px solid #BFC1C3;
display: block;
margin-bottom: rem-calc(6);
padding-bottom: rem-calc(6);
text-decoration: none;
}
}
} }
.subfooter { .subfooter {
padding-top: $line-height; border-top: 1px solid #BFC1C3;
opacity: .75;
margin-top: rem-calc(24);
padding-top: rem-calc(12);
} }
// 06. Tags // 06. Tags

View File

@@ -2,23 +2,22 @@
<div class="row-full"> <div class="row-full">
<div class="row"> <div class="row">
<div class="small-12 medium-4 column"> <div class="small-12 large-4 column">
<div class="logo"> <div class="logo">
<%= link_to t("layouts.header.open_gov", open: "#{t('layouts.header.open')}").html_safe %> <%= link_to t("layouts.header.open_gov", open: "#{t('layouts.header.open')}").html_safe %>
</div> </div>
<p class="footer-description"> <p>
<%= t("layouts.footer.description", <%= t("layouts.footer.description",
more_info: link_to(t("layouts.footer.more_info"), t("layouts.footer.more_info_url")),
open_source: link_to(t("layouts.footer.open_source"), t("layouts.footer.open_source_url"), target: "blank"), 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 consul: link_to(t("layouts.footer.consul"), t("layouts.footer.consul_url"), target: "blank")).html_safe
%> %>
<%= t("layouts.footer.contact_us") %> <%= t("layouts.footer.contact_us") %>
<%= mail_to "web.gobiernoabierto@madrid.es" %> <%= mail_to "web.gobiernoabierto@madrid.es" %>
</p> </p>
</div> </div>
<div class="footer-sections small-12 medium-8 column"> <div class="footer-sections small-12 large-8 column">
<div class="small-12 medium-4 column"> <div class="small-12 medium-4 column">
<h4> <h4>
<%= link_to t("layouts.footer.participation_title"), root_path %> <%= link_to t("layouts.footer.participation_title"), root_path %>
@@ -45,6 +44,7 @@
<div class="subfooter row"> <div class="subfooter row">
<div class="small-12 column"> <div class="small-12 column">
<%= t("layouts.footer.copyright", year: Time.now.year) %>&nbsp;|&nbsp; <%= t("layouts.footer.copyright", year: Time.now.year) %>&nbsp;|&nbsp;
<%= link_to t("layouts.footer.more_info"), "/more_information" %>&nbsp;|&nbsp;
<%= link_to t("layouts.footer.privacy"), "/privacy" %>&nbsp;|&nbsp; <%= link_to t("layouts.footer.privacy"), "/privacy" %>&nbsp;|&nbsp;
<%= link_to t("layouts.footer.conditions"), "/conditions" %> <%= link_to t("layouts.footer.conditions"), "/conditions" %>
</div> </div>

View File

@@ -32,16 +32,11 @@ en:
debates: Debates debates: Debates
# initiatives: Initiatives # initiatives: Initiatives
footer: footer:
description: description: "This portal use %{consul}, is %{open_source}. Madrid, for the whole world."
"The city you want, it will be the city you want. %{more_info} here on this page. open_source: "software libre"
This Open Government Portal use Consul v.0.9 application, is %{open_source}, and code is in %{github}.
Madrid, for the whole world."
more_info: Get more information
more_info_url: "/more_information"
open_source: "software libre AGPLv3"
open_source_url: "http://www.gnu.org/licenses/agpl-3.0.html" open_source_url: "http://www.gnu.org/licenses/agpl-3.0.html"
github: "github" consul: "Consul application"
github_url: "https://github.com/ayuntamientomadrid" consul_url: "https://github.com/ayuntamientomadrid"
copyright: "Ayuntamiento de Madrid, %{year}" copyright: "Ayuntamiento de Madrid, %{year}"
participation_title: "Participation" participation_title: "Participation"
participation_text: Decide what should be the city of Madrid you want. participation_text: Decide what should be the city of Madrid you want.
@@ -52,6 +47,7 @@ en:
contact_us: "Contact us" contact_us: "Contact us"
privacy: "Privacy Policy" privacy: "Privacy Policy"
conditions: "Terms of use" conditions: "Terms of use"
more_info: "More information"
form: form:
error: error error: error
errors: errors errors: errors

View File

@@ -32,16 +32,11 @@ es:
debates: Debates debates: Debates
# initiatives: Iniciativas # initiatives: Iniciativas
footer: footer:
description: description: "Este portal usa la %{consul} que es %{open_source}. De Madrid, para el mundo entero."
"La ciudad que quieres, será la ciudad que quieras. %{more_info} sobre esta página. open_source: "software libre"
Este Portal de Gobierno Abierto usa la aplicación Consul v.0.9 que es %{open_source}, y su código se encuentra en %{github}.
De Madrid, para el mundo entero."
more_info: Obtén más información
more_info_url: "/more_information"
open_source: "software libre AGPLv3"
open_source_url: "http://www.gnu.org/licenses/agpl-3.0.html" open_source_url: "http://www.gnu.org/licenses/agpl-3.0.html"
github: "github" consul: "aplicación Consul"
github_url: "https://github.com/ayuntamientomadrid" consul_url: "https://github.com/ayuntamientomadrid"
copyright: "Ayuntamiento de Madrid, %{year}" copyright: "Ayuntamiento de Madrid, %{year}"
participation_title: "Participación" participation_title: "Participación"
participation_text: "Decide cómo debe ser la ciudad de Madrid que quieres." participation_text: "Decide cómo debe ser la ciudad de Madrid que quieres."
@@ -52,6 +47,7 @@ es:
contact_us: "Contacta con nosotros en" contact_us: "Contacta con nosotros en"
privacy: "Política de privacidad" privacy: "Política de privacidad"
conditions: "Condiciones de uso" conditions: "Condiciones de uso"
more_info: "Más información"
form: form:
error: error error: error
errors: errores errors: errores