浏览代码

porting bootstrap.scss from scratch

davegandy 12 年之前
父节点
当前提交
fb07367e33
共有 2 个文件被更改,包括 24 次插入66 次删除
  1. 12 33
      scss/_bootstrap.scss
  2. 12 33
      src/assets/font-awesome/scss/_bootstrap.scss

+ 12 - 33
scss/_bootstrap.scss

@@ -32,68 +32,47 @@
   background-image: none;
   background-image: none;
 }
 }
 
 
+
 /* keeps Bootstrap styles with and without icons the same */
 /* keeps Bootstrap styles with and without icons the same */
 .btn, .nav {
 .btn, .nav {
   [class^="icon-"],
   [class^="icon-"],
   [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 {
 .nav-tabs, .nav-pills {
   [class^="icon-"],
   [class^="icon-"],
   [class*=" icon-"] {
   [class*=" icon-"] {
-    &, &.icon-large {
-      line-height: 0.9em;
-    }
+    &, &.icon-large { line-height: .9em; }
   }
   }
 }
 }
-
 .btn {
 .btn {
   [class^="icon-"],
   [class^="icon-"],
   [class*=" icon-"] {
   [class*=" icon-"] {
     &.pull-left, &.pull-right {
     &.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 {
 .btn.btn-small {
   [class^="icon-"],
   [class^="icon-"],
   [class*=" icon-"] {
   [class*=" icon-"] {
     &.pull-left, &.pull-right {
     &.pull-left, &.pull-right {
-      &.icon-2x {
-        margin-top: 0.25em;
-      }
+      &.icon-2x { margin-top: .25em; }
     }
     }
   }
   }
 }
 }
-
 .btn.btn-large {
 .btn.btn-large {
   [class^="icon-"],
   [class^="icon-"],
   [class*=" icon-"] {
   [class*=" icon-"] {
-    margin-top: 0;
+    margin-top: 0; // overrides bootstrap default
     &.pull-left, &.pull-right {
     &.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; }
   }
   }
 }
 }

+ 12 - 33
src/assets/font-awesome/scss/_bootstrap.scss

@@ -32,68 +32,47 @@
   background-image: none;
   background-image: none;
 }
 }
 
 
+
 /* keeps Bootstrap styles with and without icons the same */
 /* keeps Bootstrap styles with and without icons the same */
 .btn, .nav {
 .btn, .nav {
   [class^="icon-"],
   [class^="icon-"],
   [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 {
 .nav-tabs, .nav-pills {
   [class^="icon-"],
   [class^="icon-"],
   [class*=" icon-"] {
   [class*=" icon-"] {
-    &, &.icon-large {
-      line-height: 0.9em;
-    }
+    &, &.icon-large { line-height: .9em; }
   }
   }
 }
 }
-
 .btn {
 .btn {
   [class^="icon-"],
   [class^="icon-"],
   [class*=" icon-"] {
   [class*=" icon-"] {
     &.pull-left, &.pull-right {
     &.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 {
 .btn.btn-small {
   [class^="icon-"],
   [class^="icon-"],
   [class*=" icon-"] {
   [class*=" icon-"] {
     &.pull-left, &.pull-right {
     &.pull-left, &.pull-right {
-      &.icon-2x {
-        margin-top: 0.25em;
-      }
+      &.icon-2x { margin-top: .25em; }
     }
     }
   }
   }
 }
 }
-
 .btn.btn-large {
 .btn.btn-large {
   [class^="icon-"],
   [class^="icon-"],
   [class*=" icon-"] {
   [class*=" icon-"] {
-    margin-top: 0;
+    margin-top: 0; // overrides bootstrap default
     &.pull-left, &.pull-right {
     &.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; }
   }
   }
 }
 }