From 9887892a12b59996180b2c06bbf39428044d16a7 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Fri, 20 Feb 2015 12:49:25 +0000 Subject: [PATCH] Fix location of bootstrap SCSS --- app/assets/sass/modules/_bootstrap.scss | 76 ++++++++++++------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/app/assets/sass/modules/_bootstrap.scss b/app/assets/sass/modules/_bootstrap.scss index 06759e23..304bf27a 100644 --- a/app/assets/sass/modules/_bootstrap.scss +++ b/app/assets/sass/modules/_bootstrap.scss @@ -2,51 +2,51 @@ @import "variables"; // Core variables and mixins -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/variables"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/variables"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/mixins"; // Reset and dependencies -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/normalize"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/print"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/normalize"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/print"; // Core CSS -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/scaffolding"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/type"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/code"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/grid"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/tables"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/forms"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/buttons"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/scaffolding"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/type"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/code"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/grid"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/tables"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/forms"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/buttons"; // Components -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/component-animations"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/dropdowns"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/button-groups"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/input-groups"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/navs"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/navbar"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/breadcrumbs"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/pagination"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/pager"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/labels"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/badges"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/jumbotron"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/thumbnails"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/alerts"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/progress-bars"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/media"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/list-group"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/panels"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/responsive-embed"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/wells"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/close"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/component-animations"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/dropdowns"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/button-groups"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/input-groups"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/navs"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/navbar"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/breadcrumbs"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/pagination"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/pager"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/labels"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/badges"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/jumbotron"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/thumbnails"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/alerts"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/progress-bars"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/media"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/list-group"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/panels"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/responsive-embed"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/wells"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/close"; // Components w/ JavaScript -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/modals"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/tooltip"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/popovers"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/carousel"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/modals"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/tooltip"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/popovers"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/carousel"; // Utility classes -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/utilities"; -@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/responsive-utilities"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/utilities"; +@import "../../bower_components/bootstrap-sass/assets/stylesheets/bootstrap/responsive-utilities";