diff --git a/Gemfile b/Gemfile index 4a52ebb9..cf0041ec 100644 --- a/Gemfile +++ b/Gemfile @@ -47,8 +47,6 @@ gem 'spring', group: :development gem 'haml-rails' gem 'compass-rails' gem 'modernizr-rails' -# Using presentation framework http://foundation.zurb.com -gem 'foundation-rails' gem 'activeadmin', github: 'gregbell/active_admin' gem 'devise' diff --git a/Gemfile.lock b/Gemfile.lock index 621a4130..20389c73 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -113,9 +113,6 @@ GEM formatador (0.2.5) formtastic (2.3.0.rc3) actionpack (>= 3.0) - foundation-rails (5.3.0.1) - railties (>= 3.1.0) - sass (>= 3.2.0) fssm (0.2.10) guard (2.6.1) formatador (>= 0.2.4) @@ -300,7 +297,6 @@ DEPENDENCIES differ email_validator font-awesome-rails - foundation-rails guard-brakeman guard-bundler guard-livereload diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 9e2fadda..e834774a 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -15,5 +15,4 @@ //= require jquery.turbolinks //= require turbolinks //= require modernizr -//= require gritter //= require_tree . diff --git a/app/assets/stylesheets/all.css.sass b/app/assets/stylesheets/all.css.sass index 44d4e5af..b217536b 100644 --- a/app/assets/stylesheets/all.css.sass +++ b/app/assets/stylesheets/all.css.sass @@ -4,6 +4,7 @@ * margin: 0 padding: 0 + box-sizing: border-box line-height: 1em @include transition-duration(0.5s) @@ -19,8 +20,8 @@ body margin: 5px 5px 0 padding: 10px text-align: center - background: white border-bottom: 0px + background-color: white a:link, a:visited color: #258 @@ -30,9 +31,28 @@ a:hover, a:active, a:focus color: #2E97FF #flash_messages - font-size: x-large - .flash.notice - color: green + left: 0 + width: 100% + z-index: 1000 + position: absolute + margin-top: -2.5em + .flash + color: white + border: solid 1px #007ba0 + margin: 1em auto + padding: 0.5em 1.1em + max-width: 40em + font-size: x-large + text-align: justify + background-color: #008cba + @include box-shadow(0 0 0.3em gray) + @include border-radius(3px) + &.notice + border-color: #3a945b + background-color: #43ac6a + &.alert + border-color: #de2b0f + background-color: #f04124 .fa:before font-style: normal diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb index 4f9de7b4..478a4e91 100644 --- a/app/controllers/events_controller.rb +++ b/app/controllers/events_controller.rb @@ -4,7 +4,6 @@ class EventsController < ApplicationController before_filter :set_mailer_host def index - flash[:notice] = 'hello world' @events = Event.moderated if (params[:region] && params[:region].present? && params[:region] != 'all') @events = @events.region(params[:region]) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index b69f77c6..2175a069 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -2,9 +2,10 @@ /[if IE] %html.no-js(lang="#{I18n.locale}") %head - %title=t '.title' + %title= content_for?(:title) ? yield(:title) : t('.title') %meta(http-equiv='Content-Type' content='text/html; charset=utf-8') + %meta(name='viewport' content='width=device-width, initial-scale=1.0') %meta(name='description' content='Agende du Libre. Free Software Calendar') %meta(name='author' content='Emmanuel Charpentier')