diff --git a/app/assets/stylesheets/all.css.sass b/app/assets/stylesheets/all.css.sass index b43ee267..1bdd089a 100644 --- a/app/assets/stylesheets/all.css.sass +++ b/app/assets/stylesheets/all.css.sass @@ -5,7 +5,6 @@ height: auto padding: 0 max-width: 100% - line-height: 1em margin-left: auto margin-right: auto +box-sizing(border-box) @@ -13,7 +12,7 @@ html color: black height: 100% - line-height: 1.3em + text-align: center font-family: georgia, serif background-color: #9CC5EE // Integrating adl in another website @@ -28,9 +27,8 @@ html body border: 1px solid #68A6E5 margin: 0.3em - padding: 0 10px 10px 10px - text-align: center - border-bottom: 0px + padding: 10px + padding-top: 0 background-color: white header, main, footer * @@ -71,10 +69,6 @@ h3.warning +inline-block() +border-radius(1em) -.fa:before - font-style: normal - font-weight: normal !important - header.top img.logo float: left @@ -84,6 +78,7 @@ header.top float: right width: 80px font-size: 0.7em + line-height: 1em margin-left: 29px margin-right: 11px list-style-type: none @@ -102,15 +97,14 @@ header.top content: image-url('suisse.png') h1 - margin: 10px 5px 12px font-size: 2.1em - padding-top: 10px letter-spacing: 2px h2 - font-size: 1.2em - font-style: italic - font-weight: normal - margin-bottom: 21px + font: + size: 1.2em + style: italic + weight: normal + margin-top: -0.5em main, body.mce-content-body position: relative @@ -129,11 +123,8 @@ main, body.mce-content-body text-align: left li margin-left: 2em - line-height: 1.3em p - margin: 0.95em auto text-align: justify - line-height: 1.3em &.label text-align: center span.label:after @@ -143,9 +134,9 @@ main, body.mce-content-body &.mce-content-body margin: 0 - height: 100% border: solid thin transparent font-size: initial + min-height: 100% font-family: georgia, serif fieldset @@ -194,7 +185,6 @@ input, textarea, select, a.button, button, .select2-container ul cursor: pointer padding: 0.2em 0.6em font-size: larger - line-height: 1.1em font-weight: bolder background-color: #9CC5EE +box-shadow(2px 2px 2px gray) diff --git a/app/assets/stylesheets/events.css.sass b/app/assets/stylesheets/events.css.sass index 34965c66..b624b446 100644 --- a/app/assets/stylesheets/events.css.sass +++ b/app/assets/stylesheets/events.css.sass @@ -75,14 +75,18 @@ body.events.index table clear: left margin-top: 0 margin-left: 0 - padding-left: 15px + padding-left: 0.8em margin-bottom: 5px - list-style-type: circle + list-style-type: none li color: #444 margin: 0 padding: 0 - margin-top: 0.38em + margin-top: 0.4em + em.fa-li + font-size: smaller + em.fa-li:before + margin-right: -1em .event font-size: smaller @@ -135,11 +139,9 @@ aside#lug-list display: block ul text-align: left - line-height: 1.2em margin-left: 1em li margin-left: 2em - line-height: 1.3em #advises border: 1px solid #FFB578 @@ -164,7 +166,6 @@ aside#lug-list .helper p color: gray margin: 1px 5px 1px 6.6em - line-height: 0.9em label width: 6.2em +inline-block() diff --git a/app/assets/stylesheets/mobile.css.sass b/app/assets/stylesheets/mobile.css.sass index e2a8d2a8..0129e113 100644 --- a/app/assets/stylesheets/mobile.css.sass +++ b/app/assets/stylesheets/mobile.css.sass @@ -18,6 +18,12 @@ margin: 0 @media all and (max-width: 900px) + header.top + img.logo + margin-left: 0 + ul.countries + margin-right: 0 + body border: none margin: 0 @@ -35,14 +41,20 @@ border-width: 0 ul.events padding-left: 0 - li - list-style-type: none table tr td border-width: 0px !important /* For small screen width */ @media all and (max-width: 34em) + header.top + img.logo + margin-left: -10px + margin-right: 0 + ul.countries + margin-left: 0 + margin-right: -10px + form#lug_search display: none @@ -63,8 +75,6 @@ float: right ul.events margin-left: 1em - li - list-style-type: disc aside display: none diff --git a/app/assets/stylesheets/sessions.css.sass b/app/assets/stylesheets/sessions.css.sass index 914cb2e8..6887eb45 100644 --- a/app/assets/stylesheets/sessions.css.sass +++ b/app/assets/stylesheets/sessions.css.sass @@ -11,7 +11,6 @@ vertical-align: middle .helper p margin: 1px 5px 1px 6.6em - line-height: 0.9em label width: 8em display: inline-block diff --git a/app/views/events/index.html.haml b/app/views/events/index.html.haml index 2cbb542b..749c3eb9 100644 --- a/app/views/events/index.html.haml +++ b/app/views/events/index.html.haml @@ -36,10 +36,14 @@ next_link: ->(param, date_range) { link_to '>>', { param => (date_range.last + 1.day).beginning_of_month, tag: params[:tag], region: params[:region] } } do |date, events| .day_number= date.day - %ul.events + %ul.events.fa-ul - events.select { |e| (e.start_time.to_date..e.end_time.to_date).cover? date } - .sort_by { |e| e.city }.each do |event| %li.event + - if event.locality? + %em.fa.fa-li.fa-globe(title="#{Event.human_attribute_name :locality} #{t 'attributes.locality_1'}") + - else + %em.fa.fa-li.fa-shield(title="#{Event.human_attribute_name :locality} #{t 'attributes.locality_0'}") = link_to event do %strong.city= event.city = event.title diff --git a/config/locales/models/en.yml b/config/locales/models/en.yml index 59534c23..16bd0772 100644 --- a/config/locales/models/en.yml +++ b/config/locales/models/en.yml @@ -39,7 +39,7 @@ en: city: City event: title: Title - start_time: Beginning + start_time: Start end_time: End description: Description address: Address @@ -66,4 +66,4 @@ en: event: attributes: end_time: - before_start: can not be before beginning + before_start: can not be before start