From 6c061ea2d3d74fe6333d36e510fadee11f79ced2 Mon Sep 17 00:00:00 2001
From: connors <connor.sears@github.com>
Date: Sun, 2 Feb 2014 17:33:20 -0800
Subject: [PATCH] simplify

---
 dist/ratchet.css      | 12 ++++-----
 lib/sass/badges.scss  | 18 ++++++--------
 lib/sass/bars.scss    |  4 ---
 lib/sass/buttons.scss | 58 +++++++++++++++++++------------------------
 lib/sass/push.scss    |  1 -
 lib/sass/toggles.scss |  6 ++---
 6 files changed, 40 insertions(+), 59 deletions(-)

diff --git a/dist/ratchet.css b/dist/ratchet.css
index 87be85a..7882597 100644
--- a/dist/ratchet.css
+++ b/dist/ratchet.css
@@ -397,9 +397,6 @@ p {
   -webkit-box-shadow: none;
   box-shadow: none;
 }
-.popover .bar-nav .title + .btn:last-child {
-  right: 15px;
-}
 
 .card {
   width: auto;
@@ -714,7 +711,7 @@ input[type="button"] {
 .bar-nav .btn.pull-left {
   margin-right: 10px;
 }
-.bar-nav .btn-link {
+.bar-nav .btn .btn-link {
   padding: 0;
   margin-top: 0;
   font-size: 16px;
@@ -723,7 +720,7 @@ input[type="button"] {
   background-color: transparent;
   border: none;
 }
-.bar-nav .btn-link:active, .bar-nav .btn-link.active {
+.bar-nav .btn .btn-link:active, .bar-nav .btn .btn-link.active {
   color: #3071a9;
 }
 
@@ -740,10 +737,11 @@ input[type="button"] {
 .popover .btn-block:last-child {
   margin-bottom: 0;
 }
-.popover .bar-nav .btn-link.pull-left {
+
+.bar-nav .btn-link.pull-left {
   margin-left: 5px;
 }
-.popover .bar-nav .btn-link.pull-right {
+.bar-nav .btn-link.pull-right {
   margin-right: 5px;
 }
 
diff --git a/lib/sass/badges.scss b/lib/sass/badges.scss
index be32f3f..4237dc7 100644
--- a/lib/sass/badges.scss
+++ b/lib/sass/badges.scss
@@ -85,15 +85,13 @@
 }
 
 // Ratchicons in table-views
-.table-view {
-  .badge {
-    margin-top: 2px;
-
-    &.pull-left {
-      margin-right: 5px;
-    }
-    &.pull-right {
-      margin-left: 5px;
-    }
+.table-view .badge {
+  margin-top: 2px;
+
+  &.pull-left {
+    margin-right: 5px;
+  }
+  &.pull-right {
+    margin-left: 5px;
   }
 }
diff --git a/lib/sass/bars.scss b/lib/sass/bars.scss
index 3eaab16..543c592 100644
--- a/lib/sass/bars.scss
+++ b/lib/sass/bars.scss
@@ -130,8 +130,4 @@
   border-bottom: $border-default;
   border-radius: 12px 12px 0 0;
   @include box-shadow(none);
-
-  .title + .btn:last-child {
-    right: 15px;
-  }
 }
diff --git a/lib/sass/buttons.scss b/lib/sass/buttons.scss
index 028acaf..f15e44d 100644
--- a/lib/sass/buttons.scss
+++ b/lib/sass/buttons.scss
@@ -129,21 +129,18 @@ input[type="button"] {
 // Buttons in nav bars
 // --------------------------------------------------
 
-.bar-nav {
-  // Generic style for all buttons in .bar-title
-  .btn {
-    position: relative;
-    z-index: 10; // Position the buttons on top of .title
-    padding: 6px 12px;
-    margin-top: 8px;
-    font-weight: $font-weight-light;
-
-    &.pull-right { 
-      margin-left: $bar-side-spacing; 
-    }
-    &.pull-left { 
-      margin-right: $bar-side-spacing; 
-    }
+.bar-nav .btn {
+  position: relative;
+  z-index: 10; // Position the buttons on top of .title
+  padding: 6px 12px;
+  margin-top: 8px;
+  font-weight: $font-weight-light;
+
+  &.pull-right { 
+    margin-left: $bar-side-spacing; 
+  }
+  &.pull-left { 
+    margin-right: $bar-side-spacing;
   }
 
   // Link button (Buttons that look like links)
@@ -179,30 +176,25 @@ input[type="button"] {
 // Block level buttons in popovers
 // --------------------------------------------------
 
-.popover {
-  .btn-block {
-    margin-bottom: 5px;
-  }
-
+.popover .btn-block {
+  margin-bottom: 5px;
   // Remove extra margin on bottom of last button
-  .btn-block:last-child {
+  &:last-child {
     margin-bottom: 0;
   }
-  // Line the button text up with content's text
-  .bar-nav .btn-link {
-    &.pull-left {
-      margin-left: 5px;
-    }
-    &.pull-right {
-      margin-right: 5px;
-    }
+}
+// Line the button text up with content's text
+.bar-nav .btn-link {
+  &.pull-left {
+    margin-left: 5px;
+  }
+  &.pull-right {
+    margin-right: 5px;
   }
 }
 
 // Buttons in table-views
 // --------------------------------------------------
-.table-view {
-  .btn {
-    margin-top: -1px; // Center the btn inside the cell
-  }
+.table-view .btn {
+  margin-top: -1px; // Center the btn inside the cell
 }
diff --git a/lib/sass/push.scss b/lib/sass/push.scss
index c0e7077..3537809 100644
--- a/lib/sass/push.scss
+++ b/lib/sass/push.scss
@@ -3,7 +3,6 @@
 // --------------------------------------------------
 
 .content {
-  
   // Fade animation 
   &.fade {
     left: 0;
diff --git a/lib/sass/toggles.scss b/lib/sass/toggles.scss
index 419ca37..95341a1 100644
--- a/lib/sass/toggles.scss
+++ b/lib/sass/toggles.scss
@@ -62,8 +62,6 @@
 
 // Toggles in table-views
 // --------------------------------------------------
-.table-view {
-  .toggle {
-    margin-top: -4px; // Center the toggle inside the cell
-  }
+.table-view .toggle {
+  margin-top: -4px; // Center the toggle inside the cell
 }