diff --git a/app/assets/stylesheets/all.sass b/app/assets/stylesheets/all.sass index bef2842d..c17dabd5 100644 --- a/app/assets/stylesheets/all.sass +++ b/app/assets/stylesheets/all.sass @@ -104,27 +104,21 @@ main, body.mce-content-body aside float: right - width: 16em border: 1px solid #96CFFF margin: 0 1.2em z-index: 10 padding: 5px position: relative - font-size: smaller box-shadow: 4px 4px 1em gray margin-right: -4em border-radius: 1em background-color: #D6ECFF - h1 - font-weight: normal + h2 border-bottom: 1px black solid padding-bottom: 0.3em - h2 - margin: 0 - font-size: larger - a - padding: 0.5em 0 - display: block + ul a + padding: 0.5em 1em 0.5em 0 + display: block fieldset width: 60em diff --git a/app/assets/stylesheets/mobile.sass b/app/assets/stylesheets/mobile.sass index d84a8401..4bf8ade2 100644 --- a/app/assets/stylesheets/mobile.sass +++ b/app/assets/stylesheets/mobile.sass @@ -111,8 +111,5 @@ body font-size: larger - aside#orga-list - width: auto - #advises max-width: 60em diff --git a/app/views/events/_aside.html.haml b/app/views/events/_aside.html.haml index f9810beb..b53983e0 100644 --- a/app/views/events/_aside.html.haml +++ b/app/views/events/_aside.html.haml @@ -1,6 +1,6 @@ %aside#orga-list - if @event.region.present? && @event.region.orgas.present? - %h1{ title: @event.region } + %h2 = link_to orgas_path region: @event.region do %em.fa.fa-users = t '.orga-list' @@ -14,34 +14,35 @@ = orga.name = image_tag orga.url + '/favicon.ico', alt: '', class: :favicon - %h1 + %h2 %em.fa.fa-wrench = t '.actions' - %h2 - = link_to event_path @event, protocol: :webcal, format: :ics do - %em.fa.fa-lg.fa-calendar - = t '.add_to_calendar' - %h2 - = link_to preview_events_path(event: { title: @event.title, - start_time: @event.start_time + 1.month, - end_time: @event.end_time + 1.month, - description: @event.description, - place_name: @event.place_name, - address: @event.address, - city: @event.city, - region_id: @event.region.id, - locality: @event.locality, - url: @event.url, - tag_list: @event.tag_list.to_s }), - method: :post do - %em.fa.fa-copy - = t '.copy' - - if user_signed_in? - %h2 - = link_to edit_moderation_path @event do - %em.fa.fa-lg.fa-edit - = t '.edit' - %h2 - = link_to cancel_event_path @event, secret: @event.secret do - %em.fa.fa-lg.fa-thumbs-down - = t '.cancel' + %ul.fa-ul + %li + = link_to event_path @event, protocol: :webcal, format: :ics do + %em.fa.fa-li.fa-calendar + = t '.add_to_calendar' + %li + = link_to preview_events_path(event: { title: @event.title, + start_time: @event.start_time + 1.month, + end_time: @event.end_time + 1.month, + description: @event.description, + place_name: @event.place_name, + address: @event.address, + city: @event.city, + region_id: @event.region.id, + locality: @event.locality, + url: @event.url, + tag_list: @event.tag_list.to_s }), + method: :post do + %em.fa.fa-li.fa-copy + = t '.copy' + - if user_signed_in? + %li + = link_to edit_moderation_path @event do + %em.fa.fa-li.fa-edit + = t '.edit' + %li + = link_to cancel_event_path @event, secret: @event.secret do + %em.fa.fa-li.fa-thumbs-down + = t '.cancel' diff --git a/app/views/orgas/_aside.html.haml b/app/views/orgas/_aside.html.haml index d3a064f9..07554f57 100644 --- a/app/views/orgas/_aside.html.haml +++ b/app/views/orgas/_aside.html.haml @@ -1,12 +1,11 @@ %aside - %h1 + %h2 %em.fa.fa-link = t '.links' %ul.fa-ul %li - = link_to orgas_path(q: params[:q], page: params[:page]), - class: :back do + = link_to orgas_path q: params[:q], page: params[:page] do %em.fa.fa-li.fa-arrow-left = Orga.model_name.human.pluralize %li @@ -35,16 +34,16 @@ GeoJSON - if @orga.secret.nil? || user_signed_in? - %h1 + %h2 %em.fa.fa-wrench = t '.actions' - %h2 - = link_to edit_orga_path @orga do - %em.fa.fa-lg.fa-edit - = t '.edit' - - if user_signed_in? - %h2 - = link_to cancel_orga_path @orga do - %em.fa.fa-lg.fa-thumbs-down - = t '.cancel' - + %ul.fa-ul + %li + = link_to edit_orga_path @orga do + %em.fa.fa-li.fa-edit + = t '.edit' + - if user_signed_in? + %li + = link_to cancel_orga_path @orga do + %em.fa.fa-li.fa-thumbs-down + = t '.cancel'