Switch to Ruby sass, update Gemfile to Sass 3.4 and Compass 1.0, fix errors in docs CSS

diff --git a/Gemfile b/Gemfile
index f32f00d38bcc36b8851e7f7cb6a2f4d2e162e9b1..820ed0214f8faf804ab0099b421662fae4ef9450 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,4 @@
 source "https://rubygems.org"
 
-gem "compass", "0.12.2"
\ No newline at end of file
+gem "sass", "~> 3.4.0"
+gem "compass", "~> 1.0.0"
\ No newline at end of file

diff --git a/Gemfile.lock b/Gemfile.lock
index 7f07c6bc7074f13c9c22fdcfbf896fca03ed151e..665382a254ecf90681fcf24cfd6b8bde9901ff21 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,16 +1,29 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    chunky_png (1.3.0)
-    compass (0.12.2)
+    chunky_png (1.3.1)
+    compass (1.0.1)
       chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.1)
-    fssm (0.2.10)
-    sass (3.2.14)
+      compass-core (~> 1.0.1)
+      compass-import-once (~> 1.0.5)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      sass (>= 3.3.13, < 3.5)
+    compass-core (1.0.1)
+      multi_json (~> 1.0)
+      sass (>= 3.3.0, < 3.5)
+    compass-import-once (1.0.5)
+      sass (>= 3.2, < 3.5)
+    ffi (1.9.3)
+    multi_json (1.10.1)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    sass (3.4.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  compass (= 0.12.2)
+  compass (~> 1.0.0)
+  sass (~> 3.4.0)

diff --git a/Gruntfile.js b/Gruntfile.js
index 9ac873ddd99c52d6c9bf0426e2b839173f6e13f4..2e01d38bb72570ac81cd091e24efb4d322e6ecde 100644 (file)
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -51,8 +51,9 @@ module.exports = function(grunt) {
     sass: {
       dist: {
         options: {
-          includePaths: ['scss'],
-          sourceMap: true
+          loadPath: [__dirname + '/scss'],
+          sourcemap: 'auto',
+          bundleExec: true
         },
         files: {
           'dist/assets/css/foundation.css': '<%= foundation.scss %>',
@@ -232,10 +233,10 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-copy');
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-watch');
+  grunt.loadNpmTasks('grunt-contrib-sass');
   grunt.loadNpmTasks('grunt-karma');
   grunt.loadNpmTasks('grunt-newer');
   grunt.loadNpmTasks('grunt-rsync');
-  grunt.loadNpmTasks('grunt-sass');
   grunt.loadNpmTasks('grunt-contrib-jst');
   grunt.loadNpmTasks('grunt-string-replace');
 

diff --git a/doc/assets/scss/docs.scss b/doc/assets/scss/docs.scss
index a71def6bee75e69fe8955dc87fdadf233a7534f6..2ce8a85787e07503963ff28b02eacde068daa834 100644 (file)
--- a/doc/assets/scss/docs.scss
+++ b/doc/assets/scss/docs.scss
@@ -4,7 +4,7 @@
 
 //Foundation Libraries
 @import 
-  "scss/foundation/settings",
+  "foundation/settings",
   "foundation";
 
 //Marketing Site Common Library
@@ -274,7 +274,7 @@ footer { margin-top: 45px; }
     margin-bottom: $paragraph-margin-bottom;
     text-rendering: $paragraph-text-rendering;
 
-    &.lead { @extend %lead; }
+    &.lead { @include lead; }
 
     & aside {
       font-size: $paragraph-aside-font-size;
@@ -549,7 +549,7 @@ $custom-active-bg:darken($custom-link-color, 5%);
 // .docs-wrap { margin-top: 30px; }
 .docs-wrap .inner-wrap { background: #efefef; }
 .docs-wrap .main-section { padding: 0 20px 0 20px; }
-.main-section { @extend %kill-flicker; }
+.main-section { @include kill-flicker; }
 .doc-oc-list { background: $off-canvas-bg; }
 
 // Make sure topbar dropdowns are above tab bar.

diff --git a/package.json b/package.json
index dce7f790463067f6e6daf95f747d43bb3c608d36..cc2597b710c48ce54749762ad9a1484799c36bf6 100644 (file)
--- a/package.json
+++ b/package.json
@@ -13,11 +13,11 @@
     "grunt-contrib-jst": "~0.6.0",
     "grunt-contrib-uglify": "~0.4.0",
     "grunt-contrib-watch": "~0.6.1",
+    "grunt-contrib-sass": "~0.8.1",
     "grunt-string-replace": "~0.2.7",
     "grunt-karma": "~0.6.2",
     "grunt-newer": "~0.7.0",
     "grunt-rsync": "~0.5.0",
-    "grunt-sass": "~0.13.0",
     "handlebars-helper-rel": "~0.1.2",
     "handlebars-helper-slugify": "~0.2.0",
     "highlight.js": "~7.3.0",

diff --git a/scss/foundation/_functions.scss b/scss/foundation/_functions.scss
index 12d31db522d9ff260ab13faed1ec42c7ece34131..c719360817e23c6912560d0fc1831565958986b8 100644 (file)
--- a/scss/foundation/_functions.scss
+++ b/scss/foundation/_functions.scss
@@ -10,7 +10,7 @@ $rem-base: 16px !default;
 $modules: () !default;
 @mixin exports($name) {
   @if(not index($modules, $name)) {
-    $modules: append($modules, $name);
+    $modules: append($modules, $name) !global;
     @content;
   }
 }

diff --git a/scss/foundation/components/_offcanvas.scss b/scss/foundation/components/_offcanvas.scss
index e8a51c4efc2987cd9fe2040966a8c64c57452cbc..068d94a42dec37299c17b0d6b1ae2739d3eedc3a 100644 (file)
--- a/scss/foundation/components/_offcanvas.scss
+++ b/scss/foundation/components/_offcanvas.scss
@@ -29,7 +29,7 @@ $tabbar-header-margin: 0 !default;
 // Off Canvas Menu Variables
 $off-canvas-width: rem-calc(250) !default;
 $off-canvas-bg: $oil !default;
-$off-canvas-bg-hover: background: scale-color($tabbar-bg, $lightness: -30%) !default;
+$off-canvas-bg-hover: scale-color($tabbar-bg, $lightness: -30%) !default;
 
 // Off Canvas Menu List Variables
 $off-canvas-label-padding: 0.3rem rem-calc(15) !default;