bootstrap-sass-official → bootstrap-sass

yeoman · Jun 27, 2015 · e8b8877 · e8b8877
1 parent 5c3a756
commit e8b8877
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/app/index.js b/app/index.js
@@ -149,7 +149,7 @@ module.exports = generators.Base.extend({
 
       if (this.includeBootstrap) {
         if (this.includeSass) {
-          bowerJson.dependencies['bootstrap-sass-official'] = '~3.3.0';
+          bowerJson.dependencies['bootstrap-sass'] = '~3.3.0';
         } else {
           bowerJson.dependencies['bootstrap'] = '~3.3.0';
         }
@@ -216,7 +216,7 @@ module.exports = generators.Base.extend({
       // path prefix for Bootstrap JS files
       if (this.includeBootstrap) {
         if (this.includeSass) {
-          bsPath = '/bower_components/bootstrap-sass-official/assets/javascripts/bootstrap/';
+          bsPath = '/bower_components/bootstrap-sass/assets/javascripts/bootstrap/';
         } else {
           bsPath = '/bower_components/bootstrap/js/';
         }

diff --git a/app/templates/Gruntfile.js b/app/templates/Gruntfile.js
@@ -239,7 +239,7 @@ module.exports = function (grunt) {
       app: {
         ignorePath: /^<%%= config.app %>\/|\.\.\//,
         src: ['<%%= config.app %>/index.html']<% if (includeBootstrap) { %>,<% if (includeSass) { %>
-        exclude: ['bower_components/bootstrap-sass-official/assets/javascripts/bootstrap.js']<% } else { %>
+        exclude: ['bower_components/bootstrap-sass/assets/javascripts/bootstrap.js']<% } else { %>
         exclude: ['bower_components/bootstrap/dist/js/bootstrap.js']<% } } %>
       }<% if (includeSass) { %>,
       sass: {
@@ -379,7 +379,7 @@ module.exports = function (grunt) {
               %>bower_components/bootstrap/dist<%
             } %>',
           src: '<% if (includeSass) {
-              %>bower_components/bootstrap-sass-official/assets/fonts/bootstrap/*<%
+              %>bower_components/bootstrap-sass/assets/fonts/bootstrap/*<%
             } else {
               %>fonts/*<%
             } %>',

diff --git a/app/templates/main.scss b/app/templates/main.scss
@@ -1,8 +1,8 @@
 <% if (includeBootstrap) { -%>
-$icon-font-path: "../bower_components/bootstrap-sass-official/assets/fonts/bootstrap/";
+$icon-font-path: "../bower_components/bootstrap-sass/assets/fonts/bootstrap/";
 
 // bower:scss
-@import "bootstrap-sass-official/assets/stylesheets/bootstrap.scss";
+@import "bootstrap-sass/assets/stylesheets/bootstrap.scss";
 // endbower
 
 .browsehappy {

diff --git a/docs/recipes/assemble.md b/docs/recipes/assemble.md
@@ -92,7 +92,7 @@ wiredep: {
     ignorePath: /^\/|\.\.\//,
 -   src: ['<%= config.app %>/index.html'],
 +   src: ['<%= config.app %>/templates/layouts/default.hbs'],
-    exclude: ['bower_components/bootstrap-sass-official/assets/javascripts/bootstrap.js']
+    exclude: ['bower_components/bootstrap-sass/assets/javascripts/bootstrap.js']
   },
   sass: {
     src: ['<%= config.app %>/styles/{,*/}*.{scss,sass}'],
@@ -141,7 +141,7 @@ useminPrepare: {
           dot: true,
           cwd: '.',
           dest: '<%= config.dist %>',
-          src: 'bower_components/bootstrap-sass-official/assets/fonts/bootstrap/*'
+          src: 'bower_components/bootstrap-sass/assets/fonts/bootstrap/*'
         }]
       }
     },

diff --git a/test/bootstrap.js b/test/bootstrap.js
@@ -45,8 +45,8 @@ describe('bootstrap', function () {
     });
 
     it('uses Bootstrap Sass', function () {
-      assert.fileContent('bower.json', '"bootstrap-sass-official"');
-      assert.fileContent('Gruntfile.js', '/bootstrap-sass-official/');
+      assert.fileContent('bower.json', '"bootstrap-sass"');
+      assert.fileContent('Gruntfile.js', '/bootstrap-sass/');
     });
   });