agenda-libre/agenda-libre-ruby
agenda-libre/agenda-libre-ruby
2
1
Fork 0
Code Issues Pull Requests Releases Activity

Retour en arrière pour foundation, trop complexe et pas nécessaire, messages stylés simplement

Browse Source
This commit is contained in:
echarp 2014-06-29 11:36:17 +02:00
parent 0e6535ac93
commit f5b7421271
6 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -47,8 +47,6 @@ gem 'spring', group: :development
gem 'haml-rails' gem 'haml-rails'
gem 'compass-rails' gem 'compass-rails'
gem 'modernizr-rails' gem 'modernizr-rails'
# Using presentation framework http://foundation.zurb.com
gem 'foundation-rails'
gem 'activeadmin', github: 'gregbell/active_admin' gem 'activeadmin', github: 'gregbell/active_admin'
gem 'devise' gem 'devise'

4
Gemfile.lock
View File

@ -113,9 +113,6 @@ GEM
formatador (0.2.5) formatador (0.2.5)
formtastic (2.3.0.rc3) formtastic (2.3.0.rc3)
actionpack (>= 3.0) actionpack (>= 3.0)
foundation-rails (5.3.0.1)
railties (>= 3.1.0)
sass (>= 3.2.0)
fssm (0.2.10) fssm (0.2.10)
guard (2.6.1) guard (2.6.1)
formatador (>= 0.2.4) formatador (>= 0.2.4)
@ -300,7 +297,6 @@ DEPENDENCIES
differ differ
email_validator email_validator
font-awesome-rails font-awesome-rails
foundation-rails
guard-brakeman guard-brakeman
guard-bundler guard-bundler
guard-livereload guard-livereload

1
app/assets/javascripts/application.js
View File

@ -15,5 +15,4 @@
//= require jquery.turbolinks //= require jquery.turbolinks
//= require turbolinks //= require turbolinks
//= require modernizr //= require modernizr
//= require gritter
//= require_tree . //= require_tree .

28
app/assets/stylesheets/all.css.sass
View File

@ -4,6 +4,7 @@
* *
margin: 0 margin: 0
padding: 0 padding: 0
box-sizing: border-box
line-height: 1em line-height: 1em
@include transition-duration(0.5s) @include transition-duration(0.5s)
@ -19,8 +20,8 @@ body
margin: 5px 5px 0 margin: 5px 5px 0
padding: 10px padding: 10px
text-align: center text-align: center
background: white
border-bottom: 0px border-bottom: 0px
background-color: white
a:link, a:visited a:link, a:visited
color: #258 color: #258
@ -30,9 +31,28 @@ a:hover, a:active, a:focus
color: #2E97FF color: #2E97FF
#flash_messages #flash_messages
font-size: x-large left: 0
.flash.notice width: 100%
color: green 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 .fa:before
font-style: normal font-style: normal

1
app/controllers/events_controller.rb
View File

@ -4,7 +4,6 @@ class EventsController < ApplicationController
before_filter :set_mailer_host before_filter :set_mailer_host
def index def index
flash[:notice] = 'hello world'
@events = Event.moderated @events = Event.moderated
if (params[:region] && params[:region].present? && params[:region] != 'all') if (params[:region] && params[:region].present? && params[:region] != 'all')
@events = @events.region(params[:region]) @events = @events.region(params[:region])

3
app/views/layouts/application.html.haml
View File

@ -2,9 +2,10 @@
/[if IE] /[if IE]
%html.no-js(lang="#{I18n.locale}") %html.no-js(lang="#{I18n.locale}")
%head %head
%title=t '.title' %title= content_for?(:title) ? yield(:title) : t('.title')
%meta(http-equiv='Content-Type' content='text/html; charset=utf-8') %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='description' content='Agende du Libre. Free Software Calendar')
%meta(name='author' content='Emmanuel Charpentier') %meta(name='author' content='Emmanuel Charpentier')