Skip to content

Commit 3799c13

Browse files
committed
feat(app): update to bootstrap sass official
closes #99
1 parent 3103987 commit 3799c13

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Diff for: 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/bootstrap-sass/fonts/";
1+
<% if (compassBootstrap) { %>$icon-font-path: "/bower_components/bootstrap-sass-official/vendor/assets/fonts/bootstrap/";
22

3-
@import 'bootstrap-sass/lib/bootstrap';
3+
@import 'bootstrap-sass-official/vendor/assets/stylesheets/bootstrap';
44

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

Diff for: 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.11.0"<% if (compassBootstrap) { %>,
9-
"bootstrap-sass": "~3.0.2"<% } else { %>,
9+
"bootstrap-sass-official": "~3.1.1"<% } else { %>,
1010
"bootstrap": "~3.0.3"<% } } %><% if (resourceModule) { %>,
1111
"angular-resource": "1.2.11"<% } %><% if (cookiesModule) { %>,
1212
"angular-cookies": "1.2.11"<% } %><% if (sanitizeModule) { %>,

0 commit comments

Comments
 (0)