The organisation search bar and countries selector are moved up

app/assets/stylesheets/orgas.sass

@@ -4,12 +4,10 @@ img.favicon
   vertical-align: middle
 
 form#orga_search
-  right: 0
+  clear: right
-  width: 15em
+  float: right
-  position: absolute
   font-size: larger
-  text-align: right
+  margin-top: 1em
-  white-space: nowrap
   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

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

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

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'

app/views/orgas/index.html.haml

@@ -1,5 +1,3 @@
-= render 'search'
-
 %h2
   %em.fa.fa-users
   = title t '.title'

app/views/pages/filter.haml

@@ -90,4 +90,3 @@
       = button_tag formaction: digest_url(:markdown) do
         %em.fa.fa-hashtag
         = t '.digest'
-