Merge pull request #101 from FundingCircle/mh_RI-66-use-npm-static-co…

…ntent [RI-66] Enable npm install for static-content
FundingCircle · Nov 8, 2017 · 8029316 · 8029316
2 parents 6bd9ac1 + 4ab6742
commit 8029316
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "sass-common",
-  "version": "2.7.25",
+  "version": "2.7.26",
   "description": "Collection of the SASS mixins used to style the Funding Circle pages.",
   "repository": {
     "type": "git",

diff --git a/gulpfile.js b/gulpfile.js
@@ -110,7 +110,7 @@ gulp.task('sass', function () {
 });
 
 gulp.task('build', function (callback) {
-  sequence('clean', ['build:mixins', 'build:icon-font', 'build:fonts'], 'libraries', 'sass', callback);
+  sequence(['build:mixins', 'build:icon-font', 'build:fonts'], 'libraries', 'sass', callback);
 });
 
 gulp.task('default', ['build']);
diff --git a/package.json b/package.json
@@ -1,14 +1,14 @@
 {
   "name": "sass-common",
-  "version": "2.7.25",
+  "version": "2.7.26",
   "description": "Collection of the SASS mixins used to style the Funding Circle pages.",
   "repository": {
     "type": "git",
     "url": "https://github.com/FundingCircle/sass-common.git"
   },
   "license": "Commercial",
   "scripts": {
-    "postinstall": "bower install"
+    "postinstall": "bower install --allow-root && gulp build"
   },
   "bugs": {
     "url": "https://github.com/FundingCircle/static-content/issues"
@@ -27,6 +27,8 @@
     "sc5-styleguide": "^0.3.4"
   },
   "dependencies": {
-    "bower": "^1.5.2"
+    "bower": "^1.5.2",
+    "gulp-template": "^2.1.0",
+    "sc5-styleguide": "^0.3.4"
   }
 }
diff --git a/src/sass/_functions/units.scss b/src/sass/_functions/units.scss
@@ -172,7 +172,7 @@
       $cVal: append($cVal, $i);
     }
 
-  } @else if type-of($val) == number{
+  } @else if type-of($val) == number {
 
     $cVal: multiplier($val);