diff --git a/app/assets/stylesheets/all.css.sass b/app/assets/stylesheets/all.css.sass index 3ab06872..0148bc9a 100644 --- a/app/assets/stylesheets/all.css.sass +++ b/app/assets/stylesheets/all.css.sass @@ -59,11 +59,26 @@ a:hover, a:active, a:focus font-weight: normal !important header.top - position: relative img.logo - top: -10px - left: 20px - position: absolute + float: left + margin-top: -10px + margin-left: 20px + + ul.countries + float: right + height: 81px + font-size: 0.7em + margin-top: -8px + margin-right: 16px + list-style-type: none + li + text-align: left + line-height: 1.3em + img + margin-left: 2.2em + margin-right: 0.75em + vertical-align: middle + h1 margin: 10px 5px 5px padding: 0 @@ -80,19 +95,6 @@ header.top display: inline-block margin-top: 1.4em - ul.countries - top: -8px - right: 0.5em - position: absolute - font-size: 0.7em - list-style-type: none - li - text-align: left - line-height: 1.3em - img - margin-right: 0.65em - vertical-align: middle - main h1 margin: 10px 5px 5px 5px diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index a2f68382..efda92d5 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -32,12 +32,6 @@ %body(class = "#{controller.controller_name} #{controller.action_name}") %header.top = image_tag 'baby_gnu_adl.png', alt: 'Baby GNU', class: :logo - %h1= link_to t('.title'), root_url - %h2=t '.subtitle' - - %a#banner(href='http://april.org/campagne') - %img(src='http://www.april.org/campagne/images/priorite-logiciel-libre-je-soutiens-april.png' - width='580' height='76' alt='Priorité au Logiciel Libre! Je soutiens l\'April.') %ul.countries %li @@ -57,10 +51,16 @@ = image_tag 'suisse.png', alt: "#{t '.flag' } #{t '.suisse'}" =t '.suisse' + %h1= link_to t('.title'), root_url + %h2=t '.subtitle' + + %a#banner(href='http://april.org/campagne') + %img(src='http://www.april.org/campagne/images/priorite-logiciel-libre-je-soutiens-april.png' + width='580' height='76' alt='Priorité au Logiciel Libre! Je soutiens l\'April.') + = render 'layouts/flash', flash: flash if flash.present? - %main - = yield + %main= yield %footer.bottom %nav