diff --git a/app/assets/images/brasil.png b/app/assets/images/brasil.png new file mode 100644 index 0000000000000000000000000000000000000000..fc6f93787d62c23d660b6570018cba9955f4c69e Binary files /dev/null and b/app/assets/images/brasil.png differ diff --git a/app/assets/stylesheets/all.sass b/app/assets/stylesheets/all.sass index 3e12f25b063820a3920294339363d725d5a1785a..68cd2c8d692a9caca8de7826d5a1858fd96162e3 100644 --- a/app/assets/stylesheets/all.sass +++ b/app/assets/stylesheets/all.sass @@ -83,15 +83,14 @@ header.top ul.countries float: right font-size: smaller - margin-top: 0.2em + margin-top: -1em line-height: 1em margin-left: 2em - margin-right: 1em list-style-type: none li text-align: left & a:before - margin-right: 0.75em + margin-right: 0.5em &.map_france a:before content: image-url('france.png') &.map_quebec a:before @@ -100,6 +99,8 @@ header.top content: image-url('belgique.png') &.map_suisse a:before content: image-url('suisse.png') + &.map_brasil a:before + content: image-url('brasil.png') h1 margin: 0.5em 0 diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index babd79371ebf7e7fddc5ea3c680fc7b2d0a1cf90..dc246544c28d709692003f94ab019b79f344edb4 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -17,7 +17,7 @@ type: 'text/javascript' = csrf_meta_tags - - classes = [request.domain.split('.')[0], + - classes = [request.domain ? request.domain.split('.')[0] : '', controller.controller_name, controller.action_name] %body{ class: classes } %header.top @@ -26,13 +26,15 @@ %ul.countries %li.map_france - = link_to t('.france'), 'http://www.agendadulibre.org' + = link_to t('.france'), '//www.agendadulibre.org' %li.map_quebec - = link_to t('.quebec'), 'http://www.agendadulibre.qc.ca' + = link_to t('.quebec'), '//www.agendadulibre.qc.ca' %li.map_belgique - = link_to t('.belgique'), 'http://www.agendadulibre.be' + = link_to t('.belgique'), '//www.agendadulibre.be' %li.map_suisse - = link_to t('.suisse'), 'http://www.agendadulibre.ch' + = link_to t('.suisse'), '//www.agendadulibre.ch' + %li.map_brasil + = link_to t('.brasil'), '//agenda.softwarelivre.org' %h1= link_to t('.title'), root_path %h2= t '.subtitle'