Convert repo to Node Sass, lock in versions

Fixes #7 and #8
the-refinery · Mar 2, 2015 · c1b97b3 · c1b97b3
1 parent 5a7210c
commit c1b97b3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 16 deletions.
diff --git a/Brocfile.js b/Brocfile.js
@@ -1,5 +1,5 @@
 var pickFiles = require('broccoli-static-compiler'),
-    compileSass = require('broccoli-ruby-sass'),
+    compileSass = require('broccoli-sass'),
     mergeTrees = require('broccoli-merge-trees'),
     HTMLPages = require('broccoli-pages').HTMLPages,
     MarkdownPages = require('broccoli-pages').MarkdownPages,
@@ -15,7 +15,7 @@ var pickFiles = require('broccoli-static-compiler'),
     source = 'source',
     test = 'test',
     docs = 'docs',
-    bourbon = 'bower_components/bourbon/dist',
+    bourbon = 'bower_components/bourbon/app/assets/stylesheets',
     normalize = 'bower_components/normalize-scss',
 
     testHtml = pickFiles(test, {
@@ -43,11 +43,7 @@ var pickFiles = require('broccoli-static-compiler'),
 
     var trees = [bourbon, normalize, source],
         sassAndLib = mergeTrees(trees, { overwrite: true }),
-        testCss = compileSass([sassAndLib, test], 'test.scss', test + '/styles.css', {
-          bundleExec: true
-        }),
-        docsCSS = compileSass([sassAndLib, docs + '/doc-styles'], 'docs.scss', '/styles.css', {
-          bundleExec: true
-        });
+        testCss = compileSass([sassAndLib, test], 'test.scss', test + '/styles.css'),
+        docsCSS = compileSass([sassAndLib, docs + '/doc-styles'], 'docs.scss', '/styles.css');
 
 module.exports = mergeTrees([testCss, testHtml, docsCSS, docsHtml, prism]);
diff --git a/bower.json b/bower.json
@@ -1,8 +1,8 @@
 {
   "name": "Baseline",
   "dependencies": {
-    "bourbon": "latest",
-    "normalize-scss": "latest",
+    "bourbon": "4.2.1",
+    "normalize-scss": "3.0.2",
     "prism": "gh-pages"
   }
 }
diff --git a/package.json b/package.json
@@ -3,10 +3,10 @@
   "description": "A baseline for new SCSS based projects",
   "dependencies": {},
   "devDependencies": {
-    "broccoli": "^0.12.3",
-    "broccoli-merge-trees": "^0.1.4",
-    "broccoli-pages": "^0.2.0",
-    "broccoli-ruby-sass": "^0.1.0",
-    "broccoli-static-compiler": "^0.1.4"
+    "broccoli": "^0.13.3",
+    "broccoli-merge-trees": "^0.2.1",
+    "broccoli-pages": "^0.2.1",
+    "broccoli-sass": "^0.4.0",
+    "broccoli-static-compiler": "^0.2.1"
   }
 }
diff --git a/source/base/_base.scss b/source/base/_base.scss
@@ -3,7 +3,7 @@
 // For styling elements directly
 
 * {
-  @include box-sizing(border-box);
+ box-sizing: border-box;
 }
 
 body {
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ @@
     // For styling elements directly
     * {
-      @include box-sizing(border-box);
+     box-sizing: border-box;
     }
     body {
@@ Expand Down @@