diff --git a/UI/WebServerResources/Gruntfile.js b/UI/WebServerResources/Gruntfile.js index dad54e755..71948f4e8 100644 --- a/UI/WebServerResources/Gruntfile.js +++ b/UI/WebServerResources/Gruntfile.js @@ -33,11 +33,13 @@ module.exports = function(grunt) { }, sass: { options: { - cache: false, + require: 'SassyJSON', + noCache: true, loadPath: ['scss', 'bower_components/compass-mixins/lib', 'bower_components/compass-breakpoint/stylesheets', 'bower_components/breakpoint-slicer/stylesheets', - 'bower_components/sassy-maps/sass' + 'bower_components/sassy-maps/sass', + 'node_modules/SassyJSON/dist' ], style: 'expanded' }, diff --git a/UI/WebServerResources/package.json b/UI/WebServerResources/package.json index 47bb6b6eb..7c97cdd79 100644 --- a/UI/WebServerResources/package.json +++ b/UI/WebServerResources/package.json @@ -10,6 +10,7 @@ "grunt-contrib-compass": "^1.0.1", "grunt-contrib-sass": ">=0.8.0", "grunt-contrib-watch": ">=0.5.3", - "grunt-postcss": "^0.3.0" + "grunt-postcss": "^0.3.0", + "sassyjson": "^1.1.8" } } diff --git a/UI/WebServerResources/scss/styles.scss b/UI/WebServerResources/scss/styles.scss index 0cd90e093..9a6ab3c0e 100755 --- a/UI/WebServerResources/scss/styles.scss +++ b/UI/WebServerResources/scss/styles.scss @@ -13,6 +13,7 @@ @import '_breakpoint.scss', '_sassy-maps.scss'; // This is no longer required because we use grunt-contrib-compass (ruby required) //@import '_compass.scss'; +@import 'SassyJSON'; @import 'core/variables'; // Will be replace by a complete 'config file