Utilisation d'une meilleure syntaxe compass/sass

recurrent
echarp 8 years ago
parent 849066c0e5
commit 2b42a84e27
  1. 14
      Gemfile
  2. 34
      Gemfile.lock
  3. 57
      app/assets/stylesheets/all.css.sass
  4. 6
      app/assets/stylesheets/application.css.sass
  5. 12
      app/assets/stylesheets/events.css.sass
  6. 2
      app/assets/stylesheets/list.css.sass
  7. 2
      app/assets/stylesheets/lugs.sass
  8. 4
      app/assets/stylesheets/maps.css.sass
  9. 4
      app/assets/stylesheets/moderations.css.sass
  10. 12
      app/assets/stylesheets/region.css.sass

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

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

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

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

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

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

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

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

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

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

Loading…
Cancel
Save