Removal of compass, which was used to support older browsers

filter
echarp 6 years ago
parent a2dc4144e7
commit 572ab44e2b

@ -5,7 +5,7 @@ gem 'simple_calendar'
# The recurrence management library
gem 'ice_cube'
gem 'rails', '< 5.0'
gem 'rails'
gem 'has_scope'
# Use ActiveModel has_secure_password
@ -44,9 +44,10 @@ gem 'actionview-encoded_mail_to'
gem 'differ'
# A generic library to administrate the tool
gem 'activeadmin', '~> 1.0.0.pre1'
gem 'activeadmin', '~> 1.0.0.pre4'
# A nicer markdown editor in active admin
gem 'activeadmin_pagedown'
gem 'inherited_resources', github: 'activeadmin/inherited_resources'
gem 'jquery-sparkline-rails', github: 'cubus/jquery-sparkline-rails'
@ -117,7 +118,6 @@ group :development, :test, :assets do
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', group: :doc
gem 'compass-rails', github: 'Compass/compass-rails'
gem 'modernizr-rails'
# Patch older browsers so they do understand html5

@ -1,11 +1,12 @@
GIT
remote: git://github.com/Compass/compass-rails.git
revision: 86afb2c45ae329b3720be102c549612703e16402
remote: git://github.com/activeadmin/inherited_resources.git
revision: 4434f0ae72f790cf371728838c927c338100555d
specs:
compass-rails (3.0.2)
compass (~> 1.0.0)
sass-rails (< 5.1)
sprockets (< 4.0)
inherited_resources (1.6.0)
actionpack (>= 3.2, < 5.1)
has_scope (~> 0.6)
railties (>= 3.2, < 5.1)
responders
GIT
remote: git://github.com/cubus/jquery-sparkline-rails.git
@ -46,7 +47,7 @@ GEM
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview-encoded_mail_to (1.0.7)
rails
activeadmin (1.0.0.pre1)
activeadmin (1.0.0.pre4)
arbre (~> 1.0, >= 1.0.2)
bourbon
coffee-rails
@ -54,11 +55,12 @@ GEM
formtastic_i18n
inherited_resources (~> 1.6)
jquery-rails
jquery-ui-rails (~> 5.0)
jquery-ui-rails
kaminari (~> 0.15)
rails (>= 3.2, < 5.0)
rails (>= 3.2, < 5.1)
ransack (~> 1.3)
sass-rails
sprockets (< 4)
activeadmin_pagedown (0.0.2)
activeadmin (>= 0.5.0)
activejob (4.2.7.1)
@ -90,7 +92,6 @@ GEM
buftok (0.2.0)
builder (3.2.2)
byebug (9.0.5)
chunky_png (1.3.7)
coderay (1.1.1)
coffee-rails (4.2.1)
coffee-script (>= 2.2.0)
@ -99,18 +100,6 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.10.0)
compass (1.0.3)
chunky_png (~> 1.2)
compass-core (~> 1.0.2)
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.3)
multi_json (~> 1.0)
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
concurrent-ruby (1.0.2)
debug_inspector (0.0.2)
devise (3.5.10)
@ -191,9 +180,9 @@ GEM
rake (>= 10, < 12)
rubocop (>= 0.36.0)
sysexits (~> 1.1)
has_scope (0.6.0)
actionpack (>= 3.2, < 5)
activesupport (>= 3.2, < 5)
has_scope (0.7.0)
actionpack (>= 4.1, < 5.1)
activesupport (>= 4.1, < 5.1)
html2haml (2.0.0)
erubis (~> 2.7.0)
haml (~> 4.0.0)
@ -211,11 +200,6 @@ GEM
http_parser.rb (0.6.0)
i18n (0.7.0)
ice_cube (0.14.0)
inherited_resources (1.6.0)
actionpack (>= 3.2, < 5)
has_scope (~> 0.6.0.rc)
railties (>= 3.2, < 5)
responders
jbuilder (2.6.0)
activesupport (>= 3.0.0, < 5.1)
multi_json (~> 1.2)
@ -422,12 +406,11 @@ PLATFORMS
DEPENDENCIES
actionview-encoded_mail_to
activeadmin (~> 1.0.0.pre1)
activeadmin (~> 1.0.0.pre4)
activeadmin_pagedown
brakeman
byebug
coffee-rails
compass-rails!
devise (< 4.0)
devise-i18n
differ
@ -446,6 +429,7 @@ DEPENDENCIES
http_accept_language
i18n-active_record!
ice_cube
inherited_resources!
jbuilder
jquery-rails (< 4.1)
jquery-sparkline-rails!
@ -457,7 +441,7 @@ DEPENDENCIES
paper_trail
quiet_assets
rack-livereload
rails (< 5.0)
rails
rails-i18n
redcarpet
sass-rails

@ -1,4 +1,3 @@
@import compass
@import font-awesome-sprockets
@import font-awesome
@import leaflet.awesome-markers
@ -7,9 +6,9 @@
height: auto
padding: 0
max-width: 100%
box-sizing: border-box
margin-left: auto
margin-right: auto
+box-sizing(border-box)
html
color: black
@ -39,12 +38,14 @@ body
background-color: white
header, main, footer
*
+transition-duration(0.5s)
transition-duration: 0.5s
a
+link-colors(#258, #2E97FF, #2E97FF, #258, #2E97FF)
&:link, &:visited
color: #258
text-decoration: none
&:hover, &:active, &:focus
color: #2E97FF
#flash_messages .flash
color: white
@ -54,9 +55,9 @@ a
max-width: 50em
font-size: x-large
text-align: justify
box-shadow: 0 0 0.3em gray
border-radius: 3px
background-color: #008cba
+box-shadow(0 0 0.3em gray)
+border-radius(3px)
&.notice
border-color: #3a945b
background-color: #43ac6a
@ -68,11 +69,11 @@ h3.warning
color: white
margin: 0
padding: 1em
display: inline-block
text-align: center
background-color: orange
+box-shadow(0 0 0.3em gray)
+inline-block()
+border-radius(1em)
box-shadow: 0 0 0.3em gray
border-radius: 1em
header.top
img.logo
@ -146,10 +147,10 @@ aside
margin: 0 1.2em
padding: 5px
font-size: 0.7em
box-shadow: 4px 4px 1em gray
margin-right: -4em
border-radius: 10px
background-color: #D6ECFF
+box-shadow(4px 4px 1em gray)
+border-radius(10px)
h1
font-weight: normal
border-bottom: 1px black solid
@ -165,14 +166,14 @@ iframe
border: none
max-width: 100%
margin-bottom: 1.6em
+border-radius(1em)
border-radius: 1em
fieldset
border: none
margin: 1em auto
padding: 1em
+box-shadow(1px 1px 5px gray)
+border-radius(0.4em)
box-shadow: 1px 1px 5px gray
border-radius: 0.4em
legend
float: left
color: gray
@ -187,8 +188,8 @@ label
padding-right: 0.4em
.mce-tinymce
border: 1px solid darkgray
+box-shadow(1px 1px 2px lightgray)
+border-radius(0.4em)
box-shadow: 1px 1px 2px lightgray
border-radius: 0.4em
input, textarea, select, a.button, button, .select2-container ul
color: black
margin: 3px 0
@ -196,15 +197,15 @@ input, textarea, select, a.button, button, .select2-container ul
outline: none
padding: 0.2em 0.4em
font-size: inherit
box-shadow: 1px 1px 2px lightgray
font-family: inherit
border-radius: 0.4em
background-color: white
+box-shadow(1px 1px 2px lightgray)
+border-radius(0.4em)
&:focus
background-color: #F0F8FF
+box-shadow(1px 1px 4px gray)
box-shadow: 1px 1px 4px gray
&[type=radio]
+box-shadow(none)
box-shadow: none
&[type=radio] + label
text-align: left
&[type=submit], &.button, button
@ -214,9 +215,9 @@ input, textarea, select, a.button, button, .select2-container ul
margin: 3px 0.4em
padding: 0.2em 0.6em
font-size: larger
box-shadow: 2px 2px 2px gray
font-weight: bolder
background-color: #9CC5EE
+box-shadow(2px 2px 2px gray)
select, option
color: black
padding: 2px 4px
@ -238,29 +239,29 @@ button.ws-popover-opener
border: 1px solid #868686
padding: 0.2em 0.8em
font-family: Palatino, 'URW Palladio L', 'dejavu serif', georgia, serif
border-radius: 0.7em
background-color: white
+border-radius(0.7em)
&:focus
outline: 0
background-color: #F0F8FF
input[type=submit]
border: none
font-size: x-large
+box-shadow(0 0 1em lightblue)
+text-shadow(1px 1px 1px white)
box-shadow: 0 0 1em lightblue
text-shadow: 1px 1px 1px white
&:hover
+box-shadow(5px 5px 5px lightblue)
box-shadow: 5px 5px 5px lightblue
footer.bottom nav
clear: both
a
padding: 1.8%
display: inline-block
font-weight: bolder
+inline-block()
em.fa
font-size: x-large
&:hover
+text-shadow(0 0 1em lightgray)
text-shadow: 0 0 1em lightgray
#loading
top: 45%
@ -269,8 +270,8 @@ footer.bottom nav
display: none
position: fixed
font-size: 10vw
text-shadow: 0 0 4px gray
vertical-align: baseline
+text-shadow(0 0 4px gray)
.pagination
span
@ -282,8 +283,8 @@ footer.bottom nav
min-width: 46em
.select2-container-multi.select2-container-active .select2-choices, .select2-drop
border: none !important
+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
+transition-duration(0)
transition-duration: 0

@ -1,10 +1,8 @@
@import compass
body.digests main
padding: 1em
max-width: 60em
+box-shadow(1px 1px 5px gray)
+border-radius(0.4em)
box-shadow: 1px 1px 5px gray
border-radius: 0.4em
h2
margin: 0

@ -1,5 +1,3 @@
@import compass
header.calendar-header
font-size: 1.5em
margin-top: 0.4em
@ -113,8 +111,8 @@ a#banner
body.events.show main, body.orgas.show main
padding: 1em
max-width: 60em
+box-shadow(1px 1px 5px gray)
+border-radius(0.4em)
box-shadow: 1px 1px 5px gray
border-radius: 0.4em
h2
margin-top: 1em

@ -1,4 +1,3 @@
@import compass
@import font-awesome-sprockets
@import font-awesome
@ -16,10 +15,10 @@
padding-left: 0.4em
label
width: 8em
+inline-block()
display: inline-block
input, select, .select2-container ul
+border-top-left-radius(0)
+border-bottom-left-radius(0)
border-top-left-radius: 0
border-bottom-left-radius: 0
input[type=radio] + label
width: 20em
&:after
@ -30,17 +29,17 @@
min-width: 22em
.mce-tinymce
display: inline-block
font-size: inherit
font-family: inherit
+inline-block()
+border-radius(0.4em)
+border-top-left-radius(0)
+border-bottom-left-radius(0)
border-radius: 0.4em
border-top-left-radius: 0
border-bottom-left-radius: 0
.mce-container-body
.mce-panel.mce-first
+border-top-right-radius(0.4em)
border-top-right-radius: 0.4em
.mce-panel.mce-last
+border-bottom-right-radius(0.4em)
border-bottom-right-radius: 0.4em
.field label:before, th:before, th a:before
color: gray
@ -103,7 +102,7 @@
[type=radio]:checked + label:before
color: black
content: $fa-var-dot-circle-o
+text-shadow(0 0 1px gray)
text-shadow: 0 0 1px gray
.actions
text-align: center

@ -1,5 +1,3 @@
@import compass
.quantity
text-align: right !important
white-space: nowrap
@ -51,8 +49,8 @@ ul.counters
color: white
display: inline-block
padding: 0.2em 0.8em
border-radius: 1em
background-color: darkblue
+border-radius(1em)
.edit_link:link, .delete_link:link
display: none

@ -1,12 +1,11 @@
@import compass
@import leaflet
@import leaflet.markercluster
@import leaflet.markercluster.default
#map
height: 60em
+box-shadow(0 0 1em SteelBlue)
+transition(none)
box-shadow: 0 0 1em SteelBlue
transition: none
*
/* Popup are better displayed with this: */
max-width: initial
@ -18,7 +17,7 @@
width: 40%
height: 60em
margin: 1.6em 2%
+inline-block()
display: inline-block
// Left align the map controls place in the top right corner
form.leaflet-control-layers-list label
@ -31,4 +30,4 @@ form.leaflet-control-layers-list label
html.iframe #map
width: 100%
max-width: 100%
+box-shadow(none)
box-shadow: none

@ -1,5 +1,3 @@
@import compass
@media all and (min-width: 1600px)
body
font-size: larger
@ -123,6 +121,6 @@
margin-left: 0
input, .select2-container ul, .mce-tinymce
width: 100%
+border-bottom-left-radius(0.4em)
border-bottom-left-radius: 0.4em
.select2-container ul
min-width: 20em

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

@ -1,9 +1,7 @@
@import compass
img.favicon
max-height: 2em
border-radius: 3px
vertical-align: middle
+border-radius(3px)
form#orga_search
right: 5%
@ -30,11 +28,11 @@ form#orga_search
color: #258
border: none
padding: 0
box-shadow: none
margin-top: -0.1em
margin-left: 0
vertical-align: middle
background-color: transparent
+box-shadow(none)
&:hover em.fa
color: #2E97FF
span.label
@ -44,8 +42,8 @@ body.orgas.show main
fieldset.orga
min-width: 60em
dl, iframe, fieldset
display: inline-block
min-width: 30em
+inline-block()
vertical-align: top
table tr.inactive

@ -1,7 +1,5 @@
@import compass
.region_selector
+inline-block()
display: inline-block
h3
margin: 0
.placeholder
@ -12,11 +10,11 @@
display: none
position: absolute
margin-top: -7em
list-style: none
box-shadow: 1px 1px 4px gray
background-color: white
+no-bullets()
+box-shadow(1px 1px 4px gray)
+border-bottom-left-radius(0.4em)
+border-bottom-right-radius(0.4em)
border-bottom-left-radius: 0.4em
border-bottom-right-radius: 0.4em
li
margin: 0
a
@ -24,8 +22,8 @@
padding: 0.2em 1em
border-top: solid thin black
&:hover
text-shadow: 1px 1px 0.2em gray
background-color: #eee
+text-shadow(1px 1px 0.2em gray)
em.fa-globe
color: red
&:hover ul

@ -1,9 +1,7 @@
@import compass
.sessions
form
margin: 1em auto
+inline-block()
display: inline-block
.field, .actions
text-align: left
margin: 0.5em
@ -13,7 +11,7 @@
margin: 1px 5px 1px 6.6em
label
width: 8em
+inline-block()
display: inline-block
&:after
content: ':'
/*

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -0,0 +1,21 @@
(function() {
$(document).on('turbolinks:load', function() {
return tinyMCE.init({
schema: 'html5',
menubar: false,
language: 'fr_FR',
selector: 'textarea.description',
content_css: '/assets/application-9ff4c80bfe3385e0db55ece563c09f2d89be94affb9c449d21e83bc8b5bafe10.css',
entity_encoding: 'raw',
add_unload_trigger: true,
browser_spellcheck: true,
toolbar: [' bold italic strikethrough | bullist numlist outdent indent | alignleft aligncenter alignright alignjustify | link image media insertdatetime charmap table | undo redo | searchreplace | code visualblocks preview fullscreen'],
plugins: 'lists, advlist, autolink, link, image, charmap, paste, print, preview, table, fullscreen, searchreplace, media, insertdatetime, visualblocks, visualchars, wordcount, contextmenu, code'
});
});
$(document).on('turbolinks:before-cache', function() {
return tinymce.remove();
});
}).call(this);
Loading…
Cancel
Save