diff --git a/app/assets/stylesheets/all.css.sass b/app/assets/stylesheets/all.css.sass index dabaa366..c872a037 100644 --- a/app/assets/stylesheets/all.css.sass +++ b/app/assets/stylesheets/all.css.sass @@ -111,8 +111,8 @@ main line-height: 1.3em p margin: 0.95em 0 - line-height: 1.3em text-align: justify + line-height: 1.3em &.label text-align: center span.label:after diff --git a/app/assets/stylesheets/events.css.sass b/app/assets/stylesheets/events.css.sass index b2a4407f..d503e2cf 100644 --- a/app/assets/stylesheets/events.css.sass +++ b/app/assets/stylesheets/events.css.sass @@ -28,6 +28,11 @@ header.calendar-header &.year_selector margin: 0 +.events, .event + .city:after + content: ':' + margin-right: -1px + body.events.index table width: 90% margin-top: 3.5em @@ -96,9 +101,6 @@ body.events.index table .event font-size: smaller line-height: 1.1em - strong:after - content: ':' - margin-right: -1px a:link, a:visited color: #111 font-weight: normal @@ -111,7 +113,7 @@ body.events.index table font-size: smaller text-align: right -#lug-list +sidebar#lug-list float: right width: 15em border: 1px solid #96CFFF @@ -119,6 +121,7 @@ body.events.index table padding: 5px font-size: 0.7em background-color: #D6ECFF + @include box-shadow(4px 4px 1em gray) @include border-radius(10px) h1 font-size: 1.22em diff --git a/app/views/events/index.html.haml b/app/views/events/index.html.haml index 50c3fca0..0f131f83 100644 --- a/app/views/events/index.html.haml +++ b/app/views/events/index.html.haml @@ -29,7 +29,7 @@ - events.select { |e| e.start_time.to_date <= date and date <= e.end_time.to_date }.sort_by { |e| e.city }.each do |event| %li.event = link_to event do - %strong= event.city.gsub '-', ' ' + %strong.city= event.city.gsub '-', ' ' = event.title - else @@ -42,7 +42,7 @@ - events.select { |e| e.start_time.to_date <= date and date <= e.end_time.to_date }.sort_by { |e| e.city }.each do |event| %li.event = link_to event do - %strong= event.city.gsub '-', ' ' + %strong.city= event.city.gsub '-', ' ' = event.title .formats diff --git a/app/views/events/show.html.haml b/app/views/events/show.html.haml index fde1b8e8..ac524395 100644 --- a/app/views/events/show.html.haml +++ b/app/views/events/show.html.haml @@ -1,5 +1,5 @@ %h2 - %em= @event.city + ':' + %em.city= @event.city = @event.title - if @event.persisted? && request.format == 'text/html' && controller.controller_name != 'moderations' && controller.controller_name != 'notes' && controller.action_name != 'edit' && controller.action_name != 'cancel' @@ -17,6 +17,7 @@ %em.fa.fa-calendar =t '.add_to_calendar' - if user_signed_in? + %br/ = link_to edit_moderation_path @event do %em.fa.fa-pencil =t '.edit'