From 11bdcc90cfce25c36626f13f797379b3466ba0e2 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Fri, 27 Nov 2015 18:18:46 +0100 Subject: [PATCH] Refactors a little of SCSS for header --- app/assets/images/header_logo_madrid.png | Bin 4176 -> 3066 bytes app/assets/stylesheets/layout.scss | 152 +++++++---------------- app/assets/stylesheets/variables.scss | 3 +- app/views/layouts/_header.html.erb | 2 +- config/locales/es.yml | 2 +- 5 files changed, 47 insertions(+), 112 deletions(-) diff --git a/app/assets/images/header_logo_madrid.png b/app/assets/images/header_logo_madrid.png index 8ce7251efaad4b29c230c22bd6287f9ca30d2b9f..50e388cad6dcf5cab1455da1647df3e0035aa3b5 100644 GIT binary patch delta 2388 zcmZ|Rc{~%09|!Q+#3s!#W;~S*F*#>*<=WOJ%jWv!C=sDhu3re{S+ZgjVXhooq;$A4 zJd|rxT2p#R$dUWLsx?CWdj5D`zrXt9`~Cj&etrJ^e0z}Jl~7D4ha-EWRHOg^z#fVn z$>rB|`e(orzjm73=ZYGX4iHH&Gc+~Fn2}A5OiVEtvavatNFTe_g0B|6ML^u{Rv~)7|yn-u&UCbSRU8X>4 z3RLLj_!gjLEtS-e&Lz*$bg+Etda_atg89R@L;(|w>omEJfN4CCl)y-ZSeZ%lDv<=W zOt+QVrTUY*f}Z|)YJ>J&h^Z}F=GF#mwM^ya$A6jWem1sMDVnJZs__u?(EpC0^oj=q zjT3I;X&g9>qq(-gij-lyQp?-l9p&rtw;A%OpE)!OYa%#g(`sJv9485#=9Ob~RW(42 zxQlNOwq{8}jL`=0kb&%6j_ys5QgRgT-hu#M59!FL@#;ZRi-~Ist)GC@~JF`aFgk8-28)qur8U7)0!?N5b9;VR$`K7HE2RZ zUW5R43!6zU%K3I%dN}SuWoD#NKPWNpcy%A*n}y;OF{td_w@G=JhXgOBQ*iIamr)Jh zFzSJC^?jc%lC_phaUX9c$0unw+Vr$p+qm)%Rcn`bmK3Q}ZDmOVcQEIeSB8BGFVR6r zeg9tDv!Rs&q$S1d=)mE;9xpJrcYnj*gPxaStAoi~??;&U!-F}CZU>uuPJOZ@*2cUD zdKC9c0DArW5W65UPz-*;0()&d>~(22Zk2SA;&(TXt=%m{7OUx-ZlK)jK2C8}((F@a z{5X2N%oA7(X@&^BaIQM5wzb9HFX-892YNIX)>yoT@--gc-!Zuiqugp?j8BNcRt#@7lT z^NpCFJ0iY%K7f`OA@dr=vu(IA?#);PHy$1Q$nfhL2-s<4>@cRg=BDe$8G9I640qPK zFOVdR&I7GN6+t!J5W&(@#$OnIM1)5 z*o>bQ%v`@i!UQZt66{E40(cq0d&gCHi45J0!&VLmG8#YS=I$4&E{(F3x|ylcHB=`P z)M0xUrYh^L1kXyEtqIz({VQP&;ww=pO30Dv-1^$FN{86Un{bx=%Dk}pH)LB)+vB4= zK(WW%eQ+L=M%Of#$eVIJf0mLg6qP!51aV+!Vo%W{&c2VF0D9JQ;kCe3l(QQkB#oo* zNkAAHuP6^UNVlGqI{~&|Z@IAcSdtapFxf(M9%Wa{PoIUrCf6rPpuyamN{bh1W~yMl zk7C^zk>%T~ZlUm&E`_vDBKdmRQMD=J?uyH|w4Z`suidZ!cgG}A$6E!HHPP^NN%V4M zXET-&AcU>b1w*3rkBal2VAF|h7W(bWoiX``5K-b^78%%ztNH105tVSOoQRu+I`VwD z80qPY;Fl-!R>+Z=v^6i@BXH!Y1BeiFz)n&^x9p4!>8?RkD0s@b7+@3akRO&t_Mghw zmiQ5h;%2+2imtR}s2M%^<^@Did2t(6kmYAb^yz8c_}$#Ea+XJiO|)Q;30i}#>UuFMA0B03O;Q44`X@Z^5XyS;D9HYkO|1&E z*eePC^~xYV2v@WQb$KwqPat~o$>p|le=?_Ce@>=Bd}jC0iyneRth2WaP}FwnE16{h zrH51`vio_Zd>w&jW#e8&gYLfAE&rgA~A%kXTI`ikJN=Ceajqs@6a6Qjh zc&SXKa!f0AegByPbF&j8o_c4Hi{Oso?Ox`(oxSwNJZ_kEe48vEn@nBO=d7E~E@f8_If#n@Zj zWBkpGrI|_5pSsOq#$2-$-sV+H5OXG$mU{sh_9X8!F0iQ(R<1v`6mqtt5^`+HoyR^c z=1VIKa!b#Np@&;Ru^C==nFTm6rd&B0Ru1X=)%A6O|I~e3U-r*k2t`1f`9PqYXKL=R PM+rb7JCG`gK3D$-ol8Ig delta 3506 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 diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 0be3d4eea..ceab7e12f 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -38,32 +38,24 @@ } @mixin logo { + color: white; + font-family: 'Lato' !important; + font-weight: lighter; - a { - color: white; - font-family: 'Lato' !important; - font-size: rem-calc(20); - font-weight: lighter; - line-height: $line-height*4; - padding-left: rem-calc(6); + @media (min-width: $small-breakpoint) { + font-size: rem-calc(24); + line-height: rem-calc(48); + } - span { - opacity: .5; - - &.logo-site { - font-size: rem-calc(16); - font-weight: lighter; - opacity: 1; - vertical-align: top; - } - } + img { + height: 48px; + width: 48px; @media (min-width: $small-breakpoint) { - font-size: rem-calc(28); - - span { - font-size: rem-calc(20); - } + height: 80px; + margin-right: rem-calc(12); + margin-top: 0; + width: 80px; } } } @@ -392,27 +384,13 @@ header { } .selected { + border-bottom: 2px solid white; + padding-bottom: rem-calc(2); position: relative; - - &:before { - top: -14px; - left: 50%; - border: solid transparent; - content: " "; - height: 0; - width: 0; - position: absolute; - border-top-color: white; - border-width: 8px; - margin-left: -8px; - } } .locale { float: none; - height: rem-calc(48); - padding-top: rem-calc(3); - text-align: center; @media (min-width: $small-breakpoint) { float: left; @@ -427,7 +405,7 @@ header { .external-links { float: none; - padding: rem-calc(12) 0; + padding: rem-calc(6) 0; text-align: center; @media (min-width: $small-breakpoint) { @@ -447,73 +425,33 @@ header { } .contain-to-grid { - background: #112E51; + background: $brand; } .top-bar { - background: #112E51 !important; + background: $brand !important; color: white; - height: rem-calc(48); + min-height: rem-calc(48); max-width: 1170px !important; padding: 0 rem-calc(12); @media (min-width: $small-breakpoint) { - height: rem-calc(96); + height: auto; + padding: 0; } .name { - height: rem-calc(48); + + @media (min-width: $small-breakpoint) { + margin-left: rem-calc(12); + } a { - color: white; - font-family: 'Lato'; - font-size: rem-calc(16); - font-weight: lighter; - line-height: $line-height*2; - - span { - *display: inline; /* IE */ - opacity: .5; - - &.logo-site { - *display: inline; /* IE */ - font-size: rem-calc(14); - opacity: 1; - } - } + @include logo; + line-height: rem-calc(48); @media (min-width: $small-breakpoint) { - font-size: rem-calc(24); - line-height: $line-height*4; - - span, span.logo-site { - font-size: rem-calc(16); - } - } - - @media (min-width: $medium-breakpoint) { - font-size: rem-calc(30); - line-height: $line-height*4; - - span, span.logo-site { - font-size: rem-calc(20); - } - } - - img { - height: 48px; - width: 48px; - - @media (min-width: $small-breakpoint) { - margin-top: rem-calc(24); - } - - @media (min-width: $medium-breakpoint) { - height: 96px; - margin-right: rem-calc(12); - margin-top: 0; - width: 96px; - } + line-height: rem-calc(80); } } } @@ -558,9 +496,10 @@ header { ul { margin-left: 0; + margin-right: rem-calc(12); @media (min-width: $small-breakpoint) { - margin-left:rem-calc(24); + margin-left: rem-calc(24); } } @@ -581,10 +520,11 @@ header { @media (min-width: $small-breakpoint) { &.button { - background: $brand; + background: white; border-radius: rem-calc(3); + color: $brand; line-height: rem-calc(15); - margin-top: rem-calc(24); + margin-top: rem-calc(16); padding-left: rem-calc(15); text-align: center; } @@ -600,12 +540,11 @@ header { } ul li, ul li:hover:not(.has-form) > a:not(.button) { - line-height: $line-height; @media (min-width: $small-breakpoint) { background: none; border: 0; - line-height: $line-height*4; + line-height: rem-calc(80); } } @@ -622,7 +561,7 @@ header { padding: rem-calc(12) 0; @media (min-width: $small-breakpoint) { - line-height: $line-height*4; + line-height: rem-calc(80); padding: 0 rem-calc(12); } @@ -643,21 +582,22 @@ header { } .top-links { - background: #0B0C0C; + background: $dark; color: white; font-size: rem-calc(14); - - .row { - padding: 0 rem-calc(12); - } + padding-right: rem-calc(12); a { color: white; + margin: 0 rem-calc(6); &:hover { text-decoration: underline; } } + .social { + padding-top: rem-calc(6); + } } .subnavigation-container { @@ -850,13 +790,6 @@ footer { h1 { @include logo; - - a { - - span.logo-site { - vertical-align: middle; - } - } } } @@ -911,6 +844,7 @@ form.locale-form { background-color: transparent; border: 0; color: white; + margin-bottom: 0; outline: none; padding-left: rem-calc(3); padding-right: rem-calc(24); diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/variables.scss index b7077e54b..b5556477f 100644 --- a/app/assets/stylesheets/variables.scss +++ b/app/assets/stylesheets/variables.scss @@ -19,8 +19,9 @@ $line-height: rem-calc(24); $body: #E9E9E9; $background: #EDEFF0; +$dark: #0B0C0C; $border: #DEE0E3; -$brand: #0077B9; +$brand: #004A83; $text: #222222; $text-medium: #999999; diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 7bba71b76..8c62cf434 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -35,7 +35,7 @@
  • <%= link_to root_path do %> - <%= image_tag('header_logo_madrid.png', class: 'show-for-medium-up left', size: '96x96', alt: t("layouts.header.logo")) %> + <%= image_tag('header_logo_madrid.png', class: 'show-for-medium-up left', size: '80x80', alt: t("layouts.header.logo")) %> <% if transparency_page? %> <%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}") %> | diff --git a/config/locales/es.yml b/config/locales/es.yml index 483a0c313..be8dcca77 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -14,7 +14,7 @@ es: external_link_blog_url: "/blog" open_gov: "Gobierno %{open}" open: "abierto" - participation_html: "Madrid Decide" + participation_html: "Madrid Decide" transparency: "Transparencia" open_data: "Datos abiertos" open_city_title: "La ciudad que quieres serĂ¡ la ciudad que quieras."