From aba7b8f8b17f152ecc9b0134575b96c9d60bceda Mon Sep 17 00:00:00 2001
From: echarp <emmanuel.charpentier@free.fr>
Date: Sat, 16 Aug 2014 12:35:51 +0200
Subject: [PATCH] =?UTF-8?q?Meilleure=20aide=20visuelle=20pour=20la=20s?=
 =?UTF-8?q?=C3=A9lection=20de=20r=C3=A9gion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/stylesheets/events.css.sass |  2 +-
 app/assets/stylesheets/lugs.sass       |  2 +-
 app/assets/stylesheets/mobile.css.sass | 12 ++++++------
 app/assets/stylesheets/region.css.sass |  8 +++++---
 app/views/events/index.html.haml       |  4 ++--
 app/views/events/show.html.haml        |  2 +-
 6 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/app/assets/stylesheets/events.css.sass b/app/assets/stylesheets/events.css.sass
index 2f4bba6d..4467252f 100644
--- a/app/assets/stylesheets/events.css.sass
+++ b/app/assets/stylesheets/events.css.sass
@@ -107,7 +107,7 @@ body.events.show main
   h2
     margin-top: 1em
 
-sidebar#lug-list
+aside#lug-list
   float: right
   width: 16em
   border: 1px solid #96CFFF
diff --git a/app/assets/stylesheets/lugs.sass b/app/assets/stylesheets/lugs.sass
index 4439d56a..d6e0b09f 100644
--- a/app/assets/stylesheets/lugs.sass
+++ b/app/assets/stylesheets/lugs.sass
@@ -8,7 +8,7 @@ img.favicon
 form#lug_search
   right: 5%
   position: absolute
-  font-size: x-large
+  font-size: larger
   text-align: right
   margin-top: -1.2em
   white-space: nowrap
diff --git a/app/assets/stylesheets/mobile.css.sass b/app/assets/stylesheets/mobile.css.sass
index 6ce89b19..e2a8d2a8 100644
--- a/app/assets/stylesheets/mobile.css.sass
+++ b/app/assets/stylesheets/mobile.css.sass
@@ -2,7 +2,7 @@
   main
     font-size: larger
 
-  sidebar#lug-list
+  aside#lug-list
     width: auto
 
   #advises
@@ -44,10 +44,7 @@
 /* For small screen width */
 @media all and (max-width: 34em)
   form#lug_search
-    position: relative
-
-  header.calendar-header
-    margin-top: 0
+    display: none
 
   body.events.index table
     font-size: inherit
@@ -69,5 +66,8 @@
         li
           list-style-type: disc
 
-  sidebar
+  aside
     display: none
+
+  .formats, a#banner
+    float: none
diff --git a/app/assets/stylesheets/region.css.sass b/app/assets/stylesheets/region.css.sass
index 582c5400..5475099d 100644
--- a/app/assets/stylesheets/region.css.sass
+++ b/app/assets/stylesheets/region.css.sass
@@ -8,20 +8,22 @@
       color: gray
   ul
     margin: 0
-    padding: 1em
     display: none
     position: absolute
     list-style: none
+    margin-top: -1.3em
     background-color: white
     @include box-shadow(1px 1px 4px gray)
-    @include border-radius(3px)
+    @include border-bottom-left-radius(0.4em)
+    @include border-bottom-right-radius(0.4em)
     li
       margin: 0
       a
         display: block
-        padding: 0.2em
+        padding: 0.2em 1em
         border-top: solid thin black
         &:hover
+          background-color: #eee
           @include text-shadow(1px 1px 0.2em gray)
     li:first-child a
       border-top: none
diff --git a/app/views/events/index.html.haml b/app/views/events/index.html.haml
index 9ed1df32..8c05ec6b 100644
--- a/app/views/events/index.html.haml
+++ b/app/views/events/index.html.haml
@@ -1,10 +1,10 @@
-= render '/lugs/search' unless controller.controller_name == 'lugs'
-
 -# Seems necessary, for the time being, to ensure calendar is changing days correctly
 - Time.zone = 'Paris'
 
 %nav.region_selector= render '/regions/selector'
 
+= render '/lugs/search'
+
 - if params[:year]
   -# Whole year calendar
   - @events = @events.year params[:year].to_i
diff --git a/app/views/events/show.html.haml b/app/views/events/show.html.haml
index aaa74d42..f0a10026 100644
--- a/app/views/events/show.html.haml
+++ b/app/views/events/show.html.haml
@@ -5,7 +5,7 @@
   = title @event.title
 
 - if @event.persisted? && request.format == 'text/html' && controller.controller_name == 'events' && controller.action_name == 'show'
-  %sidebar#lug-list
+  %aside#lug-list
     - if @event.related_region.lugs.present?
       %h1=t '.lug-list'
       - if @event.related_region