From f803104bb1098de82e545cb7021a3f6de22d7d32 Mon Sep 17 00:00:00 2001 From: echarp Date: Thu, 7 Aug 2014 00:33:24 +0200 Subject: [PATCH] =?UTF-8?q?Les=20drapeaux=20sont=20maintenant=20g=C3=A9r?= =?UTF-8?q?=C3=A9s=20dans=20les=20css?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/stylesheets/all.css.sass | 23 +++++++++++------- app/assets/stylesheets/application.css.sass | 7 ++---- app/assets/stylesheets/events.css.sass | 6 ++--- app/assets/stylesheets/list.css.sass | 2 +- app/assets/stylesheets/lugs.sass | 2 +- app/assets/stylesheets/maps.css.sass | 3 ++- app/assets/stylesheets/sessions.css.sass | 2 +- app/views/layouts/application.html.haml | 27 ++++++++------------- config/application.rb | 1 + 9 files changed, 34 insertions(+), 39 deletions(-) diff --git a/app/assets/stylesheets/all.css.sass b/app/assets/stylesheets/all.css.sass index aacf4d10..77b65891 100644 --- a/app/assets/stylesheets/all.css.sass +++ b/app/assets/stylesheets/all.css.sass @@ -1,5 +1,5 @@ -@import "compass" -@import "font-awesome" +@import compass +@import font-awesome * height: auto @@ -69,18 +69,23 @@ header.top ul.countries float: right - height: 81px + width: 80px font-size: 0.7em - margin-top: 2px - margin-right: 16px + margin-left: 29px + margin-right: 11px list-style-type: none li text-align: left - line-height: 1.3em - img - margin-left: 2.2em + & a:before margin-right: 0.75em - vertical-align: middle + &.map_france a:before + content: image-url('france.png') + &.map_quebec a:before + content: image-url('quebec.png') + &.map_belgique a:before + content: image-url('belgique.png') + &.map_suisse a:before + content: image-url('suisse.png') h1 margin: 10px 5px 12px diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass index 7c0fced6..72b1d65a 100644 --- a/app/assets/stylesheets/application.css.sass +++ b/app/assets/stylesheets/application.css.sass @@ -9,13 +9,10 @@ * compiled file so the styles you add here take precedence over styles defined in any styles * defined in the other CSS/SCSS files in this directory. It is generally better to create a new * file per style scope. - * - *= require leaflet - *= require_tree . - *= require_self */ -@import 'awesome_mixins' +@import * +@import awesome_mixins body.application &.infos h4 diff --git a/app/assets/stylesheets/events.css.sass b/app/assets/stylesheets/events.css.sass index 946fe2a4..af822ee1 100644 --- a/app/assets/stylesheets/events.css.sass +++ b/app/assets/stylesheets/events.css.sass @@ -1,4 +1,4 @@ -@import "compass" +@import compass form.region_selector left: 0 @@ -150,14 +150,12 @@ sidebar#lug-list #advises border: 1px solid #FFB578 - margin: 10px 100px 20px 100px - text-align: left padding-left: 10px padding-right: 10px + margin-bottom: 1.2em background-color: #ffe0c7 h1 font-size: 1.9em - text-align: center font-weight: normal a color: #8F4900 diff --git a/app/assets/stylesheets/list.css.sass b/app/assets/stylesheets/list.css.sass index 55641173..bbea6915 100644 --- a/app/assets/stylesheets/list.css.sass +++ b/app/assets/stylesheets/list.css.sass @@ -1,4 +1,4 @@ -@import "compass" +@import compass table margin: 1em auto diff --git a/app/assets/stylesheets/lugs.sass b/app/assets/stylesheets/lugs.sass index ade83114..5cb87508 100644 --- a/app/assets/stylesheets/lugs.sass +++ b/app/assets/stylesheets/lugs.sass @@ -1,4 +1,4 @@ -@import "compass" +@import compass img.favicon max-height: 2em diff --git a/app/assets/stylesheets/maps.css.sass b/app/assets/stylesheets/maps.css.sass index 35d89d0f..6461369d 100644 --- a/app/assets/stylesheets/maps.css.sass +++ b/app/assets/stylesheets/maps.css.sass @@ -1,4 +1,5 @@ -@import "compass" +@import compass +@import leaflet #map height: 60em diff --git a/app/assets/stylesheets/sessions.css.sass b/app/assets/stylesheets/sessions.css.sass index dbbcc792..914cb2e8 100644 --- a/app/assets/stylesheets/sessions.css.sass +++ b/app/assets/stylesheets/sessions.css.sass @@ -1,4 +1,4 @@ -@import "compass" +@import compass .sessions form diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 5f1ff038..efc5ee0e 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -17,25 +17,18 @@ %body(class = "#{controller.controller_name} #{controller.action_name}") %header.top - = image_tag 'baby_gnu_adl.png', alt: 'Baby GNU', class: :logo + = image_tag 'baby_gnu_adl.png', alt: 'Baby GNU', class: :logo, + width: 100, height: 83 %ul.countries - %li - = link_to 'http://www.agendadulibre.org' do - = image_tag 'france.png', alt: '' - =t '.france' - %li - = link_to 'http://www.agendadulibre.qc.ca' do - = image_tag 'quebec.png', alt: '' - =t '.quebec' - %li - = link_to 'http://www.agendadulibre.be' do - = image_tag 'belgique.png', alt: '' - =t '.belgique' - %li - = link_to 'http://www.agendadulibre.ch' do - = image_tag 'suisse.png', alt: '' - =t '.suisse' + %li.map_france + = link_to t('.france'), 'http://www.agendadulibre.org' + %li.map_quebec + = link_to t('.quebec'), 'http://www.agendadulibre.qc.ca' + %li.map_belgique + = link_to t('.belgique'), 'http://www.agendadulibre.be' + %li.map_suisse + = link_to t('.suisse'), 'http://www.agendadulibre.ch' %h1= link_to t('.title'), root_url %h2=t '.subtitle' diff --git a/config/application.rb b/config/application.rb index f581cdf0..c4ea4551 100644 --- a/config/application.rb +++ b/config/application.rb @@ -35,5 +35,6 @@ module AgendaDuLibreRails } # config.quiet_assets = false + config.sass.preferred_syntax = :sass end end