consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds content on footer

Browse Source
This commit is contained in:
Alberto Garcia Cabeza
2015-08-10 15:39:38 +02:00
parent c80d9b0a47
commit 91cdfbc8a1
4 changed files with 107 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
app/assets/stylesheets/participacion.scss
View File

@@ -26,6 +26,31 @@
line-height: $line-height;
}
@mixin logo {
a {
color: white;
font-family: 'Lato';
font-size: rem-calc(20);
font-weight: lighter;
line-height: $line-height*4;
padding-left: rem-calc(6);
span {
font-size: rem-calc(16);
font-weight: lighter;
vertical-align: top;
}
@media (min-width: 480px) {
font-size: rem-calc(30);
span {
font-size: rem-calc(20);
}
}
}
}
// 03. Global styles
// - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -42,6 +67,12 @@ body {
text-rendering: optimizeLegibility;
}
p {
font-size: rem-calc(13);
line-height: $line-height;
margin-bottom: $line-height/2;
}
.button {
padding: rem-calc(15) rem-calc(32);
}
@@ -152,7 +183,7 @@ header {
.top-bar {
background: rgba(0,0,0,.5);
color: white; //$header-color;
color: white;
height: $line-height*4;
max-width: 1170px !important;
@@ -222,7 +253,33 @@ header {
// 05. Footer
// - - - - - - - - - - - - - - - - - - - - - - - - -
footer {
background: $brand;
color: white;
padding: rem-calc(24) 0 rem-calc(48) 0;
.logo {
@include logo;
}
h4 {
color: white;
font-weight: normal;
}
a {
color: white;
&.link:hover {
color: white;
opacity: .5;
}
}
}
.subfooter {
padding-top: $line-height;
}
// 06. Tags
@@ -278,28 +335,7 @@ header {
}
h1 {
a {
color: white;
font-family: 'Lato';
font-size: rem-calc(20);
font-weight: lighter;
line-height: $line-height*4;
padding-left: rem-calc(6);
span {
font-size: rem-calc(16);
font-weight: lighter;
vertical-align: top;
}
@media (min-width: 480px) {
font-size: rem-calc(30);
span {
font-size: rem-calc(20);
}
}
}
@include logo;
}
}

44
app/views/layouts/_footer.html.erb
View File

@@ -1,3 +1,43 @@
<div style="background: #0077b9; width: 100%;">
<%= image_tag('footer.jpg', style: 'width: 100%; max-width: 1170px;') %>
<footer>
<div class="row-full">
<div class="row">
<div class="small-12 column">
<div class="right">
<%= link_to "Enlace 1", "#", class: "link" %> | <%= link_to "Enlace 2", "#", class: "link" %>
</div>
<div class="logo left">
<%= link_to root_path do %>
<%= image_tag('logo_madrid_white.png', class: 'left', size: '96x96') %>
<%= t("layouts.header.open_gov", open: "<strong>#{t('layouts.header.open')}</strong>").html_safe %>
<% end %>
</div>
</div>
<div class="small-12 medium-3 column clear">
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
</div>
<div class="small-12 medium-3 column">
<h4>Lorem ipsum dolor</h4>
<p>Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
</div>
<div class="small-12 medium-3 column">
<h4>Ut enim ad minim</h4>
<p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p>
</div>
<div class="small-12 medium-3 column">
<h4>Duis aute irure</h4>
<p>Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
</div>
</div>
<div class="subfooter row">
<div class="small-12 column">
<%= t("layouts.footer.copyright", year: Time.now.year) %>
</div>
</div>
</div>
</footer>

2
config/locales/en.yml
View File

@@ -12,6 +12,8 @@ en:
create_debate: Create a debate
my_account_link: My account
language: Site language
footer:
copyright: "Ayuntamiento de Madrid, 2015. All rights reserved"
debates:
index:
create_debate: Create a debate

4
config/locales/es.yml
View File

@@ -12,6 +12,8 @@ es:
create_debate: Crea un debate
my_account_link: Mi cuenta
language: Idioma de la página
footer:
copyright: "Ayuntamiento de Madrid, %{year}. Todos los derechos reservados"
debates:
index:
create_debate: Crea un debate
@@ -64,7 +66,7 @@ es:
title: "Mi cuenta"
save_changes_submit: "Guardar cambios"
change_credentials_link: "Cambiar mis credenciales"
email_on_debate_comment_label: "Recibir un email cuando alguien commenta en mis debates"
email_on_debate_comment_label: "Recibir un email cuando alguien comenta en mis debates"
email_on_comment_reply_label: "Recibir un email cuando alguien contesta a mis comentarios"
first_name_label: "Nombre"
last_name_label: "Apellidos"