Merge pull request #307 from sosol/sass-rails-6

sass-rails 6

Gemfile

@@ -7,7 +7,7 @@ gem 'rails', '~> 6.1.5'
 
 # Needed for the new asset pipeline
 gem 'coffee-rails'
-gem 'sass-rails', '~> 5'
+gem 'sass-rails', '~> 6'
 gem 'therubyrhino'
 gem 'uglifier', '>= 1.0.3'
 

Gemfile.lock

@@ -320,12 +320,16 @@ GEM
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (5.1.0)
-      railties (>= 5.2.0)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
+    sass-rails (6.0.0)
+      sassc-rails (~> 2.1, >= 2.1.1)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
     sexp_processor (4.16.1)
     shoulda (4.0.0)
       shoulda-context (~> 2.0)
@@ -336,7 +340,7 @@ GEM
     silencer (2.0.0)
     spoon (0.0.6)
       ffi
-    sprockets (3.7.2)
+    sprockets (4.0.3)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.4.2)
@@ -428,7 +432,7 @@ DEPENDENCIES
   rubocop-rake
   rubyzip (~> 1.0)
   sass
-  sass-rails (~> 5)
+  sass-rails (~> 6)
   shoulda
   shoulda-context
   shoulda-matchers

app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

app/assets/stylesheets/editor.sass.erb

@@ -1,12 +1,12 @@
 // gray + 90: #dadada
-$main_color: gray + 90
-$main_color_fade: $main_color + 16
-$main_color_fade_medium: $main_color + 20
-$main_color_fade_full: $main_color + 26
-$main_color_fade_max: $main_color + 37
-$main_color_darken: $main_color - 10
-$main_color_darken_medium: $main_color - 31
-$main_color_darken_full: $main_color - 67
+$main_color: adjust-color(gray, $red: 90, $green: 90, $blue: 90)
+$main_color_fade: adjust-color($main_color, $red: 16, $green: 16, $blue: 16)
+$main_color_fade_medium: adjust-color($main_color, $red: 20, $green: 20, $blue: 20)
+$main_color_fade_full: adjust-color($main_color, $red: 26, $green: 26, $blue: 26)
+$main_color_fade_max: adjust-color($main_color, $red: 37, $green: 37, $blue: 37)
+$main_color_darken: adjust-color($main_color, $red: -10, $green: -10, $blue: -10)
+$main_color_darken_medium: adjust-color($main_color, $red: -31, $green: -31, $blue: -31)
+$main_color_darken_full: adjust-color($main_color, $red: -67, $green: -67, $blue: -67)
 $pn_color: #3C2217
 // use a blue-ish color for non-underlined link elements we
 // want to highlight
@@ -51,7 +51,7 @@ $non_underlined_link: #4183c4
     background: #c0c0c0
     border-style: inset
   &:disabled
-    color: $pn_color + 140
+    color: adjust-color($pn_color, $red: 140, $green: 140, $blue: 140)
 
 
 #main
@@ -75,7 +75,7 @@ $non_underlined_link: #4183c4
   //background-color: red
 
 .loading
-  background: gray + 90
+  background: adjust-color(gray, $red: 90, $green: 90, $blue: 90)
   background-image: url("<%= asset_path("ajax_loader.gif") %>")
   background-repeat: no-repeat
   background-position: center center

app/assets/stylesheets/publication_list.scss.erb

@@ -225,7 +225,6 @@
   z-index: 20;
   background-image: url("<%= asset_path("status_back.png") %>");
   background-repeat: no-repeat;
-  #background-color: coral;
   position: absolute;
   overflow: hidden;
   left: 20px;
@@ -243,7 +242,6 @@
   z-index: 20;
   background-image: url("<%= asset_path("status_back.png") %>");
   background-repeat: no-repeat;
-  #background-color: coral;
   position: absolute;
   overflow: hidden;
   left: 20px;
@@ -261,7 +259,6 @@
   z-index: 20;
   background-image: url("<%= asset_path("status_back.png") %>");
   background-repeat: no-repeat;
-  #background-color: coral;
   position: absolute;
   overflow: hidden;
   left: 20px;
@@ -279,7 +276,6 @@
   z-index: 20;
   background-image: url("<%= asset_path("status_back.png") %>");
   background-repeat: no-repeat;
-  #background-color: coral;
   position: absolute;
   overflow: hidden;
   left: 20px;
@@ -297,12 +293,10 @@
   z-index: 20;
   background-image: url("<%= asset_path("status_back.png") %>");
   background-repeat: no-repeat;
-  #background-color: coral;
   position: absolute;
   overflow: hidden;
   left: 20px;
-  background-position: -64px 0px;
-  #background-position: -48px 0px; }
+  background-position: -64px 0px; }
   .identifier_holder_status_approved img {
     position: absolute;
     top: 4px;
@@ -316,12 +310,10 @@
   z-index: 20;
   background-image: url("<%= asset_path("status_back.png") %>");
   background-repeat: no-repeat;
-  #background-color: coral;
   position: absolute;
   overflow: hidden;
   left: 20px;
-  background-position: -48px 0px;
-  #background-position: -32px 0px; }
+  background-position: -48px 0px; }
   .identifier_holder_status_committed img {
     position: absolute;
     top: 4px;
@@ -335,12 +327,10 @@
   z-index: 20;
   background-image: url("<%= asset_path("status_back.png") %>");
   background-repeat: no-repeat;
-  #background-color: coral;
   position: absolute;
   overflow: hidden;
   left: 20px;
-  background-position: -32px 0px;
-  #background-position: -16px 0px; }
+  background-position: -32px 0px; }
   .identifier_holder_status_archived img {
     position: absolute;
     top: 4px;