mirror of
https://github.com/twbs/bootstrap-sass.git
synced 2022-11-09 12:27:02 -05:00
In @import use paths relative to the file.
This is to avoid relying on modified Sass load path. File directory is present in load path by default
This commit is contained in:
parent
3b2fc55b95
commit
1ab5022c9b
6 changed files with 64 additions and 58 deletions
11
README.md
11
README.md
|
@ -128,14 +128,19 @@ cp $(bundle show bootstrap-sass)/vendor/assets/stylesheets/bootstrap/bootstrap.s
|
|||
app/assets/stylesheets/bootstrap-custom.scss
|
||||
```
|
||||
|
||||
In your `application.sass`, replace `@import 'bootstrap'` with:
|
||||
Replace all paths in `bootstrap-custom` to point to bootstrap, and comment out components you do not want:
|
||||
|
||||
```diff
|
||||
-@import "variables";
|
||||
+@import "bootstrap/variables";
|
||||
```
|
||||
|
||||
In `application.sass`, replace `@import 'bootstrap'` with:
|
||||
|
||||
```scss
|
||||
@import 'bootstrap-custom';
|
||||
```
|
||||
|
||||
Comment out any modules you don't need from `bootstrap-custom`.
|
||||
|
||||
### Javascript
|
||||
|
||||
We have a helper that includes all Bootstrap javascripts. If you use Rails (or Sprockets separately),
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
module Bootstrap
|
||||
VERSION = '3.0.3.0'
|
||||
BOOTSTRAP_SHA = 'f32796559acbd4e1b276df5515b67926abf97a6e'
|
||||
BOOTSTRAP_SHA = '340e2f553459a6499d77800658a37724af81dfb0'
|
||||
end
|
||||
|
|
|
@ -268,7 +268,7 @@ class Converter
|
|||
end
|
||||
|
||||
# @import "file.less" to "#{target_path}file;"
|
||||
def replace_file_imports(less, target_path = 'bootstrap/')
|
||||
def replace_file_imports(less, target_path = '')
|
||||
less.gsub %r([@\$]import ["|']([\w-]+).less["|'];),
|
||||
%Q(@import "#{target_path}\\1";)
|
||||
end
|
||||
|
|
27
vendor/assets/stylesheets/bootstrap/_panels.scss
vendored
27
vendor/assets/stylesheets/bootstrap/_panels.scss
vendored
|
@ -59,6 +59,20 @@
|
|||
> .table,
|
||||
> .table-responsive > .table {
|
||||
margin-bottom: 0;
|
||||
|
||||
> tbody:last-child,
|
||||
> tfoot:last-child {
|
||||
> tr:last-child {
|
||||
td:first-child,
|
||||
th:first-child {
|
||||
border-bottom-left-radius: ($panel-border-radius - 1);
|
||||
}
|
||||
td:last-child,
|
||||
th:last-child {
|
||||
border-bottom-right-radius: ($panel-border-radius - 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
> .panel-body + .table,
|
||||
> .panel-body + .table-responsive {
|
||||
|
@ -95,19 +109,6 @@
|
|||
border: 0;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
> .table-striped,
|
||||
> .table-responsive > .table-striped {
|
||||
> tbody > tr:last-child {
|
||||
td:first-child,
|
||||
th:first-child {
|
||||
border-bottom-left-radius: ($panel-border-radius - 1);
|
||||
}
|
||||
td:last-child,
|
||||
th:last-child {
|
||||
border-bottom-right-radius: ($panel-border-radius - 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
// Load core variables and mixins
|
||||
// --------------------------------------------------
|
||||
|
||||
@import "bootstrap/variables";
|
||||
@import "bootstrap/mixins";
|
||||
@import "variables";
|
||||
@import "mixins";
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -1,49 +1,49 @@
|
|||
// Core variables and mixins
|
||||
@import "bootstrap/variables";
|
||||
@import "bootstrap/mixins";
|
||||
@import "variables";
|
||||
@import "mixins";
|
||||
|
||||
// Reset
|
||||
@import "bootstrap/normalize";
|
||||
@import "bootstrap/print";
|
||||
@import "normalize";
|
||||
@import "print";
|
||||
|
||||
// Core CSS
|
||||
@import "bootstrap/scaffolding";
|
||||
@import "bootstrap/type";
|
||||
@import "bootstrap/code";
|
||||
@import "bootstrap/grid";
|
||||
@import "bootstrap/tables";
|
||||
@import "bootstrap/forms";
|
||||
@import "bootstrap/buttons";
|
||||
@import "scaffolding";
|
||||
@import "type";
|
||||
@import "code";
|
||||
@import "grid";
|
||||
@import "tables";
|
||||
@import "forms";
|
||||
@import "buttons";
|
||||
|
||||
// Components
|
||||
@import "bootstrap/component-animations";
|
||||
@import "bootstrap/glyphicons";
|
||||
@import "bootstrap/dropdowns";
|
||||
@import "bootstrap/button-groups";
|
||||
@import "bootstrap/input-groups";
|
||||
@import "bootstrap/navs";
|
||||
@import "bootstrap/navbar";
|
||||
@import "bootstrap/breadcrumbs";
|
||||
@import "bootstrap/pagination";
|
||||
@import "bootstrap/pager";
|
||||
@import "bootstrap/labels";
|
||||
@import "bootstrap/badges";
|
||||
@import "bootstrap/jumbotron";
|
||||
@import "bootstrap/thumbnails";
|
||||
@import "bootstrap/alerts";
|
||||
@import "bootstrap/progress-bars";
|
||||
@import "bootstrap/media";
|
||||
@import "bootstrap/list-group";
|
||||
@import "bootstrap/panels";
|
||||
@import "bootstrap/wells";
|
||||
@import "bootstrap/close";
|
||||
@import "component-animations";
|
||||
@import "glyphicons";
|
||||
@import "dropdowns";
|
||||
@import "button-groups";
|
||||
@import "input-groups";
|
||||
@import "navs";
|
||||
@import "navbar";
|
||||
@import "breadcrumbs";
|
||||
@import "pagination";
|
||||
@import "pager";
|
||||
@import "labels";
|
||||
@import "badges";
|
||||
@import "jumbotron";
|
||||
@import "thumbnails";
|
||||
@import "alerts";
|
||||
@import "progress-bars";
|
||||
@import "media";
|
||||
@import "list-group";
|
||||
@import "panels";
|
||||
@import "wells";
|
||||
@import "close";
|
||||
|
||||
// Components w/ JavaScript
|
||||
@import "bootstrap/modals";
|
||||
@import "bootstrap/tooltip";
|
||||
@import "bootstrap/popovers";
|
||||
@import "bootstrap/carousel";
|
||||
@import "modals";
|
||||
@import "tooltip";
|
||||
@import "popovers";
|
||||
@import "carousel";
|
||||
|
||||
// Utility classes
|
||||
@import "bootstrap/utilities";
|
||||
@import "bootstrap/responsive-utilities";
|
||||
@import "utilities";
|
||||
@import "responsive-utilities";
|
||||
|
|
Loading…
Add table
Reference in a new issue