Skip to content

Commit

Permalink
Supports Rails 3 nested engines
Browse files Browse the repository at this point in the history
In 2e1ca4e, all imports in _bootstrap.scss were namespaced to support older Rails/Sprockets (see rails/sass-rails#137 (comment)). Unfortunately, this wasn't also applied to the mixins sub-directory, causing failures like twbs#806.

See twbs#806 (comment)
  • Loading branch information
benlangfeld committed Oct 25, 2016
1 parent ffe92a9 commit 5da05ef
Showing 1 changed file with 30 additions and 30 deletions.
60 changes: 30 additions & 30 deletions assets/stylesheets/bootstrap/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,39 @@
// --------------------------------------------------

// Utilities
@import "mixins/hide-text";
@import "mixins/opacity";
@import "mixins/image";
@import "mixins/labels";
@import "mixins/reset-filter";
@import "mixins/resize";
@import "mixins/responsive-visibility";
@import "mixins/size";
@import "mixins/tab-focus";
@import "mixins/reset-text";
@import "mixins/text-emphasis";
@import "mixins/text-overflow";
@import "mixins/vendor-prefixes";
@import "bootstrap/mixins/hide-text";
@import "bootstrap/mixins/opacity";
@import "bootstrap/mixins/image";
@import "bootstrap/mixins/labels";
@import "bootstrap/mixins/reset-filter";
@import "bootstrap/mixins/resize";
@import "bootstrap/mixins/responsive-visibility";
@import "bootstrap/mixins/size";
@import "bootstrap/mixins/tab-focus";
@import "bootstrap/mixins/reset-text";
@import "bootstrap/mixins/text-emphasis";
@import "bootstrap/mixins/text-overflow";
@import "bootstrap/mixins/vendor-prefixes";

// Components
@import "mixins/alerts";
@import "mixins/buttons";
@import "mixins/panels";
@import "mixins/pagination";
@import "mixins/list-group";
@import "mixins/nav-divider";
@import "mixins/forms";
@import "mixins/progress-bar";
@import "mixins/table-row";
@import "bootstrap/mixins/alerts";
@import "bootstrap/mixins/buttons";
@import "bootstrap/mixins/panels";
@import "bootstrap/mixins/pagination";
@import "bootstrap/mixins/list-group";
@import "bootstrap/mixins/nav-divider";
@import "bootstrap/mixins/forms";
@import "bootstrap/mixins/progress-bar";
@import "bootstrap/mixins/table-row";

// Skins
@import "mixins/background-variant";
@import "mixins/border-radius";
@import "mixins/gradients";
@import "bootstrap/mixins/background-variant";
@import "bootstrap/mixins/border-radius";
@import "bootstrap/mixins/gradients";

// Layout
@import "mixins/clearfix";
@import "mixins/center-block";
@import "mixins/nav-vertical-align";
@import "mixins/grid-framework";
@import "mixins/grid";
@import "bootstrap/mixins/clearfix";
@import "bootstrap/mixins/center-block";
@import "bootstrap/mixins/nav-vertical-align";
@import "bootstrap/mixins/grid-framework";
@import "bootstrap/mixins/grid";

0 comments on commit 5da05ef

Please sign in to comment.