Commit 024fee8 Blair MacNeil
committed
1 parent ce2ee23 commit 024fee8 Copy full SHA for 024fee8
File tree 3 files changed +4
-4
lines changed
3 files changed +4
-4
lines changed Original file line number Diff line number Diff line change 1
- <% if (compassBootstrap) { %>$icon-font-path : " /bower_components/sass- bootstrap/fonts/" ;
1
+ <% if (compassBootstrap) { %>$icon-font-path : " /bower_components/bootstrap-sass /fonts/" ;
2
2
3
- @import ' sass- bootstrap/lib/bootstrap' ;
3
+ @import ' bootstrap-sass /lib/bootstrap' ;
4
4
5
5
<% } %>.browsehappy {
6
6
margin : 0.2em 0 ;
Original file line number Diff line number Diff line change @@ -172,7 +172,7 @@ module.exports = function (grunt) {
172
172
html : '<%%= yeoman.app %>/views/index.jade' , < % } else { % >
173
173
html : '<%%= yeoman.app %>/views/index.html' , < % } % >
174
174
ignorePath: '< % %= yeoman . app % > /'< % if ( compass && bootstrap ) { % > ,
175
- exclude: ['sass- bootstrap']< % } % >
175
+ exclude: ['bootstrap-sass ']< % } % >
176
176
}
177
177
} , < % if ( coffee ) { % >
178
178
Original file line number Diff line number Diff line change 6
6
"json3" : " ~3.2.6" ,
7
7
"es5-shim" : " ~2.1.0" <% if (bootstrap) { %>,
8
8
"jquery" : " ~1.10.2" <% if (compassBootstrap) { %>,
9
- "sass- bootstrap" : " ~3.0.2" <% } else { %>,
9
+ "bootstrap-sass " : " ~3.0.2" <% } else { %>,
10
10
"bootstrap" : " ~3.0.3" <% } } %><% if (resourceModule) { %>,
11
11
"angular-resource" : " 1.2.6" <% } %><% if (cookiesModule) { %>,
12
12
"angular-cookies" : " 1.2.6" <% } %><% if (sanitizeModule) { %>,
You can’t perform that action at this time.
0 commit comments