diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss index 4fcd05673..09518ad23 100644 --- a/app/assets/stylesheets/participacion.scss +++ b/app/assets/stylesheets/participacion.scss @@ -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; } } diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index 98e047a08..64d6fe8a4 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -1,3 +1,43 @@ -
- <%= image_tag('footer.jpg', style: 'width: 100%; max-width: 1170px;') %> -
+ \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index 27c4b4439..9290fa627 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -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 diff --git a/config/locales/es.yml b/config/locales/es.yml index 2e2473a1a..81f30a4b5 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -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"