Revert "Merge pull request #107 from rei/consolidate-pulls"

This reverts commit 460835f, reversing changes made to 5c2e15c.
rei · May 27, 2016 · 1ea4b4f · 1ea4b4f · mhewson · May 27, 2016
1 parent 3ac0e92
commit 1ea4b4f
Showing 1 changed file with 33 additions and 40 deletions.
diff --git a/src/less/definitions/utilities/utilities.less b/src/less/definitions/utilities/utilities.less
@@ -20,14 +20,13 @@
 .center-block {
   .center-block();
 }
-.pull {
-  &-right {
-    float: right !important;
-  }
-  &-left {
-    float: left !important;
-  }
+.pull-right {
+  float: right !important;
 }
+.pull-left {
+  float: left !important;
+}
+
 
 // Toggling content
 // -------------------------
@@ -56,8 +55,7 @@
 // Vertical rhythm helper classes
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-.vertical {
-  &-push {
+.vertical-push {
     margin-bottom: @vertical-push;
     & + h1,
     & + h2,
@@ -67,39 +65,34 @@
     & + h6 {
         .vertical-pull-md();
     }
-
-    &-sm {
-        margin-bottom: @vertical-push-small;
-    }
-    &-md {
-        margin-bottom: @vertical-push-medium;
-    }
-    &-lg {
-        margin-bottom: @vertical-push-large;
-    }
-    &-xl {
-        margin-bottom: @vertical-push-xlarge;
-    }
-  }
-
-  &-pull {
+}
+.vertical-push-sm {
+    margin-bottom: @vertical-push-small;
+}
+.vertical-push-md {
+    margin-bottom: @vertical-push-medium;
+}
+.vertical-push-lg {
+    margin-bottom: @vertical-push-large;
+}
+.vertical-push-xl {
+    margin-bottom: @vertical-push-xlarge;
+}
+.vertical-pull {
     margin-top: @vertical-push;
-
-    &-sm {
-        margin-top: @vertical-push-small;
-    }
-    &-md {
-        margin-top: @vertical-push-medium;
-    }
-    &-lg {
-        margin-top: @vertical-push-large;
-    }
-    &-xl {
-        margin-top: @vertical-push-xlarge;
-    }
-  }
 }
-
+.vertical-pull-sm {
+    margin-top: @vertical-push-small;
+}
+.vertical-pull-md {
+    margin-top: @vertical-push-medium;
+}
+.vertical-pull-lg {
+    margin-top: @vertical-push-large;
+}
+.vertical-pull-xl {
+    margin-top: @vertical-push-xlarge;
+}
 
 
 // Position element - vertical and horizontal alignment