From: Mark Otto <markotto@twitter.com>
Date: Mon, 1 Oct 2012 18:27:40 +0000 (-0700)
Subject: Merge branch '2.1.2-wip' into exploratory
X-Git-Tag: v3.0.0-rc1~906
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e6d6c7a413d69afc41c3c57b72f1b0dedfdbb516;p=thirdparty%2Fbootstrap.git

Merge branch '2.1.2-wip' into exploratory

Conflicts:
	docs/assets/css/bootstrap.css
	less/navs.less
---

e6d6c7a413d69afc41c3c57b72f1b0dedfdbb516
diff --cc docs/assets/css/bootstrap.css
index 925aae1415,eb810c2099..91aa105067
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@@ -3385,9 -3844,40 +3386,43 @@@ input[type="button"].btn-block 
    margin-top: 9px;
  }
  
++<<<<<<< HEAD
 +.nav .divider {
++=======
+ .nav-list {
+   padding-right: 15px;
+   padding-left: 15px;
+   margin-bottom: 0;
+ }
+ 
+ .nav-list > li > a,
+ .nav-list .nav-header {
+   margin-right: -15px;
+   margin-left: -15px;
+   text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+ }
+ 
+ .nav-list > li > a {
+   padding: 3px 15px;
+ }
+ 
+ .nav-list > .active > a,
+ .nav-list > .active > a:hover {
+   color: #ffffff;
+   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
+   background-color: #0088cc;
+ }
+ 
+ .nav-list [class^="icon-"],
+ .nav-list [class*=" icon-"] {
+   margin-right: 2px;
+ }
+ 
+ .nav-list .divider {
+   *width: 100%;
++>>>>>>> 2.1.2-wip
    height: 1px;
    margin: 9px 1px;
 -  *margin: -5px 0 5px;
    overflow: hidden;
    background-color: #e5e5e5;
    border-bottom: 1px solid #ffffff;
diff --cc docs/base-css.html
index 8d0261e5c6,46ce606cbb..1070ef2f45
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@@ -870,17 -872,19 +870,19 @@@ For example, &lt;code&gt;&lt;section&gt
              <h1>Forms</h1>
            </div>
  
 -          <h2>Default styles</h2>
 +          <h2 id="forms-default">Default styles</h2>
            <p>Individual form controls receive styling, but without any required base class on the <code>&lt;form&gt;</code> or large changes in markup. Results in stacked, left-aligned labels on top of form controls.</p>
            <form class="bs-docs-example">
-             <legend>Legend</legend>
-             <label>Label name</label>
-             <input type="text" placeholder="Type something…">
-             <span class="help-block">Example block-level help text here.</span>
-             <label class="checkbox">
-               <input type="checkbox"> Check me out
-             </label>
-             <button type="submit" class="btn">Submit</button>
+             <fieldset>
+               <legend>Legend</legend>
+               <label>Label name</label>
+               <input type="text" placeholder="Type something…">
+               <span class="help-block">Example block-level help text here.</span>
+               <label class="checkbox">
+                 <input type="checkbox"> Check me out
+               </label>
+               <button type="submit" class="btn">Submit</button>
+             </fieldset>
            </form>
  <pre class="prettyprint linenums">
  &lt;form&gt;
diff --cc docs/templates/pages/base-css.mustache
index 1a91ff3879,9e0a899525..a539e7e2b3
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@@ -809,17 -809,19 +809,19 @@@
              <h1>{{_i}}Forms{{/i}}</h1>
            </div>
  
 -          <h2>{{_i}}Default styles{{/i}}</h2>
 +          <h2 id="forms-default">{{_i}}Default styles{{/i}}</h2>
            <p>{{_i}}Individual form controls receive styling, but without any required base class on the <code>&lt;form&gt;</code> or large changes in markup. Results in stacked, left-aligned labels on top of form controls.{{/i}}</p>
            <form class="bs-docs-example">
-             <legend>Legend</legend>
-             <label>{{_i}}Label name{{/i}}</label>
-             <input type="text" placeholder="{{_i}}Type something…{{/i}}">
-             <span class="help-block">{{_i}}Example block-level help text here.{{/i}}</span>
-             <label class="checkbox">
-               <input type="checkbox"> {{_i}}Check me out{{/i}}
-             </label>
-             <button type="submit" class="btn">{{_i}}Submit{{/i}}</button>
+             <fieldset>
+               <legend>Legend</legend>
+               <label>{{_i}}Label name{{/i}}</label>
+               <input type="text" placeholder="{{_i}}Type something…{{/i}}">
+               <span class="help-block">{{_i}}Example block-level help text here.{{/i}}</span>
+               <label class="checkbox">
+                 <input type="checkbox"> {{_i}}Check me out{{/i}}
+               </label>
+               <button type="submit" class="btn">{{_i}}Submit{{/i}}</button>
+             </fieldset>
            </form>{{! /example }}
  <pre class="prettyprint linenums">
  &lt;form&gt;