From f79271520c84f483b0d968fc5d9a869a6bf2d690 Mon Sep 17 00:00:00 2001
From: echarp <manu@echarp.org>
Date: Sun, 8 Apr 2018 00:17:18 +0200
Subject: [PATCH] The organisation search bar and countries selector are moved
 up

---
 app/assets/stylesheets/orgas.sass       | 9 +++------
 app/assets/stylesheets/region.sass      | 6 ++++++
 app/views/events/index.html.haml        | 2 --
 app/views/layouts/application.html.haml | 1 +
 app/views/orgas/index.html.haml         | 2 --
 app/views/pages/filter.haml             | 1 -
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/assets/stylesheets/orgas.sass b/app/assets/stylesheets/orgas.sass
index 8e2c9756..9a4d7006 100644
--- a/app/assets/stylesheets/orgas.sass
+++ b/app/assets/stylesheets/orgas.sass
@@ -4,12 +4,10 @@ img.favicon
   vertical-align: middle
 
 form#orga_search
-  right: 0
-  width: 15em
-  position: absolute
+  clear: right
+  float: right
   font-size: larger
-  text-align: right
-  white-space: nowrap
+  margin-top: 1em
   label
     display: none
   em.fa
@@ -22,7 +20,6 @@ form#orga_search
     margin-right: -1.3em
     padding-left: 1.5em
     padding-right: 1.2em
-
   button.search
     color: #258
     border: none
diff --git a/app/assets/stylesheets/region.sass b/app/assets/stylesheets/region.sass
index 51dfe880..9d80427a 100644
--- a/app/assets/stylesheets/region.sass
+++ b/app/assets/stylesheets/region.sass
@@ -1,3 +1,9 @@
+html.js header
+  nav
+    margin-top: -3em
+  &:hover nav
+    margin-top: 0
+
 .region_filter
   float: right
   font-size: smaller
diff --git a/app/views/events/index.html.haml b/app/views/events/index.html.haml
index a2c5f8c1..31363e8c 100644
--- a/app/views/events/index.html.haml
+++ b/app/views/events/index.html.haml
@@ -1,5 +1,3 @@
-= render '/orgas/search'
-
 - if params[:year]
   %header.calendar-header.year
     = link_to year: params[:year].to_i - 1, tag: params[:tag] do
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 2753ef89..6e63771d 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -23,6 +23,7 @@
     %header.top
       = image_tag 'baby_gnu_adl.png', alt: '', class: :logo
       = render '/regions/filter'
+      = render '/orgas/search'
 
       %h1= link_to t('.title'), root_path
       %h2= t '.subtitle'
diff --git a/app/views/orgas/index.html.haml b/app/views/orgas/index.html.haml
index 2793034e..6b5f0a1f 100644
--- a/app/views/orgas/index.html.haml
+++ b/app/views/orgas/index.html.haml
@@ -1,5 +1,3 @@
-= render 'search'
-
 %h2
   %em.fa.fa-users
   = title t '.title'
diff --git a/app/views/pages/filter.haml b/app/views/pages/filter.haml
index 1c6bbfdf..86e76949 100644
--- a/app/views/pages/filter.haml
+++ b/app/views/pages/filter.haml
@@ -90,4 +90,3 @@
       = button_tag formaction: digest_url(:markdown) do
         %em.fa.fa-hashtag
         = t '.digest'
-