diff --git a/.rubocop.yml b/.rubocop.yml index 691771f..71ea9ef 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -4,6 +4,8 @@ AllCops: - config.ru Exclude: - bin/** + - config/**/* + - spec/**/* - spec/dummy/config/initializers/secret_token.rb Documentation: Enabled: false diff --git a/app/assets/stylesheets/application.sass b/app/assets/stylesheets/application.sass index 6dd0a42..4b82eeb 100644 --- a/app/assets/stylesheets/application.sass +++ b/app/assets/stylesheets/application.sass @@ -23,7 +23,10 @@ $font-size-h3: $font-size-base @import "typeaheadjs" body - padding-top: 20px + .container + box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19) + padding-top: 20px + .lead font-weight: normal diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim index be16573..7ed2c8d 100644 --- a/app/views/layouts/application.html.slim +++ b/app/views/layouts/application.html.slim @@ -37,5 +37,6 @@ html lang="#{I18n.locale}" / = console if Rails.env.development? .container + = render 'shared/header' = render 'shared/flashes' = yield diff --git a/app/views/shared/_header.slim b/app/views/shared/_header.slim new file mode 100644 index 0000000..72202f4 --- /dev/null +++ b/app/views/shared/_header.slim @@ -0,0 +1,20 @@ +header + .row + .col-md-1.col-xs-4 + = image_tag('ch420_logo.png', class:'img-responsive pagelogo', alt: t('.logo')) + .col-md-8.col-xs-8 + h1 + = title t('.title_html') + .col-xs-12.col-md-3 + nav.pull-right + h2.sr-only =t('.lang') + a href='/' lang='de' + | Deutsch + |   |   + a href='/it' lang='it' + | Italiano + |   |   + a href='/fr' lang='fr' + | Français + br/ + = render 'shared/counter' \ No newline at end of file diff --git a/app/views/supporters/_form.slim b/app/views/supporters/_form.slim index d821b0f..d3100ce 100644 --- a/app/views/supporters/_form.slim +++ b/app/views/supporters/_form.slim @@ -1,22 +1,3 @@ -.row - .col-md-1.col-xs-4 - = image_tag('ch420_logo.png', class:'img-responsive pagelogo', alt: t('.logo')) - .col-md-8.col-xs-8 - h1 - = title t('.title_html') - .col-xs-12.col-md-3 - nav.pull-right - h2.sr-only =t('.lang') - a href='/' lang='de' - | Deutsch - |   |   - a href='/it' lang='it' - | Italiano - |   |   - a href='/fr' lang='fr' - | Français - br/ - = render 'shared/counter' .row .col-xs-12.col-md-7 h2.sr-only =t('.form') diff --git a/config/locales/de.yml b/config/locales/de.yml index f406215..735549c 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -38,12 +38,16 @@ de: pages: thanks: title: Besten Dank für deine Unterstützung! - + shared: + header: + logo: Logo der Initiative + title_html: Ja, ich will Cannabis in der Schweiz legalisieren + counter: supporters: "Unterstützer:" amount_of_supporters: Zurzeit haben wir %{amount} Unterstützer. - + mongoid: attributes: supporter: