From fb07367e33e0f72b335ee4340af62021c0b9f4ac Mon Sep 17 00:00:00 2001
From: davegandy <dave@davegandy.com>
Date: Wed, 12 Jun 2013 10:49:37 -0400
Subject: [PATCH] porting bootstrap.scss from scratch

---
 scss/_bootstrap.scss                         | 45 ++++++--------------
 src/assets/font-awesome/scss/_bootstrap.scss | 45 ++++++--------------
 2 files changed, 24 insertions(+), 66 deletions(-)

diff --git a/scss/_bootstrap.scss b/scss/_bootstrap.scss
index db14b2cc8..43f8a2b89 100644
--- a/scss/_bootstrap.scss
+++ b/scss/_bootstrap.scss
@@ -32,68 +32,47 @@
   background-image: none;
 }
 
+
 /* keeps Bootstrap styles with and without icons the same */
 .btn, .nav {
   [class^="icon-"],
   [class*=" icon-"] {
-    //display: inline
-    &.icon-large {
-      line-height: 0.9em;
-    }
-    &.icon-spin {
-      display: inline-block;
-    }
+    //    display: inline;
+    &.icon-large { line-height: .9em; }
+    &.icon-spin { display: inline-block; }
   }
 }
-
 .nav-tabs, .nav-pills {
   [class^="icon-"],
   [class*=" icon-"] {
-    &, &.icon-large {
-      line-height: 0.9em;
-    }
+    &, &.icon-large { line-height: .9em; }
   }
 }
-
 .btn {
   [class^="icon-"],
   [class*=" icon-"] {
     &.pull-left, &.pull-right {
-      &.icon-2x {
-        margin-top: 0.18em;
-      }
-    }
-    &.icon-spin.icon-large {
-      line-height: 0.8em;
+      &.icon-2x { margin-top: .18em; }
     }
+    &.icon-spin.icon-large { line-height: .8em; }
   }
 }
-
 .btn.btn-small {
   [class^="icon-"],
   [class*=" icon-"] {
     &.pull-left, &.pull-right {
-      &.icon-2x {
-        margin-top: 0.25em;
-      }
+      &.icon-2x { margin-top: .25em; }
     }
   }
 }
-
 .btn.btn-large {
   [class^="icon-"],
   [class*=" icon-"] {
-    margin-top: 0;
+    margin-top: 0; // overrides bootstrap default
     &.pull-left, &.pull-right {
-      &.icon-2x {
-        margin-top: 0.05em;
-      }
-    }
-    &.pull-left.icon-2x {
-      margin-right: 0.2em;
-    }
-    &.pull-right.icon-2x {
-      margin-left: 0.2em;
+      &.icon-2x { margin-top: .05em; }
     }
+    &.pull-left.icon-2x { margin-right: .2em; }
+    &.pull-right.icon-2x { margin-left: .2em; }
   }
 }
diff --git a/src/assets/font-awesome/scss/_bootstrap.scss b/src/assets/font-awesome/scss/_bootstrap.scss
index db14b2cc8..43f8a2b89 100644
--- a/src/assets/font-awesome/scss/_bootstrap.scss
+++ b/src/assets/font-awesome/scss/_bootstrap.scss
@@ -32,68 +32,47 @@
   background-image: none;
 }
 
+
 /* keeps Bootstrap styles with and without icons the same */
 .btn, .nav {
   [class^="icon-"],
   [class*=" icon-"] {
-    //display: inline
-    &.icon-large {
-      line-height: 0.9em;
-    }
-    &.icon-spin {
-      display: inline-block;
-    }
+    //    display: inline;
+    &.icon-large { line-height: .9em; }
+    &.icon-spin { display: inline-block; }
   }
 }
-
 .nav-tabs, .nav-pills {
   [class^="icon-"],
   [class*=" icon-"] {
-    &, &.icon-large {
-      line-height: 0.9em;
-    }
+    &, &.icon-large { line-height: .9em; }
   }
 }
-
 .btn {
   [class^="icon-"],
   [class*=" icon-"] {
     &.pull-left, &.pull-right {
-      &.icon-2x {
-        margin-top: 0.18em;
-      }
-    }
-    &.icon-spin.icon-large {
-      line-height: 0.8em;
+      &.icon-2x { margin-top: .18em; }
     }
+    &.icon-spin.icon-large { line-height: .8em; }
   }
 }
-
 .btn.btn-small {
   [class^="icon-"],
   [class*=" icon-"] {
     &.pull-left, &.pull-right {
-      &.icon-2x {
-        margin-top: 0.25em;
-      }
+      &.icon-2x { margin-top: .25em; }
     }
   }
 }
-
 .btn.btn-large {
   [class^="icon-"],
   [class*=" icon-"] {
-    margin-top: 0;
+    margin-top: 0; // overrides bootstrap default
     &.pull-left, &.pull-right {
-      &.icon-2x {
-        margin-top: 0.05em;
-      }
-    }
-    &.pull-left.icon-2x {
-      margin-right: 0.2em;
-    }
-    &.pull-right.icon-2x {
-      margin-left: 0.2em;
+      &.icon-2x { margin-top: .05em; }
     }
+    &.pull-left.icon-2x { margin-right: .2em; }
+    &.pull-right.icon-2x { margin-left: .2em; }
   }
 }