Skip to content

Commit 750b438

Browse files
committed
Passage to Sass 6+
Still maintained, will require an upgrade to dart-sass at some point.
1 parent b5ec6af commit 750b438

File tree

4 files changed

+46
-51
lines changed

4 files changed

+46
-51
lines changed

Gemfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ gem "state_machines-activerecord"
3838
# Gems used for assets
3939
assets = !%w(production alpha).include?(ENV['RAILS_ENV'])
4040
assets = true if ENV['RAILS_GROUPS'] == "assets"
41-
gem "jquery-rails", "~>4.0", require: assets
42-
gem "normalize-rails", "~>8.0", require: assets
43-
gem "sass-rails", "~>5.0", require: assets
44-
gem "terser", "~> 1.2", require: assets
41+
gem "jquery-rails", "~>4.0", require: assets
42+
gem "normalize-rails", "~>8.0", require: assets
43+
gem "sassc-rails", require: assets
44+
gem "terser", "~> 1.2", require: assets
4545

4646
group :development, :test do
4747
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
@@ -64,5 +64,5 @@ group :test do
6464
end
6565

6666
group :production, :alpha do
67-
gem "unicorn", "~>6.1"
67+
gem "unicorn", "~>6.1"
6868
end

Gemfile.lock

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -264,14 +264,14 @@ GEM
264264
pygments.rb (1.2.1)
265265
multi_json (>= 1.0.0)
266266
racc (1.7.3)
267-
rack (2.2.9)
268-
rack-session (1.0.2)
269-
rack (< 3)
267+
rack (3.0.10)
268+
rack-session (2.0.0)
269+
rack (>= 3.0.0)
270270
rack-test (2.1.0)
271271
rack (>= 1.3)
272-
rackup (1.0.0)
273-
rack (< 3)
274-
webrick
272+
rackup (2.1.0)
273+
rack (>= 3)
274+
webrick (~> 1.8)
275275
rails (7.1.3.2)
276276
actioncable (= 7.1.3.2)
277277
actionmailbox (= 7.1.3.2)
@@ -326,17 +326,14 @@ GEM
326326
crass (~> 1.0.2)
327327
nokogiri (>= 1.8.0)
328328
nokogumbo (~> 2.0)
329-
sass (3.7.4)
330-
sass-listen (~> 4.0.0)
331-
sass-listen (4.0.0)
332-
rb-fsevent (~> 0.9, >= 0.9.4)
333-
rb-inotify (~> 0.9, >= 0.9.7)
334-
sass-rails (5.1.0)
335-
railties (>= 5.2.0)
336-
sass (~> 3.1)
337-
sprockets (>= 2.8, < 4.0)
338-
sprockets-rails (>= 2.0, < 4.0)
339-
tilt (>= 1.1, < 3)
329+
sassc (2.4.0)
330+
ffi (~> 1.9)
331+
sassc-rails (2.1.2)
332+
railties (>= 4.0.0)
333+
sassc (>= 2.0)
334+
sprockets (> 3.0)
335+
sprockets-rails
336+
tilt
340337
simplecov (0.22.0)
341338
docile (~> 1.1)
342339
simplecov-html (~> 0.11)
@@ -345,10 +342,9 @@ GEM
345342
simplecov_json_formatter (0.1.4)
346343
sitemap_generator (2.2.1)
347344
spring (4.1.3)
348-
sprockets (3.7.3)
349-
base64
345+
sprockets (4.2.1)
350346
concurrent-ruby (~> 1.0)
351-
rack (> 1, < 3)
347+
rack (>= 2.2.4, < 4)
352348
sprockets-rails (3.4.2)
353349
actionpack (>= 5.2)
354350
activesupport (>= 5.2)
@@ -425,7 +421,7 @@ DEPENDENCIES
425421
rails (~> 7.1)
426422
redis (~> 5.0)
427423
rinku (~> 2.0)
428-
sass-rails (~> 5.0)
424+
sassc-rails
429425
simplecov
430426
sitemap_generator (~> 2.1)
431427
spring
Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,3 @@
11
@charset "UTF-8";
22

3-
/* Color constants */
4-
$C_CLAIR: #e9e6e4;
5-
$C_BANDEAU: #4c575f !default;
6-
$C_FONCE: #877768;
7-
$C_INTER: #93877b;
8-
$C_SOMBRE: #4e4e50;
9-
$C_INACTIVE: #cacacb;
10-
$C_BAS_FOND: #e4e4e4;
11-
$C_FOOT: #d4d1cf;
12-
$C_MIBLANC_MIFOOT: #e9e8e7;
13-
$C_CONTAINER: #f9f9f9;
14-
$C_MENU: #4c575f;
15-
$C_BORDER_FONCE: #999;
16-
17-
/*$C_BD1: #F9DEE8;
18-
$C_BD2: #F1ABC5;
19-
$C_BD3: #E978A3;
20-
$C_BD4: #E14E85;
21-
$C_BD5: #D91C64;*/
22-
$C_BD1: transparentize($C_BANDEAU, 0.84);
23-
$C_BD2: transparentize($C_BANDEAU, 0.67);
24-
$C_BD3: transparentize($C_BANDEAU, 0.5);
25-
$C_BD4: transparentize($C_BANDEAU, 0.33);
26-
$C_BD5: transparentize($C_BANDEAU, 0.17);
27-
283
@import "RonRonnement";
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/* Color constants */
2+
$C_CLAIR: #e9e6e4;
3+
$C_BANDEAU: #4c575f !default;
4+
$C_FONCE: #877768;
5+
$C_INTER: #93877b;
6+
$C_SOMBRE: #4e4e50;
7+
$C_INACTIVE: #cacacb;
8+
$C_BAS_FOND: #e4e4e4;
9+
$C_FOOT: #d4d1cf;
10+
$C_MIBLANC_MIFOOT: #e9e8e7;
11+
$C_CONTAINER: #f9f9f9;
12+
$C_MENU: #4c575f;
13+
$C_BORDER_FONCE: #999;
14+
15+
/*$C_BD1: #F9DEE8;
16+
$C_BD2: #F1ABC5;
17+
$C_BD3: #E978A3;
18+
$C_BD4: #E14E85;
19+
$C_BD5: #D91C64;*/
20+
$C_BD1: transparentize($C_BANDEAU, 0.84);
21+
$C_BD2: transparentize($C_BANDEAU, 0.67);
22+
$C_BD3: transparentize($C_BANDEAU, 0.5);
23+
$C_BD4: transparentize($C_BANDEAU, 0.33);
24+
$C_BD5: transparentize($C_BANDEAU, 0.17);

0 commit comments

Comments
 (0)