diff options
| author | Gleb Mazovetskiy <[email protected]> | 2014-12-16 20:29:47 +0000 |
|---|---|---|
| committer | Gleb Mazovetskiy <[email protected]> | 2014-12-24 22:22:15 +0200 |
| commit | c0c16edc4100a88ac7949b93cb48868e4bdd8c4e (patch) | |
| tree | b08c4a41a79198bd28db8391b51f7a451a88a90e | |
| parent | 0d96695f5e6ed54b64c9e2e28cb0271627df4064 (diff) | |
| download | bootstrap-c0c16edc4100a88ac7949b93cb48868e4bdd8c4e.tar.xz bootstrap-c0c16edc4100a88ac7949b93cb48868e4bdd8c4e.zip | |
Update styles for Ruby Sass compat
| -rw-r--r-- | docs/getting-started/compiling.md | 2 | ||||
| -rw-r--r-- | scss/_mixins.scss | 1 | ||||
| -rw-r--r-- | scss/_navbar.scss | 4 | ||||
| -rw-r--r-- | scss/_type.scss | 2 | ||||
| -rw-r--r-- | scss/_utilities.scss | 5 | ||||
| -rw-r--r-- | scss/mixins/_pulls.scss | 6 |
6 files changed, 14 insertions, 6 deletions
diff --git a/docs/getting-started/compiling.md b/docs/getting-started/compiling.md index c7a221176..38aa249d5 100644 --- a/docs/getting-started/compiling.md +++ b/docs/getting-started/compiling.md @@ -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]. diff --git a/scss/_mixins.scss b/scss/_mixins.scss index d9f0e7a4b..88ebc3f54 100644 --- a/scss/_mixins.scss +++ b/scss/_mixins.scss @@ -57,3 +57,4 @@ // @import "mixins/navbar-align"; @import "mixins/grid-framework"; @import "mixins/grid"; +@import "mixins/pulls"; diff --git a/scss/_navbar.scss b/scss/_navbar.scss index d4dcb673f..b163dad9c 100644 --- a/scss/_navbar.scss +++ b/scss/_navbar.scss @@ -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 { diff --git a/scss/_type.scss b/scss/_type.scss index 395417324..5bbbf5873 100644 --- a/scss/_type.scss +++ b/scss/_type.scss @@ -116,7 +116,7 @@ ol { // Inline turns list items into inline-block .list-inline { - @extend list-unstyled(); + @extend .list-unstyled; margin-left: -5px; > li { diff --git a/scss/_utilities.scss b/scss/_utilities.scss index aeffdcd78..5e297fc75 100644 --- a/scss/_utilities.scss +++ b/scss/_utilities.scss @@ -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(); } diff --git a/scss/mixins/_pulls.scss b/scss/mixins/_pulls.scss new file mode 100644 index 000000000..6bdff025d --- /dev/null +++ b/scss/mixins/_pulls.scss @@ -0,0 +1,6 @@ +@mixin pull-left { + float: left !important; +} +@mixin pull-right { + float: right !important; +} |