framework/sage
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1486 from palpalani/master

Browse Source 
Update newer versions of dependencies
This commit is contained in:
Ben Word
2015-09-15 11:10:19 -05:00
parent cc95eb4493 8d9a56670f
commit 2aafd22584
3 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/styles/main.scss
View File

@@ -2,7 +2,7 @@
// Automatically injected Bower dependencies via wiredep (never manually edit this block)
// bower:scss
@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/_bootstrap.scss";
@import "../../bower_components/bootstrap-sass/assets/stylesheets/_bootstrap.scss";
// endbower
@import "common/_global";

4
bower.json
View File

@@ -8,13 +8,13 @@
"private": true,
"dependencies": {
"modernizr": "2.8.2",
"bootstrap-sass-official": "3.3.5"
"bootstrap-sass": "3.3.5"
},
"overrides": {
"modernizr": {
"main": "./modernizr.js"
},
"bootstrap-sass-official": {
"bootstrap-sass": {
"main": [
"./assets/stylesheets/_bootstrap.scss",
"./assets/javascripts/bootstrap/transition.js",

48
package.json
View File

@@ -27,31 +27,31 @@
"npm": ">=2.1.5"
},
"devDependencies": {
"asset-builder": "^1.0.2",
"browser-sync": "^2.7.1",
"del": "^1.1.1",
"gulp": "^3.8.11",
"gulp-autoprefixer": "^2.1.0",
"gulp-changed": "^1.2.1",
"gulp-concat": "^2.5.2",
"gulp-flatten": "0.0.4",
"asset-builder": "^1.1.0",
"browser-sync": "^2.8.2",
"del": "^1.2.1",
"gulp": "^3.9.0",
"gulp-autoprefixer": "^2.3.1",
"gulp-changed": "^1.3.0",
"gulp-concat": "^2.6.0",
"gulp-flatten": "0.1.1",
"gulp-if": "^1.2.5",
"gulp-imagemin": "^2.2.1",
"gulp-jshint": "^1.9.4",
"gulp-less": "^3.0.2",
"gulp-minify-css": "^1.0.0",
"gulp-plumber": "^1.0.0",
"gulp-rename": "^1.2.0",
"gulp-rev": "^3.0.1",
"gulp-sass": "^2.0.0",
"gulp-sourcemaps": "^1.5.1",
"gulp-uglify": "^1.1.0",
"imagemin-pngcrush": "^4.0.0",
"jshint-stylish": "^1.0.1",
"lazypipe": "^0.2.2",
"merge-stream": "^0.1.7",
"minimist": "^1.1.1",
"run-sequence": "^1.0.2",
"gulp-imagemin": "^2.3.0",
"gulp-jshint": "^1.11.2",
"gulp-less": "^3.0.3",
"gulp-minify-css": "^1.2.0",
"gulp-plumber": "^1.0.1",
"gulp-rename": "^1.2.2",
"gulp-rev": "^6.0.0",
"gulp-sass": "^2.0.1",
"gulp-sourcemaps": "^1.5.2",
"gulp-uglify": "^1.2.0",
"imagemin-pngcrush": "^4.1.0",
"jshint-stylish": "^2.0.1",
"lazypipe": "^1.0.1",
"merge-stream": "^1.0.0",
"minimist": "^1.1.3",
"run-sequence": "^1.1.2",
"traverse": "^0.6.6",
"wiredep": "^2.2.2"
}