From 83584d7e664efe2469ee4e031487b6c9495128f4 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Mon, 21 Apr 2014 23:27:06 +0200 Subject: [PATCH] Switch to only having bootstrap.scss in the main. See https://github.com/twbs/bootstrap-sass/pull/586#issuecomment-40976663 --- README.md | 3 ++ bower.json | 71 ------------------------------------------------ tasks/bower.rake | 3 +- 3 files changed, 5 insertions(+), 72 deletions(-) diff --git a/README.md b/README.md index 371a74db..a132ca9c 100644 --- a/README.md +++ b/README.md @@ -96,6 +96,9 @@ bower install bootstrap-sass-official Sass, JS, and all other assets are located at [vendor/assets](/vendor/assets). +By default, `bower.json` main field list only the main `bootstrap.scss` and all the static assets (fonts and JS). +This is compatible by default with asset managers such as [wiredep](https://github.com/taptapship/wiredep). + #### Mincer If you use [mincer][mincer] with node-sass, import bootstrap into a `.css.ejs.scss` file like so: diff --git a/bower.json b/bower.json index 8b34d679..16fded13 100644 --- a/bower.json +++ b/bower.json @@ -10,77 +10,6 @@ ], "description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.", "main": [ - "vendor/assets/stylesheets/_bootstrap-mincer.scss", - "vendor/assets/stylesheets/bootstrap/_alerts.scss", - "vendor/assets/stylesheets/bootstrap/_badges.scss", - "vendor/assets/stylesheets/bootstrap/_breadcrumbs.scss", - "vendor/assets/stylesheets/bootstrap/_button-groups.scss", - "vendor/assets/stylesheets/bootstrap/_buttons.scss", - "vendor/assets/stylesheets/bootstrap/_carousel.scss", - "vendor/assets/stylesheets/bootstrap/_close.scss", - "vendor/assets/stylesheets/bootstrap/_code.scss", - "vendor/assets/stylesheets/bootstrap/_component-animations.scss", - "vendor/assets/stylesheets/bootstrap/_dropdowns.scss", - "vendor/assets/stylesheets/bootstrap/_forms.scss", - "vendor/assets/stylesheets/bootstrap/_glyphicons.scss", - "vendor/assets/stylesheets/bootstrap/_grid.scss", - "vendor/assets/stylesheets/bootstrap/_input-groups.scss", - "vendor/assets/stylesheets/bootstrap/_jumbotron.scss", - "vendor/assets/stylesheets/bootstrap/_labels.scss", - "vendor/assets/stylesheets/bootstrap/_list-group.scss", - "vendor/assets/stylesheets/bootstrap/_media.scss", - "vendor/assets/stylesheets/bootstrap/_mixins.scss", - "vendor/assets/stylesheets/bootstrap/_modals.scss", - "vendor/assets/stylesheets/bootstrap/_navbar.scss", - "vendor/assets/stylesheets/bootstrap/_navs.scss", - "vendor/assets/stylesheets/bootstrap/_normalize.scss", - "vendor/assets/stylesheets/bootstrap/_pager.scss", - "vendor/assets/stylesheets/bootstrap/_pagination.scss", - "vendor/assets/stylesheets/bootstrap/_panels.scss", - "vendor/assets/stylesheets/bootstrap/_popovers.scss", - "vendor/assets/stylesheets/bootstrap/_print.scss", - "vendor/assets/stylesheets/bootstrap/_progress-bars.scss", - "vendor/assets/stylesheets/bootstrap/_responsive-embed.scss", - "vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss", - "vendor/assets/stylesheets/bootstrap/_scaffolding.scss", - "vendor/assets/stylesheets/bootstrap/_tables.scss", - "vendor/assets/stylesheets/bootstrap/_theme.scss", - "vendor/assets/stylesheets/bootstrap/_thumbnails.scss", - "vendor/assets/stylesheets/bootstrap/_tooltip.scss", - "vendor/assets/stylesheets/bootstrap/_type.scss", - "vendor/assets/stylesheets/bootstrap/_utilities.scss", - "vendor/assets/stylesheets/bootstrap/_variables.scss", - "vendor/assets/stylesheets/bootstrap/_wells.scss", - "vendor/assets/stylesheets/bootstrap/bootstrap.scss", - "vendor/assets/stylesheets/bootstrap/mixins/_alerts.scss", - "vendor/assets/stylesheets/bootstrap/mixins/_background-variant.scss", - "vendor/assets/stylesheets/bootstrap/mixins/_border-radius.scss", - "vendor/assets/stylesheets/bootstrap/mixins/_buttons.scss", - "vendor/assets/stylesheets/bootstrap/mixins/_center-block.scss", - "vendor/assets/stylesheets/bootstrap/mixins/_clearfix.scss", - "vendor/assets/stylesheets/bootstrap/mixins/_forms.scss", - "vendor/assets/stylesheets/bootstrap/mixins/_gradients.scss", - "vendor/assets/stylesheets/bootstrap/mixins/_grid-framework.scss", - "vendor/assets/stylesheets/bootstrap/mixins/_grid.scss", - "vendor/assets/stylesheets/bootstrap/mixins/_hide-text.scss", - "vendor/assets/stylesheets/bootstrap/mixins/_image.scss", - "vendor/assets/stylesheets/bootstrap/mixins/_labels.scss", - "vendor/assets/stylesheets/bootstrap/mixins/_list-group.scss", - "vendor/assets/stylesheets/bootstrap/mixins/_nav-divider.scss", - "vendor/assets/stylesheets/bootstrap/mixins/_nav-vertical-align.scss", - "vendor/assets/stylesheets/bootstrap/mixins/_opacity.scss", - "vendor/assets/stylesheets/bootstrap/mixins/_pagination.scss", - "vendor/assets/stylesheets/bootstrap/mixins/_panels.scss", - "vendor/assets/stylesheets/bootstrap/mixins/_progress-bar.scss", - "vendor/assets/stylesheets/bootstrap/mixins/_reset-filter.scss", - "vendor/assets/stylesheets/bootstrap/mixins/_resize.scss", - "vendor/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss", - "vendor/assets/stylesheets/bootstrap/mixins/_size.scss", - "vendor/assets/stylesheets/bootstrap/mixins/_tab-focus.scss", - "vendor/assets/stylesheets/bootstrap/mixins/_table-row.scss", - "vendor/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss", - "vendor/assets/stylesheets/bootstrap/mixins/_text-overflow.scss", - "vendor/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss", "vendor/assets/stylesheets/bootstrap.scss", "vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.eot", "vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.svg", diff --git a/tasks/bower.rake b/tasks/bower.rake index 3862ef6b..6c075d38 100644 --- a/tasks/bower.rake +++ b/tasks/bower.rake @@ -19,7 +19,8 @@ namespace :bower do line.strip if line.sub!(%r(//\s*=\s*require\s*(.*)\s*), 'vendor/assets/javascripts/\1.js') end.compact - spec['main'] = find_files.(Bootstrap.stylesheets_path) + + spec['main'] = + find_files.(File.join(Bootstrap.stylesheets_path, 'bootstrap.scss')) + find_files.(Bootstrap.fonts_path) + js_paths