switch import back to bower from the local dir

This commit is contained in:
Kevin Ross 2016-01-22 15:58:56 -06:00
parent 8efe6d409d
commit f21586c8bd

View File

@ -1,50 +1,51 @@
// FIXME: temporarily use the local bootstrap - waiting on flex enable navbar https://github.com/twbs/bootstrap/pull/18976 // FIXME: temporarily use the local bootstrap - waiting on flex enable navbar https://github.com/twbs/bootstrap/pull/18976
//@import "../bower_components/bootstrap/scss/ //@import "../bower_components/bootstrap/scss/
//@import "../../bootstrap/scss/
// Core variables and mixins // Core variables and mixins
//@import "../../bootstrap/scss/custom"; @import "../bower_components/bootstrap/scss/custom";
@import "../../bootstrap/scss/variables"; @import "../bower_components/bootstrap/scss/variables";
@import "../../bootstrap/scss/mixins"; @import "../bower_components/bootstrap/scss/mixins";
// Reset and dependencies // Reset and dependencies
@import "../../bootstrap/scss/normalize"; @import "../bower_components/bootstrap/scss/normalize";
@import "../../bootstrap/scss/print"; @import "../bower_components/bootstrap/scss/print";
// Core CSS // Core CSS
@import "../../bootstrap/scss/reboot"; @import "../bower_components/bootstrap/scss/reboot";
@import "../../bootstrap/scss/type"; @import "../bower_components/bootstrap/scss/type";
@import "../../bootstrap/scss/images"; @import "../bower_components/bootstrap/scss/images";
@import "../../bootstrap/scss/code"; @import "../bower_components/bootstrap/scss/code";
@import "../../bootstrap/scss/grid"; @import "../bower_components/bootstrap/scss/grid";
@import "../../bootstrap/scss/tables"; @import "../bower_components/bootstrap/scss/tables";
@import "../../bootstrap/scss/forms"; @import "../bower_components/bootstrap/scss/forms";
@import "../../bootstrap/scss/buttons"; @import "../bower_components/bootstrap/scss/buttons";
// Components // Components
@import "../../bootstrap/scss/animation"; @import "../bower_components/bootstrap/scss/animation";
@import "../../bootstrap/scss/dropdown"; @import "../bower_components/bootstrap/scss/dropdown";
@import "../../bootstrap/scss/button-group"; @import "../bower_components/bootstrap/scss/button-group";
@import "../../bootstrap/scss/input-group"; @import "../bower_components/bootstrap/scss/input-group";
@import "../../bootstrap/scss/custom-forms"; @import "../bower_components/bootstrap/scss/custom-forms";
@import "../../bootstrap/scss/nav"; @import "../bower_components/bootstrap/scss/nav";
@import "../../bootstrap/scss/navbar"; @import "../bower_components/bootstrap/scss/navbar";
@import "../../bootstrap/scss/card"; @import "../bower_components/bootstrap/scss/card";
@import "../../bootstrap/scss/breadcrumb"; @import "../bower_components/bootstrap/scss/breadcrumb";
@import "../../bootstrap/scss/pagination"; @import "../bower_components/bootstrap/scss/pagination";
@import "../../bootstrap/scss/labels"; @import "../bower_components/bootstrap/scss/labels";
@import "../../bootstrap/scss/jumbotron"; @import "../bower_components/bootstrap/scss/jumbotron";
@import "../../bootstrap/scss/alert"; @import "../bower_components/bootstrap/scss/alert";
@import "../../bootstrap/scss/progress"; @import "../bower_components/bootstrap/scss/progress";
@import "../../bootstrap/scss/media"; @import "../bower_components/bootstrap/scss/media";
@import "../../bootstrap/scss/list-group"; @import "../bower_components/bootstrap/scss/list-group";
@import "../../bootstrap/scss/responsive-embed"; @import "../bower_components/bootstrap/scss/responsive-embed";
@import "../../bootstrap/scss/close"; @import "../bower_components/bootstrap/scss/close";
// Components w/ JavaScript // Components w/ JavaScript
@import "../../bootstrap/scss/modal"; @import "../bower_components/bootstrap/scss/modal";
@import "../../bootstrap/scss/tooltip"; @import "../bower_components/bootstrap/scss/tooltip";
@import "../../bootstrap/scss/popover"; @import "../bower_components/bootstrap/scss/popover";
@import "../../bootstrap/scss/carousel"; @import "../bower_components/bootstrap/scss/carousel";
// Utility classes // Utility classes
@import "../../bootstrap/scss/utilities"; @import "../bower_components/bootstrap/scss/utilities";