kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

Update styles for Ruby Sass compat

Browse source
This commit is contained in:
Gleb Mazovetskiy 2014-12-16 20:29:47 +00:00
parent 0d96695f5e
commit c0c16edc41
6 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/getting-started/compiling.md
View file

@ -41,7 +41,7 @@ This is a convenience method for watching just Sass files and automatically buil
### Use another Sass compiler ### Use another Sass compiler
Bootstrap is compiled with [libsass][libsass] by default. 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]. * `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]. * `libsass` (default) to use [libsass][libsass] via [grunt-sass][grunt-sass].

1
scss/_mixins.scss
View file

@ -57,3 +57,4 @@
// @import "mixins/navbar-align"; // @import "mixins/navbar-align";
@import "mixins/grid-framework"; @import "mixins/grid-framework";
@import "mixins/grid"; @import "mixins/grid";
@import "mixins/pulls";

4
scss/_navbar.scss
View file

@ -199,10 +199,10 @@
@include media-sm { @include media-sm {
.navbar-left { .navbar-left {
@extend .pull-left; @include pull-left();
} }
.navbar-right { .navbar-right {
@extend .pull-right; @include pull-right();
margin-right: -$navbar-padding-horizontal; margin-right: -$navbar-padding-horizontal;
~ .navbar-right { ~ .navbar-right {

2
scss/_type.scss
View file

@ -116,7 +116,7 @@ ol {
// Inline turns list items into inline-block // Inline turns list items into inline-block
.list-inline { .list-inline {
@extend list-unstyled(); @extend .list-unstyled;
margin-left: -5px; margin-left: -5px;
> li { > li {

5
scss/_utilities.scss
View file

@ -10,11 +10,12 @@
.center-block { .center-block {
@include center-block(); @include center-block();
} }
.pull-right { .pull-right {
float: right !important; @include pull-right();
} }
.pull-left { .pull-left {
float: left !important; @include pull-left();
} }

6
scss/mixins/_pulls.scss Normal file
View file

@ -0,0 +1,6 @@
@mixin pull-left {
float: left !important;
}
@mixin pull-right {
float: right !important;
}