Merge branch 'master' of http://git.local.twitter.com/baseline

3 files changed, 27 insertions, 60 deletions

diff --git a/lib/patterns.less b/lib/patterns.less
index e02fbd0b4..29a705f44 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -7,62 +7,6 @@
 /* Top bar
 -------------------------------------------------- */
 
-/*
-div.topbar {
-  #gradient > .vertical(#333, #222);
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  z-index: 1000;
-  height: 40px;
-  .box-shadow(0 1px 3px rgba(0,0,0,.5));
-  a {
-    color: #999;
-    &:hover {
-      color: @white;
-      text-decoration: none;
-      background-color: rgba(255,255,255,.05);
-    }
-  }
-  a.logo,
-  ul li a {
-    float: left;
-    padding: 0 10px;
-    line-height: 40px;
-    text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-  }
-  // Logo
-  a.logo {
-    margin-left: -10px;
-    margin-right: 10px;
-    color: @grayLight;
-    font-size: 20px;
-    font-weight: 200;
-    img {
-      float: left;
-      margin-top: 9px;
-      margin-right: 6px;
-    }
-    &:hover {
-      color: @white;
-    }
-  }
-  // Nav items
-  ul {
-    float: left;
-    margin: 0;
-    li {
-      display: inline;
-      &.active a {
-        color: #fff;
-        background-color: rgba(0,0,0,.5);
-      }
-    }
-  }
-}
-*/
-
 // Topbar for Branding and Nav
 div.topbar {
   #gradient > .vertical(#333, #222);
@@ -524,3 +468,28 @@ div.well {
   .border-radius(4px);
   .box-shadow(inset 0 1px 1px rgba(0,0,0,.075);
 }
+
+
+/* Modals
+-------------------------------------------------- */
+
+div.modal-backdrop {
+  background-color: rgba(0,0,0,.5);
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 1000;
+}
+div.modal {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  z-index: 2000;
+  width: 620px;
+  height: 500px;
+  margin: -310px 0 0 -250px;
+  background-color: @white;
+  .border-radius(6px);
+}
diff --git a/lib/preboot.less b/lib/preboot.less
index 70ac9265c..f7c5c9ba9 100644
--- a/lib/preboot.less
+++ b/lib/preboot.less
@@ -8,7 +8,7 @@
 -------------------------------------------------- */
 
 // Links
-@linkColor:         #08b5fb;
+@linkColor:         #0069d6;
 @linkColorHover:    darken(@linkColor, 10);
 
 // Grays
@@ -178,7 +178,7 @@
   text-shadow: @textShadow;
   color: @textColor;
   font-size: @fontSize;
-  line-height: 20px;
+  line-height: @baseline;
   .border-radius(@borderRadius);
   @shadow: inset 0 1px 0 rgba(255,255,255,.2), inset 0 -1px 0 rgba(0,0,0,.2), 0 1px 2px rgba(0,0,0,.25);
   .box-shadow(@shadow);
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index eb787fe59..1e81d4de3 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -89,14 +89,12 @@ a {
   }
   &.large {
     font-size: 16px;
-    line-height: 30px;
     .border-radius(6px);
   }
   &.small {
     padding-right: 9px;
     padding-left: 9px;
     font-size: 11px;
-    line-height: 16px;
   }
 }
 // Help Firefox not be a douche about adding extra padding to buttons