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

Utilisation d'une meilleure syntaxe compass/sass

Browse Source
This commit is contained in:
echarp 2014-08-17 20:16:40 +02:00
parent 849066c0e5
commit 2b42a84e27
10 changed files with 70 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Gemfile
View File

@ -1,8 +1,11 @@
source 'https://rubygems.org' source 'https://rubygems.org'
# The central piece of this application: the month calendar view
gem 'simple_calendar'
gem 'rails' gem 'rails'
# Use SCSS for stylesheets # Use SCSS for stylesheets
gem 'sass-rails' gem 'sass-rails', '~> 4.0.3'
# Use Uglifier as compressor for JavaScript assets # Use Uglifier as compressor for JavaScript assets
gem 'uglifier' gem 'uglifier'
@ -59,16 +62,16 @@ gem 'rails-i18n'
gem 'i18n-active_record', gem 'i18n-active_record',
git: 'git://github.com/svenfuchs/i18n-active_record.git', git: 'git://github.com/svenfuchs/i18n-active_record.git',
require: 'i18n/active_record' require: 'i18n/active_record'
# A superb font to use as icons # A superb font to use as icons
gem 'font-awesome-rails' gem 'font-awesome-rails'
# Validate mails submitted # Validate mails submitted
gem 'email_validator' gem 'email_validator'
# Email address obfuscation
gem 'actionview-encoded_mail_to'
# To display a patched diff for event descriptions # To display a patched diff for event descriptions
gem 'differ' gem 'differ'
# The central piece of this application: the month calendar view
gem 'simple_calendar'
# A generic library to administrate the tool # A generic library to administrate the tool
gem 'activeadmin', github: 'gregbell/active_admin' gem 'activeadmin', github: 'gregbell/active_admin'
# A nicer markdown editor in active admin # A nicer markdown editor in active admin
@ -77,9 +80,6 @@ gem 'activeadmin_pagedown'
# Markdown display # Markdown display
gem 'redcarpet' gem 'redcarpet'
# email adress obfuscation
gem 'actionview-encoded_mail_to'
# Carte openstreetmap # Carte openstreetmap
gem 'leaflet-rails' gem 'leaflet-rails'

34
Gemfile.lock
View File

@ -60,8 +60,8 @@ GEM
arel (5.0.1.20140414130214) arel (5.0.1.20140414130214)
ast (2.0.0) ast (2.0.0)
bcrypt (3.1.7) bcrypt (3.1.7)
bourbon (4.0.2) bourbon (3.2.3)
sass (~> 3.3) sass (~> 3.2)
thor thor
brakeman (2.6.1) brakeman (2.6.1)
erubis (~> 2.6) erubis (~> 2.6)
@ -86,18 +86,10 @@ GEM
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.7.1) coffee-script-source (1.7.1)
compass (1.0.0) compass (0.12.7)
chunky_png (~> 1.2) chunky_png (~> 1.2)
compass-core (~> 1.0.0) fssm (>= 0.2.7)
compass-import-once (~> 1.0.5) sass (~> 3.2.19)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
sass (>= 3.3.13, < 3.5)
compass-core (1.0.0)
multi_json (~> 1.0)
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
compass-rails (2.0.0) compass-rails (2.0.0)
compass (>= 0.12.2) compass (>= 0.12.2)
devise (3.3.0) devise (3.3.0)
@ -123,6 +115,7 @@ GEM
formatador (0.2.5) formatador (0.2.5)
formtastic (2.3.0.rc4) formtastic (2.3.0.rc4)
actionpack (>= 3.0) actionpack (>= 3.0)
fssm (0.2.10)
guard (2.6.1) guard (2.6.1)
formatador (>= 0.2.4) formatador (>= 0.2.4)
listen (~> 2.7) listen (~> 2.7)
@ -258,11 +251,12 @@ GEM
sexp_processor (~> 4.0) sexp_processor (~> 4.0)
ruby_parser (3.5.0) ruby_parser (3.5.0)
sexp_processor (~> 4.1) sexp_processor (~> 4.1)
sass (3.3.14) sass (3.2.19)
sass-rails (4.0.1) sass-rails (4.0.3)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
sass (>= 3.1.10) sass (~> 3.2.0)
sprockets-rails (~> 2.0.0) sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0)
sdoc (0.4.1) sdoc (0.4.1)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0) rdoc (~> 4.0)
@ -276,12 +270,12 @@ GEM
tilt (>= 1.3.3, < 2.1) tilt (>= 1.3.3, < 2.1)
slop (3.6.0) slop (3.6.0)
spring (1.1.3) spring (1.1.3)
sprockets (2.12.1) sprockets (2.11.0)
hike (~> 1.2) hike (~> 1.2)
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.0.1) sprockets-rails (2.1.3)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
sprockets (~> 2.8) sprockets (~> 2.8)
@ -348,7 +342,7 @@ DEPENDENCIES
rails rails
rails-i18n rails-i18n
redcarpet redcarpet
sass-rails sass-rails (~> 4.0.3)
sdoc (~> 0.4.0) sdoc (~> 0.4.0)
select2-rails select2-rails
simple_calendar simple_calendar

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

@ -5,10 +5,10 @@
height: auto height: auto
padding: 0 padding: 0
max-width: 100% max-width: 100%
box-sizing: border-box
line-height: 1em line-height: 1em
margin-left: auto margin-left: auto
margin-right: auto margin-right: auto
+box-sizing(border-box)
html html
color: black color: black
@ -26,14 +26,13 @@ body
background-color: white background-color: white
header, main, footer header, main, footer
* *
@include transition-duration(0.5s) +transition-duration(0.5s)
a:link, a:visited a
color: #258 +link-colors(#258, #2E97FF, #2E97FF, #258, #2E97FF)
font-weight: bold &:link, &:visited
text-decoration: none font-weight: bold
a:hover, a:active, a:focus text-decoration: none
color: #2E97FF
#flash_messages .flash #flash_messages .flash
color: white color: white
@ -44,8 +43,8 @@ a:hover, a:active, a:focus
font-size: x-large font-size: x-large
text-align: justify text-align: justify
background-color: #008cba background-color: #008cba
@include box-shadow(0 0 0.3em gray) +box-shadow(0 0 0.3em gray)
@include border-radius(3px) +border-radius(3px)
&.notice &.notice
border-color: #3a945b border-color: #3a945b
background-color: #43ac6a background-color: #43ac6a
@ -57,12 +56,12 @@ h3.warning
color: white color: white
margin: 0 margin: 0
padding: 1em padding: 1em
display: inline-block
text-align: center text-align: center
border-color: #de2b0f border-color: #de2b0f
background-color: #f04124 background-color: #f04124
@include box-shadow(0 0 0.3em gray) +box-shadow(0 0 0.3em gray)
@include border-radius(1em) +inline-block()
+border-radius(1em)
.fa:before .fa:before
font-style: normal font-style: normal
@ -138,8 +137,8 @@ fieldset
border: none border: none
margin: 1em auto margin: 1em auto
padding: 1em padding: 1em
@include box-shadow(1px 1px 5px gray) +box-shadow(1px 1px 5px gray)
@include border-radius(0.4em) +border-radius(0.4em)
legend legend
float: left float: left
color: gray color: gray
@ -154,8 +153,8 @@ label
padding-right: 0.4em padding-right: 0.4em
.mce-tinymce .mce-tinymce
border: 1px solid darkgray border: 1px solid darkgray
@include box-shadow(1px 1px 2px lightgray) +box-shadow(1px 1px 2px lightgray)
@include border-radius(0.4em) +border-radius(0.4em)
input, textarea, select, a.button, .select2-container ul input, textarea, select, a.button, .select2-container ul
color: black color: black
margin: 3px 0 margin: 3px 0
@ -165,13 +164,13 @@ input, textarea, select, a.button, .select2-container ul
font-size: inherit font-size: inherit
font-family: inherit font-family: inherit
background-color: white background-color: white
@include box-shadow(1px 1px 2px lightgray) +box-shadow(1px 1px 2px lightgray)
@include border-radius(0.4em) +border-radius(0.4em)
&:focus &:focus
background-color: #F0F8FF background-color: #F0F8FF
@include box-shadow(1px 1px 4px gray) +box-shadow(1px 1px 4px gray)
&[type=radio] &[type=radio]
@include box-shadow(none) +box-shadow(none)
&[type=radio] + label &[type=radio] + label
text-align: left text-align: left
&[type=submit], &.button &[type=submit], &.button
@ -183,7 +182,7 @@ input, textarea, select, a.button, .select2-container ul
line-height: 1.1em line-height: 1.1em
font-weight: bolder font-weight: bolder
background-color: #9CC5EE background-color: #9CC5EE
@include box-shadow(2px 2px 2px gray) +box-shadow(2px 2px 2px gray)
select, option select, option
color: black color: black
padding: 2px 4px padding: 2px 4px
@ -206,17 +205,17 @@ button.ws-popover-opener
padding: 0.2em 0.8em padding: 0.2em 0.8em
font-family: georgia, serif font-family: georgia, serif
background-color: white background-color: white
@include border-radius(0.7em) +border-radius(0.7em)
&:focus &:focus
outline: 0 outline: 0
background-color: #F0F8FF background-color: #F0F8FF
input[type=submit] input[type=submit]
border: none border: none
font-size: x-large font-size: x-large
@include box-shadow(0 0 1em lightblue) +box-shadow(0 0 1em lightblue)
@include text-shadow(1px 1px 1px white) +text-shadow(1px 1px 1px white)
&:hover &:hover
@include box-shadow(5px 5px 5px lightblue) +box-shadow(5px 5px 5px lightblue)
footer.bottom nav footer.bottom nav
clear: both clear: both
@ -235,14 +234,14 @@ footer.bottom nav
position: fixed position: fixed
font-size: 10vw font-size: 10vw
vertical-align: baseline vertical-align: baseline
@include text-shadow(0 0 4px gray) +text-shadow(0 0 4px gray)
.select2-container ul .select2-container ul
min-width: 6em min-width: 6em
.select2-container-multi.select2-container-active .select2-choices, .select2-drop .select2-container-multi.select2-container-active .select2-choices, .select2-drop
border: none !important border: none !important
@include box-shadow(1px 1px 4px gray) +box-shadow(1px 1px 4px gray)
// Otherwise the cross to remove tags is centered // Otherwise the cross to remove tags is centered
.select2-container *, .select2-choices * .select2-container *, .select2-choices *
margin: initial margin: initial
@include transition-duration(0) +transition-duration(0)

6
app/assets/stylesheets/application.css.sass
View File

@ -22,10 +22,10 @@ body.application
text-align: left text-align: left
&.infos main h2:first-child &.infos main h2:first-child
@include fa-icon('') +fa-icon('')
&.contact main h2:first-child &.contact main h2:first-child
@include fa-icon('') +fa-icon('')
&.rules main h2:first-child &.rules main h2:first-child
@include fa-icon('') +fa-icon('')

12
app/assets/stylesheets/events.css.sass
View File

@ -102,8 +102,8 @@ a#banner
body.events.show main body.events.show main
padding: 1em padding: 1em
max-width: 60em max-width: 60em
@include box-shadow(1px 1px 5px gray) +box-shadow(1px 1px 5px gray)
@include border-radius(0.4em) +border-radius(0.4em)
h2 h2
margin-top: 1em margin-top: 1em
@ -116,8 +116,8 @@ aside#lug-list
font-size: 0.7em font-size: 0.7em
margin-right: -4em margin-right: -4em
background-color: #D6ECFF background-color: #D6ECFF
@include box-shadow(4px 4px 1em gray) +box-shadow(4px 4px 1em gray)
@include border-radius(10px) +border-radius(10px)
h1 h1
font-weight: normal font-weight: normal
border-bottom: 1px black solid border-bottom: 1px black solid
@ -162,7 +162,7 @@ aside#lug-list
line-height: 0.9em line-height: 0.9em
label label
width: 6.3em width: 6.3em
display: inline-block +inline-block()
&:after &:after
content: ':' content: ':'
input[type=radio] + label input[type=radio] + label
@ -176,7 +176,7 @@ aside#lug-list
font-size: x-large font-size: x-large
.mce-tinymce .mce-tinymce
display: inline-block +inline-block()
.description .description
text-align: left text-align: left

2
app/assets/stylesheets/list.css.sass
View File

@ -43,7 +43,7 @@ dl
font-weight: normal font-weight: normal
text-decoration: none text-decoration: none
&:hover &:hover
@include text-shadow(2px 2px 1px lightblue) +text-shadow(2px 2px 1px lightblue)
&:before &:before
padding: 0.5em padding: 0.5em
font-size: 20px font-size: 20px

2
app/assets/stylesheets/lugs.sass
View File

@ -3,7 +3,7 @@
img.favicon img.favicon
max-height: 2em max-height: 2em
vertical-align: middle vertical-align: middle
@include border-radius(3px) +border-radius(3px)
form#lug_search form#lug_search
right: 5% right: 5%

4
app/assets/stylesheets/maps.css.sass
View File

@ -3,5 +3,5 @@
#map #map
height: 60em height: 60em
@include box-shadow(0 0 1em SteelBlue) +box-shadow(0 0 1em SteelBlue)
@include transition(none) +transition(none)

4
app/assets/stylesheets/moderations.css.sass
View File

@ -1,3 +1,5 @@
@import compass
h2.warning h2.warning
color: red color: red
@ -29,5 +31,5 @@ h2.warning
padding: 0 padding: 0
a a
padding: 0.2em padding: 0.2em
display: inline-block
font-weight: normal font-weight: normal
+inline-block()

12
app/assets/stylesheets/region.css.sass
View File

@ -10,12 +10,12 @@
margin: 0 margin: 0
display: none display: none
position: absolute position: absolute
list-style: none
margin-top: -7em margin-top: -7em
background-color: white background-color: white
@include box-shadow(1px 1px 4px gray) +no-bullets()
@include border-bottom-left-radius(0.4em) +box-shadow(1px 1px 4px gray)
@include border-bottom-right-radius(0.4em) +border-bottom-left-radius(0.4em)
+border-bottom-right-radius(0.4em)
li li
margin: 0 margin: 0
a a
@ -24,9 +24,7 @@
border-top: solid thin black border-top: solid thin black
&:hover &:hover
background-color: #eee background-color: #eee
@include text-shadow(1px 1px 0.2em gray) +text-shadow(1px 1px 0.2em gray)
li:first-child a
border-top: none
&:hover ul &:hover ul
display: block display: block