Merge pull request #762 from Paveltarno/master

bootstrap-sass dependency
This commit is contained in:
Kevin Ross 2015-12-08 10:19:13 -06:00
commit 12c6e3e66c
2 changed files with 5 additions and 2 deletions

View File

@ -6,7 +6,7 @@ module.exports = function (grunt) {
var path = require('path');
var configBridge = grunt.file.readJSON('./grunt/configBridge.json', {encoding: 'utf8'});
var generateIconsData = require('./grunt/bmd-icons-data-generator.js');
Object.keys(configBridge.paths).forEach(function (key) {
configBridge.paths[key].forEach(function (val, i, arr) {
arr[i] = path.join('./docs/assets', val);
@ -228,6 +228,9 @@ module.exports = function (grunt) {
// Test compile sass
sass: {
compile: {
options:{
loadPath: "bower_components/bootstrap-sass/assets/stylesheets",
},
files: [{
expand: true,
cwd: "sass",

View File

@ -1,2 +1,2 @@
@import "../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/variables";
@import "bootstrap/variables";
//@import "../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/mixins";