Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip

Conflicts:
	docs/assets/bootstrap.zip
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css

4 files changed, 37 insertions, 7 deletions

diff --git a/less/forms.less b/less/forms.less
index 4043e45a46..280c63d6b2 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -48,7 +48,7 @@ input,
 button,
 select,
 textarea {
-  #font > #family > .sans-serif(); // And only set font-family here for those that need it (note the missing label element)
+  font-family: @baseFontFamily; // And only set font-family here for those that need it (note the missing label element)
 }
 
 // Identify controls by their labels
diff --git a/less/navbar.less b/less/navbar.less
index 77cdf7a7a8..75ad1336de 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -233,9 +233,9 @@
 // Active nav items
 .navbar .nav .active > a,
 .navbar .nav .active > a:hover {
-  color: @navbarLinkColorHover;
+  color: @navbarLinkColorActive;
   text-decoration: none;
-  background-color: @navbarBackground;
+  background-color: @navbarLinkBackgroundActive;
 }
 
 // Dividers (basically a vertical hr)
diff --git a/less/variables.less b/less/variables.less
index 74290b7bae..fef3ee0ee5 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -50,9 +50,9 @@
 @baseLineHeight:        18px;
 @altFontFamily:         Georgia, "Times New Roman", Times, serif;
 
-@headingsFontFamily:    ''; // empty to use BS default, @baseFontFamily
-@headingsFontWeight:    normal; // instead of browser default, bold
-@headingsColor:         ''; // empty to use BS default, @textColor
+@headingsFontFamily:    inherit; // empty to use BS default, @baseFontFamily
+@headingsFontWeight:    bold;    // instead of browser default, bold
+@headingsColor:         inherit; // empty to use BS default, @textColor
 
 
 // Tables
@@ -105,10 +105,12 @@
 
 
 
+
 // COMPONENT VARIABLES
 // --------------------------------------------------
 
 // Z-index master list
+// -------------------------
 // Used for a bird's eye view of components dependent on the z-axis
 // Try to avoid customizing these :)
 @zindexDropdown:          1000;
@@ -118,32 +120,46 @@
 @zindexModalBackdrop:     1040;
 @zindexModal:             1050;
 
+
 // Sprite icons path
+// -------------------------
 @iconSpritePath:          "../img/glyphicons-halflings.png";
 @iconWhiteSpritePath:     "../img/glyphicons-halflings-white.png";
 
+
 // Input placeholder text color
+// -------------------------
 @placeholderText:         @grayLight;
 
+
 // Hr border color
+// -------------------------
 @hrBorder:                @grayLighter;
 
+
 // Navbar
+// -------------------------
 @navbarHeight:                    40px;
 @navbarBackground:                @grayDarker;
 @navbarBackgroundHighlight:       @grayDark;
-@navbarLinkBackgroundHover:       transparent;
 
 @navbarText:                      @grayLight;
 @navbarLinkColor:                 @grayLight;
 @navbarLinkColorHover:            @white;
+@navbarLinkColorActive:           @navbarLinkColorHover;
+@navbarLinkBackgroundHover:       transparent;
+@navbarLinkBackgroundActive:      @navbarBackground;
+
 
 // Hero unit
+// -------------------------
 @heroUnitBackground:              #312f2e;
 @heroUnitHeadingColor:            @white;
 @heroUnitLeadColor:               @white;
 
+
 // Form states and alerts
+// -------------------------
 @warningText:             #c09853;
 @warningBackground:       #fcf8e3;
 @warningBorder:           darken(spin(@warningBackground, -10), 3%);
@@ -162,15 +178,19 @@
 
 
 
+
 // GRID
 // --------------------------------------------------
 
 // Default 940px grid
+// -------------------------
 @gridColumns:             12;
 @gridColumnWidth:         60px;
 @gridGutterWidth:         20px;
 @gridRowWidth:            (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
 
+
 // Fluid grid
+// -------------------------
 @fluidGridColumnWidth:    6.382978723%;
 @fluidGridGutterWidth:    2.127659574%;
diff --git a/less/wells.less b/less/wells.less
index 244b8ca102..9300061a50 100644
--- a/less/wells.less
+++ b/less/wells.less
@@ -15,3 +15,13 @@
     border-color: rgba(0,0,0,.15);
   }
 }
+
+// Sizes
+.well-large {
+  padding: 24px;
+  .border-radius(6px);
+}
+.well-small {
+  padding: 9px;
+  .border-radius(3px);
+}