Merge pull request #17 from twbs/test-with-two-sasses

Also support Ruby Sass

5 files changed, 13 insertions, 5 deletions

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;
+}