From 3799c13c3b65fcc2abfbacb5292b192543558d52 Mon Sep 17 00:00:00 2001 From: Tyler Henkel Date: Tue, 25 Feb 2014 19:50:23 -0500 Subject: [PATCH] feat(app): update to bootstrap sass official closes #99 --- app/templates/styles/main.scss | 4 ++-- templates/common/_bower.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/templates/styles/main.scss b/app/templates/styles/main.scss index 8a845f011..a95189131 100644 --- a/app/templates/styles/main.scss +++ b/app/templates/styles/main.scss @@ -1,6 +1,6 @@ -<% if (compassBootstrap) { %>$icon-font-path: "/bower_components/bootstrap-sass/fonts/"; +<% if (compassBootstrap) { %>$icon-font-path: "/bower_components/bootstrap-sass-official/vendor/assets/fonts/bootstrap/"; -@import 'bootstrap-sass/lib/bootstrap'; +@import 'bootstrap-sass-official/vendor/assets/stylesheets/bootstrap'; <% } %>.browsehappy { margin: 0.2em 0; diff --git a/templates/common/_bower.json b/templates/common/_bower.json index ae5675107..2316017a9 100644 --- a/templates/common/_bower.json +++ b/templates/common/_bower.json @@ -6,7 +6,7 @@ "json3": "~3.2.6", "es5-shim": "~2.1.0"<% if (bootstrap) { %>, "jquery": "~1.11.0"<% if (compassBootstrap) { %>, - "bootstrap-sass": "~3.0.2"<% } else { %>, + "bootstrap-sass-official": "~3.1.1"<% } else { %>, "bootstrap": "~3.0.3"<% } } %><% if (resourceModule) { %>, "angular-resource": "1.2.11"<% } %><% if (cookiesModule) { %>, "angular-cookies": "1.2.11"<% } %><% if (sanitizeModule) { %>,