Merge pull request #117 from Voog/116_update_grunt

Update grunt settings

Author: robertpih

Gruntfile.js

@@ -52,11 +52,16 @@ module.exports = function(grunt) {
     },
 
     // Compiles the stylesheet files.
+    // When using Dart Sass, synchronous compilation is twice as fast
+    // as asynchronous compilation by default, due to the overhead of asynchronous callbacks.
+    // To avoid this overhead, fibers package is used
     sass: {
       build_main: {
         options: {
-          style: 'expanded',
-          sourcemap: 'none'
+          implementation: require('sass'),
+          sourceMap: false,
+          fiber: require('fibers'),
+          outputStyle: 'expanded'
         },
         files: [{
           expand: true,
@@ -70,8 +75,10 @@ module.exports = function(grunt) {
       // Builds custom style components to temporary folder.
       build_custom_styles: {
         options: {
-          style: 'expanded',
-          sourcemap: 'none'
+          implementation: require('sass'),
+          sourceMap: false,
+          fiber: require('fibers'),
+          outputStyle: 'expanded'
         },
         files: [{
           expand: true,
@@ -267,17 +274,7 @@ module.exports = function(grunt) {
     }
   });
 
-  grunt.loadNpmTasks('grunt-contrib-clean');
-  grunt.loadNpmTasks('grunt-contrib-concat');
-  grunt.loadNpmTasks('grunt-contrib-copy');
-  grunt.loadNpmTasks('grunt-contrib-cssmin');
-  grunt.loadNpmTasks('grunt-contrib-imagemin');
-  grunt.loadNpmTasks('grunt-contrib-sass');
-  grunt.loadNpmTasks('grunt-contrib-uglify');
-  grunt.loadNpmTasks('grunt-contrib-watch');
-  grunt.loadNpmTasks('grunt-exec');
-  grunt.loadNpmTasks('grunt-modernizr-builder');
-  grunt.loadNpmTasks('grunt-postcss');
+  require('load-grunt-tasks')(grunt);
 
   grunt.registerTask('default', ['clean:reset', 'modernizr_builder', 'concat', 'uglify', 'sass', 'postcss:main_styles', 'cssmin', 'imagemin', 'postcss:custom_styles', 'copy', 'clean:remove']);
 

README.md

@@ -5,7 +5,7 @@ To modify this template [Node Package Manager](https://www.npmjs.org/) (or [Node
 
 To set up the local developing environment, clone this repository and run the following commands:
 
-* Install Grunt dependencies: ```npm install```
+* Install Grunt dependencies: ```yarn install```
 * Install Bower dependencies: ```bower install```
 * Run Grunt tasks: ```grunt```
 

components/template-cs-button-content.tpl

@@ -192,4 +192,4 @@
     "scope": "global"
   */
   --content-button-hover-text-transform: none;
-}
+}

components/template-cs-content-content.tpl

@@ -399,4 +399,4 @@
     "scope": "global"
   */
   --content-link-hover-color: rgba(0, 102, 187, 0.8);
-}
+}

components/template-cs-content-front.tpl

@@ -154,4 +154,4 @@
     "scope": "global"
   */
   --content-link-hover-color: rgba(0, 102, 187, 0.8);
-}
+}

components/template-cs-footer-content.tpl

@@ -71,4 +71,4 @@
     "scope": "global"
   */
   --footer-body-color: #696b6c;
-}
+}

components/template-cs-form-content.tpl

@@ -38,4 +38,4 @@
     "featured": true
   */
   --form-field-color: #1b2124;
-}
+}

components/template-cs-form-front.tpl

@@ -30,4 +30,4 @@
     "scope": "global"
   */
   --form-field-border-width: 4px;
-}
+}

components/template-cs-header-content.tpl

@@ -372,4 +372,4 @@
     "scope": "global"
   */
   --menu-main-active-color: #1b2124;
-}
+}

components/template-cs-headings-content.tpl

@@ -272,4 +272,4 @@
     "scope": "global"
   */
   --headings-subheading-color: #696b6c;
-}
+}

components/template-cs-headings-front.tpl

@@ -245,4 +245,4 @@
     "scope": "global"
   */
   --headings-subheading-text-transform: none;
-}
+}

components/template-cs-main-styles-content.tpl

@@ -38,4 +38,4 @@
     ]
   */
   --secondary-color-content: #1b2124;
-}
+}

components/template-cs-main-styles-front.tpl

@@ -49,4 +49,4 @@
     ]
   */
   --main-color-content: #696b6c;
-}
+}

components/template-cs-style-rules.tpl

@@ -36,7 +36,7 @@ body {
   -webkit-text-decoration: var(--menu-main-text-decoration);
           text-decoration: var(--menu-main-text-decoration);
   text-transform: var(--menu-main-text-transform);
-  opacity: .7;
+  opacity: 0.7;
 }
 @media screen and (min-width: 841px) {
   .menu-main .menu .menu-item .menu-link {
@@ -50,7 +50,7 @@ body {
   -webkit-text-decoration: var(--menu-main-active-text-decoration);
           text-decoration: var(--menu-main-active-text-decoration);
   text-transform: var(--menu-main-active-text-transform);
-  opacity: .5;
+  opacity: 0.5;
 }
 .menu-main .menu .menu-item .menu-link.active:hover {
   color: var(--menu-main-active-color);
@@ -62,7 +62,7 @@ body {
   -webkit-text-decoration: var(--menu-main-hover-text-decoration);
           text-decoration: var(--menu-main-hover-text-decoration);
   text-transform: var(--menu-main-hover-text-transform);
-  opacity: .5;
+  opacity: 0.5;
 }
 
 .menu-sub .menu .menu-item .menu-link {
@@ -73,7 +73,7 @@ body {
   -webkit-text-decoration: var(--menu-sub-text-decoration);
           text-decoration: var(--menu-sub-text-decoration);
   text-transform: var(--menu-sub-text-transform);
-  opacity: .5;
+  opacity: 0.5;
 }
 .menu-sub .menu .menu-item .menu-link.active {
   font-style: var(--menu-sub-active-font-style);
@@ -314,4 +314,4 @@ body {
 .light-background .content-formatted .form_area .feedback-error, .light-background .content-formatted .form_area .feedback-success, .light-background .content-formatted .form_area .form_error, .light-background .content-formatted .form_area .form_notice {
   -webkit-box-shadow: var(--form-field-border-width) var(--form-field-border-width) 0 rgba(0, 0, 0, 0.2);
           box-shadow: var(--form-field-border-width) var(--form-field-border-width) 0 rgba(0, 0, 0, 0.2);
-}
+}

components/template-cs-table-content.tpl

@@ -29,4 +29,4 @@
     "scope": "global"
   */
   --table-border-style: solid;
-}
+}

package.json

@@ -8,6 +8,7 @@
   "license": "MIT",
   "devDependencies": {
     "autoprefixer": "^7.2.3",
+    "fibers": "^5.0.0",
     "grunt": "^1.0.1",
     "grunt-contrib-clean": "^1.1.0",
     "grunt-contrib-concat": "^1.0.1",
@@ -20,6 +21,9 @@
     "grunt-dev-update": "^2.3.0",
     "grunt-exec": "^3.0.0",
     "grunt-modernizr-builder": "^0.1.9",
-    "grunt-postcss": "^0.9.0"
+    "grunt-postcss": "^0.9.0",
+    "grunt-sass": "^3.1.0",
+    "load-grunt-tasks": "^5.0.0",
+    "sass": "^1.38.0"
   }
 }

stylesheets/editmode.css

@@ -7,4 +7,4 @@
 }
 .content-right .edy-texteditor-view {
   min-height: 525px;
-}
+}

stylesheets/ie8.css

@@ -45,4 +45,4 @@
 
 .footer .voog-reference a {
   border: 1px solid #e5e5e5;
-}
+}