feat(enhance): switched sass-bootstrap to offical bootstrap-sass

angular-fullstack · Feb 4, 2014 · 024fee8 · 024fee8
1 parent ce2ee23
commit 024fee8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/templates/styles/main.scss b/app/templates/styles/main.scss
@@ -1,6 +1,6 @@
-<% if (compassBootstrap) { %>$icon-font-path: "/bower_components/sass-bootstrap/fonts/";
+<% if (compassBootstrap) { %>$icon-font-path: "/bower_components/bootstrap-sass/fonts/";
 
-@import 'sass-bootstrap/lib/bootstrap';
+@import 'bootstrap-sass/lib/bootstrap';
 
 <% } %>.browsehappy {
     margin: 0.2em 0;

diff --git a/templates/common/Gruntfile.js b/templates/common/Gruntfile.js
@@ -172,7 +172,7 @@ module.exports = function (grunt) {
         html: '<%%= yeoman.app %>/views/index.jade',<% } else { %>
         html: '<%%= yeoman.app %>/views/index.html',<% } %>
         ignorePath: '<%%= yeoman.app %>/'<% if (compass && bootstrap) { %>,
-        exclude: ['sass-bootstrap']<% } %>
+        exclude: ['bootstrap-sass']<% } %>
       }
     },<% if (coffee) { %>
 

diff --git 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.10.2"<% if (compassBootstrap) { %>,
-    "sass-bootstrap": "~3.0.2"<% } else { %>,
+    "bootstrap-sass": "~3.0.2"<% } else { %>,
     "bootstrap": "~3.0.3"<% } } %><% if (resourceModule) { %>,
     "angular-resource": "1.2.6"<% } %><% if (cookiesModule) { %>,
     "angular-cookies": "1.2.6"<% } %><% if (sanitizeModule) { %>,