Merge branch 'v2.2.1-alpha' into master

2019-07-23 15:57:08 -04:00
parent 0b64acaecf 0a6bce1384
commit f7c88cfc6a
77 changed files with 1740 additions and 921 deletions
--- a/app/controllers/themes_controller.rb
+++ b/app/controllers/themes_controller.rb
@ -30,7 +30,7 @@ class ThemesController < ApplicationController
    @file_contents = File.read(file_name)

    # Include the variables and covert scss file to css
-    @compiled = Sass::Engine.new("$primary-color:#{color};" \
+    @compiled = SassC::Engine.new("$primary-color:#{color};" \
                                 "$primary-color-lighten:#{lighten_color};" \
                                 "$primary-color-darken:#{darken_color};" +
                                 @file_contents, syntax: :scss).render