mirror of
https://github.com/twbs/bootstrap.git
synced 2025-01-17 09:52:29 +01:00
Update styles for Ruby Sass compat
This commit is contained in:
parent
0d96695f5e
commit
c0c16edc41
@ -41,7 +41,7 @@ This is a convenience method for watching just Sass files and automatically buil
|
||||
|
||||
### Use another Sass compiler
|
||||
Bootstrap is compiled with [libsass][libsass] by default.
|
||||
Use another compiler by setting `TWBS_SASS` environment variable to:
|
||||
Use another compiler by setting the `TWBS_SASS` environment variable to:
|
||||
|
||||
* `sass` to use [Ruby Sass][ruby-sass] via [grunt-contrib-sass][grunt-contrib-sass].
|
||||
* `libsass` (default) to use [libsass][libsass] via [grunt-sass][grunt-sass].
|
||||
|
@ -57,3 +57,4 @@
|
||||
// @import "mixins/navbar-align";
|
||||
@import "mixins/grid-framework";
|
||||
@import "mixins/grid";
|
||||
@import "mixins/pulls";
|
||||
|
@ -199,10 +199,10 @@
|
||||
|
||||
@include media-sm {
|
||||
.navbar-left {
|
||||
@extend .pull-left;
|
||||
@include pull-left();
|
||||
}
|
||||
.navbar-right {
|
||||
@extend .pull-right;
|
||||
@include pull-right();
|
||||
margin-right: -$navbar-padding-horizontal;
|
||||
|
||||
~ .navbar-right {
|
||||
|
@ -116,7 +116,7 @@ ol {
|
||||
|
||||
// Inline turns list items into inline-block
|
||||
.list-inline {
|
||||
@extend list-unstyled();
|
||||
@extend .list-unstyled;
|
||||
margin-left: -5px;
|
||||
|
||||
> li {
|
||||
|
@ -10,11 +10,12 @@
|
||||
.center-block {
|
||||
@include center-block();
|
||||
}
|
||||
|
||||
.pull-right {
|
||||
float: right !important;
|
||||
@include pull-right();
|
||||
}
|
||||
.pull-left {
|
||||
float: left !important;
|
||||
@include pull-left();
|
||||
}
|
||||
|
||||
|
||||
|
6
scss/mixins/_pulls.scss
Normal file
6
scss/mixins/_pulls.scss
Normal file
@ -0,0 +1,6 @@
|
||||
@mixin pull-left {
|
||||
float: left !important;
|
||||
}
|
||||
@mixin pull-right {
|
||||
float: right !important;
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user