Reworked country/region selector, and orga search form moved after the

main calendar
remotes/origin/master
echarp 3 years ago
parent 2f042cc320
commit 13e67c3a3a
  1. 14
      app/assets/stylesheets/all.sass
  2. 3
      app/assets/stylesheets/orgas.sass
  3. 2
      app/assets/stylesheets/pages.sass
  4. 36
      app/assets/stylesheets/region.sass
  5. 5
      app/views/layouts/application.html.haml
  6. 4
      app/views/orgas/_search.html.haml
  7. 7
      app/views/pages/_search.haml
  8. 2
      app/views/regions/_filter.haml

@ -73,6 +73,7 @@ h3.warning
background-color: orange
header.top
position: relative
text-align: left
img.logo
float: left
@ -88,16 +89,13 @@ header.top
weight: normal
margin-top: 0.2em
nav
ul.regions
top: -3em
right: 0
position: absolute
font-size: smaller
text-align: center
.digest, form
margin-top: 2em
&:hover nav
top: 0.3em
.digest, form
margin-top: 0
&:hover ul.regions
top: -0.8em
main, body.mce-content-body
clear: both

@ -4,10 +4,7 @@ img.favicon
vertical-align: middle
form#orga_search
float: right
font-size: larger
margin-left: 1em
margin-right: 1em
label
display: none
em.fa

@ -4,4 +4,4 @@ body.pages main
.digest
float: right
font-size: larger
margin-top: 1em

@ -1,25 +1,8 @@
header nav
left: 0
width: 100%
position: absolute
& > ul > li
header.top ul.regions
margin: 0
list-style: none
& > li
display: inline-block
ul
margin: 0
z-index: 1500
list-style: none
border-bottom-left-radius: 0.4em
border-bottom-right-radius: 0.4em
ul
position: absolute
text-align: left
li
display: none
border-top: solid thin #eee
li.selected
display: inline-block
& li:hover li, li li.selected
display: block
li
margin: 0
box-shadow: 0 0 1em white
@ -32,6 +15,17 @@ header nav
white-space: nowrap
&:hover ul
box-shadow: 0 4px 4px gray
li.selected
display: inline-block
& li:hover li, li li.selected
display: block
ul
z-index: 1500
position: absolute
text-align: left
li
display: none
border-top: solid thin #eee
.field.region
.radios

@ -21,10 +21,10 @@
%header.top
%nav
= render '/regions/filter'
= render '/orgas/search'
= render '/pages/search'
= image_tag 'baby_gnu_adl.png', alt: '', class: :logo
= link_to root_path do
= image_tag 'baby_gnu_adl.png', alt: '', class: :logo
%h1= link_to t('.title'), root_path
%h2= t '.subtitle'
@ -33,6 +33,7 @@
%main= yield
%footer.bottom
= render '/orgas/search'
%nav
= link_to new_event_path do
%em.fa.fa-pencil-alt

@ -8,7 +8,3 @@
= f.button class: :search do
%em.fa.fa-search
%span.label= t '.label'
= link_to page_path('filter'), title: t('.filter') do
 
%em.fa.fa-angle-double-right

@ -12,3 +12,10 @@
km
%a(href="?near=")
%em.fa.fa-times
- if params[:tag].blank? && (params[:near].blank? || params[:near][:location].blank?)
= link_to page_path('filter') do
= t 'title', scope: 'pages.filter'
= link_to page_path('filter'), title: t('title', scope: 'pages.filter') do
%em.fa.fa-angle-double-right

@ -1,2 +1,2 @@
-# Choose a region to filter events with
%ul= render partial: '/regions/filter_region', collection: Region.top
%ul.regions= render partial: '/regions/filter_region', collection: Region.top

Loading…
Cancel
Save