Update styles for Ruby Sass compat

diff --git a/docs/getting-started/compiling.md b/docs/getting-started/compiling.md
index c7a2211769d2ca8d7bc040f0a240dfd8a4cdc97a..38aa249d55ec90edb5b8ab0af4883171d4126e6c 100644 (file)
--- 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 d9f0e7a4b3d322894e24ab85d8d4b59d4d9a5a2e..88ebc3f54f160219472108d02f3db785feb55d40 100644 (file)
--- 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 d4dcb673f08f9e7c8aa44c47ed66fc6ae9a62aec..b163dad9cd9499e3b9e9a2522a0347133dfaa289 100644 (file)
--- 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 395417324500149ff16b7866a1ef2e0cca9cb3f0..5bbbf5873e2f2f5302558aef1b2b05a03973b60c 100644 (file)
--- 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 aeffdcd78167caff6d20ac4788efe233097de015..5e297fc75eb0f28f18515be5c3d0a76ca0e6fac4 100644 (file)
--- 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 (file)
index 0000000..6bdff02
--- /dev/null
+++ b/scss/mixins/_pulls.scss
@@ -0,0 +1,6 @@
+@mixin pull-left {
+  float: left !important;
+}
+@mixin pull-right {
+  float: right !important;
+}