Skip to content

Commit 024fee8

Browse files
author
Blair MacNeil
committed
feat(enhance): switched sass-bootstrap to offical bootstrap-sass
1 parent ce2ee23 commit 024fee8

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

app/templates/styles/main.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<% if (compassBootstrap) { %>$icon-font-path: "/bower_components/sass-bootstrap/fonts/";
1+
<% if (compassBootstrap) { %>$icon-font-path: "/bower_components/bootstrap-sass/fonts/";
22

3-
@import 'sass-bootstrap/lib/bootstrap';
3+
@import 'bootstrap-sass/lib/bootstrap';
44

55
<% } %>.browsehappy {
66
margin: 0.2em 0;

templates/common/Gruntfile.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ module.exports = function (grunt) {
172172
html: '<%%= yeoman.app %>/views/index.jade',<% } else { %>
173173
html: '<%%= yeoman.app %>/views/index.html',<% } %>
174174
ignorePath: '<%%= yeoman.app %>/'<% if (compass && bootstrap) { %>,
175-
exclude: ['sass-bootstrap']<% } %>
175+
exclude: ['bootstrap-sass']<% } %>
176176
}
177177
},<% if (coffee) { %>
178178

templates/common/_bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"json3": "~3.2.6",
77
"es5-shim": "~2.1.0"<% if (bootstrap) { %>,
88
"jquery": "~1.10.2"<% if (compassBootstrap) { %>,
9-
"sass-bootstrap": "~3.0.2"<% } else { %>,
9+
"bootstrap-sass": "~3.0.2"<% } else { %>,
1010
"bootstrap": "~3.0.3"<% } } %><% if (resourceModule) { %>,
1111
"angular-resource": "1.2.6"<% } %><% if (cookiesModule) { %>,
1212
"angular-cookies": "1.2.6"<% } %><% if (sanitizeModule) { %>,

0 commit comments

Comments
 (0)