From f61fe3c4746ec09ff64756797fe6314be5f53b30 Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Sun, 9 Oct 2011 21:13:26 -0700
Subject: refactor fluid layout to be more specific to not interfere with modal
 content while adding right sidebar option

---
 lib/patterns.less | 85 +++++++++++++++++++++++++++----------------------------
 1 file changed, 42 insertions(+), 43 deletions(-)

(limited to 'lib/patterns.less')

diff --git a/lib/patterns.less b/lib/patterns.less
index 1b27b7184..8ceffaa99 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -54,54 +54,53 @@
   }
 
   // Search Form
-  form {
-    float: left;
-    margin: 5px 0 0 0;
+  .form-search {
     position: relative;
-    .opacity(100);
+    margin-top: 5px;
+    margin-bottom: 0;
+    input {
+      background-color: #444;
+      background-color: rgba(255,255,255,.3);
+      #font > .sans-serif(13px, normal, 1);
+      padding: 4px 9px;
+      color: @white;
+      color: rgba(255,255,255,.75);
+      border: 1px solid #111;
+      .border-radius(4px);
+      @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.25);
+      .box-shadow(@shadow);
+      .transition(none);
+
+      // Placeholder text gets special styles; can't be bundled together though for some reason
+      &:-moz-placeholder {
+        color: @grayLighter;
+      }
+      &::-webkit-input-placeholder {
+        color: @grayLighter;
+      }
+      // Hover states
+      &:hover {
+        background-color: @grayLight;
+        background-color: rgba(255,255,255,.5);
+        color: @white;
+      }
+      // Focus states (we use .focused since IE8 and down doesn't support :focus)
+      &:focus,
+      &.focused {
+        outline: 0;
+        background-color: @white;
+        color: @grayDark;
+        text-shadow: 0 1px 0 @white;
+        border: 0;
+        padding: 5px 10px;
+        .box-shadow(0 0 3px rgba(0,0,0,.15));
+      }
+    }
   }
   // Todo: remove from v2.0 when ready, added for legacy
-  form.pull-right {
+  .pull-right {
     float: right;
   }
-  input {
-    background-color: #444;
-    background-color: rgba(255,255,255,.3);
-    #font > .sans-serif(13px, normal, 1);
-    padding: 4px 9px;
-    color: @white;
-    color: rgba(255,255,255,.75);
-    border: 1px solid #111;
-    .border-radius(4px);
-    @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.25);
-    .box-shadow(@shadow);
-    .transition(none);
-
-    // Placeholder text gets special styles; can't be bundled together though for some reason
-    &:-moz-placeholder {
-      color: @grayLighter;
-    }
-    &::-webkit-input-placeholder {
-      color: @grayLighter;
-    }
-    // Hover states
-    &:hover {
-      background-color: @grayLight;
-      background-color: rgba(255,255,255,.5);
-      color: @white;
-    }
-    // Focus states (we use .focused since IE8 and down doesn't support :focus)
-    &:focus,
-    &.focused {
-      outline: 0;
-      background-color: @white;
-      color: @grayDark;
-      text-shadow: 0 1px 0 @white;
-      border: 0;
-      padding: 5px 10px;
-      .box-shadow(0 0 3px rgba(0,0,0,.15));
-    }
-  }
 }
 
 // gradient is applied to it's own element because overflow visible is not honored by ie when filter is present
-- 
cgit v1.2.3


From 8ba005d38dd7a79ea3e90efb6efc7ac9ebcadc26 Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Tue, 11 Oct 2011 09:44:51 -0700
Subject: new navbar introduced to replace topbar

---
 lib/patterns.less | 154 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 86 insertions(+), 68 deletions(-)

(limited to 'lib/patterns.less')

diff --git a/lib/patterns.less b/lib/patterns.less
index 8ceffaa99..a82e2856d 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -3,34 +3,41 @@
  * ---------------------------------------------------------------------------- */
 
 
-// TOPBAR
-// ------
+// NAVBAR (FIXED AND STATIC)
+// -------------------------
 
-// Topbar for Branding and Nav
-.topbar {
-  height: 40px;
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  z-index: 10000;
-  overflow: visible;
+// Navbar variables
+@navBarHeight: 40px;
+@navBarBgStart: #333;
+@navBarBgEnd: #222;
 
-  // Links get text shadow
+// Common styles
+.navbar {
+  height: @navBarHeight;
+  overflow: visible;
+}
+// gradient is applied to it's own element because overflow visible is not honored by ie when filter is present
+.navbar-inner {
+  background-color: @navBarBgEnd;
+  #gradient > .vertical(@navBarBgStart, @navBarBgEnd);
+  @shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
+  .box-shadow(@shadow);
+}
+// Text and links
+.navbar {
+  // Links get text-shadow
   a {
     color: @grayLight;
     text-shadow: 0 -1px 0 rgba(0,0,0,.25);
   }
-
   // Hover and active states
   .brand a:hover,
   ul .active > a {
-    background-color: #333;
+    background-color: @navBarBgStart;
     background-color: rgba(255,255,255,.05);
     color: @white;
     text-decoration: none;
   }
-
   // Website or project name
   .brand {
     float: left;
@@ -42,7 +49,6 @@
     font-weight: 200;
     line-height: 1;
   }
-
   // Plain text in topbar
   p {
     margin: 0;
@@ -52,70 +58,82 @@
       color: @white;
     }
   }
+}
 
-  // Search Form
-  .form-search {
-    position: relative;
-    margin-top: 5px;
-    margin-bottom: 0;
-    input {
-      background-color: #444;
-      background-color: rgba(255,255,255,.3);
-      #font > .sans-serif(13px, normal, 1);
-      padding: 4px 9px;
-      color: @white;
-      color: rgba(255,255,255,.75);
-      border: 1px solid #111;
-      .border-radius(4px);
-      @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.25);
-      .box-shadow(@shadow);
-      .transition(none);
+// Navbar search
+.navbar-search {
+  position: relative;
+  margin-top: 5px;
+  margin-bottom: 0;
+  float: left;
+  input {
+    background-color: #444;
+    background-color: rgba(255,255,255,.3);
+    #font > .sans-serif(13px, normal, 1);
+    padding: 4px 9px;
+    color: @white;
+    color: rgba(255,255,255,.75);
+    border: 1px solid #111;
+    .border-radius(4px);
+    @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.25);
+    .box-shadow(@shadow);
+    .transition(none);
 
-      // Placeholder text gets special styles; can't be bundled together though for some reason
-      &:-moz-placeholder {
-        color: @grayLighter;
-      }
-      &::-webkit-input-placeholder {
-        color: @grayLighter;
-      }
-      // Hover states
-      &:hover {
-        background-color: @grayLight;
-        background-color: rgba(255,255,255,.5);
-        color: @white;
-      }
-      // Focus states (we use .focused since IE8 and down doesn't support :focus)
-      &:focus,
-      &.focused {
-        outline: 0;
-        background-color: @white;
-        color: @grayDark;
-        text-shadow: 0 1px 0 @white;
-        border: 0;
-        padding: 5px 10px;
-        .box-shadow(0 0 3px rgba(0,0,0,.15));
-      }
+    // Placeholder text gets special styles; can't be bundled together though for some reason
+    &:-moz-placeholder {
+      color: @grayLighter;
+    }
+    &::-webkit-input-placeholder {
+      color: @grayLighter;
+    }
+    // Hover states
+    &:hover {
+      background-color: @grayLight;
+      background-color: rgba(255,255,255,.5);
+      color: @white;
+    }
+    // Focus states (we use .focused since IE8 and down doesn't support :focus)
+    &:focus,
+    &.focused {
+      outline: 0;
+      background-color: @white;
+      color: @grayDark;
+      text-shadow: 0 1px 0 @white;
+      border: 0;
+      padding: 5px 10px;
+      .box-shadow(0 0 3px rgba(0,0,0,.15));
     }
-  }
-  // Todo: remove from v2.0 when ready, added for legacy
-  .pull-right {
-    float: right;
   }
 }
 
-// gradient is applied to it's own element because overflow visible is not honored by ie when filter is present
-.topbar-inner {
-  background-color: #222;
-  #gradient > .vertical(#333, #222);
-  @shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
-  .box-shadow(@shadow);
+
+// Static navbar
+.navbar-static {
+  margin-bottom: @baseLineHeight;
+}
+.navbar-static .navbar-inner {
+  margin-left:  -20px;
+  margin-right: -20px;
+  padding-left:  20px;
+  padding-right: 20px;
+  .border-radius(4px);
+}
+
+// Fixed navbar
+.navbar-fixed {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 10000;
 }
 
 
+
 // NAVIGATION
 // ----------
 
-// Topbar Nav
+// Nav for navbar and topbar
 // ul.nav for all topbar based navigation to avoid inheritance issues and over-specificity
 .nav {
   display: block;
-- 
cgit v1.2.3


From b6443905411dcdcec54d7eaad2f998a582271728 Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Tue, 11 Oct 2011 09:52:50 -0700
Subject: update navbar search form

---
 lib/patterns.less | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'lib/patterns.less')

diff --git a/lib/patterns.less b/lib/patterns.less
index a82e2856d..f2a0b7f0e 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -63,10 +63,10 @@
 // Navbar search
 .navbar-search {
   position: relative;
-  margin-top: 5px;
+  margin-top: 6px;
   margin-bottom: 0;
   float: left;
-  input {
+  .search-query {
     background-color: #444;
     background-color: rgba(255,255,255,.3);
     #font > .sans-serif(13px, normal, 1);
@@ -74,8 +74,7 @@
     color: @white;
     color: rgba(255,255,255,.75);
     border: 1px solid #111;
-    .border-radius(4px);
-    @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.25);
+    @shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15);
     .box-shadow(@shadow);
     .transition(none);
 
-- 
cgit v1.2.3


From f4fc56b1b3827254dd771536dcb2b711919f3867 Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Wed, 12 Oct 2011 08:31:16 -0700
Subject: first pass at moving over the new tabs stuff to 2.0

---
 lib/patterns.less | 106 ++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 87 insertions(+), 19 deletions(-)

(limited to 'lib/patterns.less')

diff --git a/lib/patterns.less b/lib/patterns.less
index f2a0b7f0e..af898a561 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -318,14 +318,14 @@
   }
 }
 
-// Basic Tabs
+// Tabs
 .tabs {
-  float: left;
-  width: 100%;
-  border-bottom: 1px solid #ddd;
+  border-color: #ddd;
+  border-style: solid;
+  border-width: 0 0 1px;
   > li {
     position: relative; // For the dropdowns mostly
-    top: 1px;
+    margin-bottom: -1px;
     > a {
       padding: 0 15px;
       margin-right: 2px;
@@ -338,61 +338,129 @@
         border-color: #eee #eee #ddd;
       }
     }
-    &.active > a {
-      color: @gray;
-      background-color: @white;
-      border: 1px solid #ddd;
+  }
+  // Active state, and it's :hover to override normal :hover
+  .active > a,
+  .active > a:hover {
+    color: @gray;
+    background-color: @white;
+    border: 1px solid #ddd;
+    border-bottom-color: transparent;
+    cursor: default;
+  }
+}
+
+.tabbable {
+  margin-bottom: @baseLineHeight;
+
+  // Tabs on top
+  .tabs {
+    margin-bottom: 0;
+    border-bottom: 0;
+  }
+  .tab-content {
+    padding: 19px;
+    border: 1px solid #ddd;
+  }
+
+  // Tabs on bottom
+  &.tabs-bottom .tabs > li {
+    margin-top: -1px;
+    margin-bottom: 0;
+  }
+  &.tabs-bottom .tabs > li > a {
+    .border-radius(0 0 4px 4px);
+    &:hover {
       border-bottom-color: transparent;
+      border-top-color: #ddd;
     }
   }
+  &.tabs-bottom .tabs > .active > a,
+  &.tabs-bottom .tabs > .active > a:hover {
+    border-color: transparent #ddd #ddd #ddd;
+  }
+
+  // Tabs on left
+  &.tabs-left .tabs {
+    float: left;
+  }
+  &.tabs-left .tabs > li {
+    float: none;
+  }
+
+  // Tabs on right
+  &.tabs-right .tabs {
+    float: right;
+  }
+  &.tabs-right .tabs > li {
+    float: none;
+  }
+}
+
+
+// Dropdowns in tabs
+.tabs {
+  // first one for backwards compatibility
+  .menu-dropdown,
   .dropdown-menu {
     top: 35px;
     border-width: 1px;
     .border-radius(0 6px 6px 6px);
   }
+  // first one for backwards compatibility
+  a.menu:after,
   .dropdown-toggle:after {
     border-top-color: #999;
     margin-top: 15px;
     margin-left: 5px;
   }
+  // first one for backwards compatibility
+  li.open.menu .menu,
   .open.dropdown .dropdown-toggle {
     border-color: #999;
   }
+  // first one for backwards compatibility
+  li.open a.menu:after,
   .dropdown.open .dropdown-toggle:after {
     border-top-color: #555;
   }
 }
-.tab-content {
-  clear: both;
-}
 
-// Basic pill nav
+// Pills
 .pills {
   a {
     margin: 5px 3px 5px 0;
     padding: 0 15px;
-    text-shadow: 0 1px 1px @white;
     line-height: 30px;
+    text-shadow: 0 1px 1px @white;
     .border-radius(15px);
     &:hover {
-      background: @linkColorHover;
       color: @white;
       text-decoration: none;
       text-shadow: 0 1px 1px rgba(0,0,0,.25);
+      background-color: @linkColorHover;
     }
   }
   .active a {
-    background: @linkColor;
     color: @white;
     text-shadow: 0 1px 1px rgba(0,0,0,.25);
+    background-color: @linkColor;
   }
 }
 
-.tab-content > *,
-.pill-content > * {
-  display: none;
+// Stacked pills
+.pills-vertical > li {
+  float: none;
 }
 
+// Tabbable areas
+.tab-content,
+.pill-content {
+}
+.tab-content > .tab-pane,
+.pill-content > .pill-pane {
+  display: none;
+}
 .tab-content > .active,
 .pill-content > .active {
   display: block;
-- 
cgit v1.2.3


From 3a4760637f3acca9cbd8af2819d163848852a23a Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Sun, 16 Oct 2011 03:15:17 -0700
Subject: tweak navbar styles for static version to not cause problems on
 responsive layouts

---
 lib/patterns.less | 2 --
 1 file changed, 2 deletions(-)

(limited to 'lib/patterns.less')

diff --git a/lib/patterns.less b/lib/patterns.less
index af898a561..950ac2feb 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -111,8 +111,6 @@
   margin-bottom: @baseLineHeight;
 }
 .navbar-static .navbar-inner {
-  margin-left:  -20px;
-  margin-right: -20px;
   padding-left:  20px;
   padding-right: 20px;
   .border-radius(4px);
-- 
cgit v1.2.3


From e7d2218b2043742f21c368d074d97a4bde275730 Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Sun, 16 Oct 2011 23:04:31 -0700
Subject: few tweaks to responsive stuff, updated docs for grid system (still
 needs copy editing)

---
 lib/patterns.less | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/patterns.less')

diff --git a/lib/patterns.less b/lib/patterns.less
index 950ac2feb..f1badc46d 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -520,11 +520,11 @@ footer {
 // ------------
 
 .page-header {
-  margin-bottom: @baseLineHeight - 1;
-  border-bottom: 1px solid #ddd;
+  margin-bottom: @baseLineHeight * 1.5;
+  border-bottom: 1px solid #eee;
   .box-shadow(0 1px 0 rgba(255,255,255,.5));
   h1 {
-    margin-bottom: (@baseLineHeight / 2) - 1px;
+    margin-bottom: @baseLineHeight * .75;
   }
 }
 
-- 
cgit v1.2.3