aboutsummaryrefslogtreecommitdiff
path: root/_includes
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-12-16 00:39:50 -0800
committerMark Otto <[email protected]>2013-12-16 00:39:50 -0800
commitb6b2c90a7d6c00b54d844e52956334e4a0ab56cc (patch)
tree4b93730621a833d93ac161d9507acae647afedb0 /_includes
parent0cb570724dbfb266b363d0e5e27385077976dd65 (diff)
parentec261a83a565cfa13d436feebd7a67360a920e9a (diff)
downloadbootstrap-b6b2c90a7d6c00b54d844e52956334e4a0ab56cc.tar.xz
bootstrap-b6b2c90a7d6c00b54d844e52956334e4a0ab56cc.zip
Merge branch 'master' into docs_derp
Diffstat (limited to '_includes')
-rw-r--r--_includes/nav-css.html14
-rw-r--r--_includes/nav-getting-started.html14
-rw-r--r--_includes/nav-javascript.html1
3 files changed, 27 insertions, 2 deletions
diff --git a/_includes/nav-css.html b/_includes/nav-css.html
index d644c7fda..f0279c61b 100644
--- a/_includes/nav-css.html
+++ b/_includes/nav-css.html
@@ -66,7 +66,9 @@
<li><a href="#forms-horizontal">Horizontal form</a></li>
<li><a href="#forms-controls">Supported controls</a></li>
<li><a href="#forms-controls-static">Static control</a></li>
- <li><a href="#forms-control-states">Control states</a></li>
+ <li><a href="#forms-control-focus">Focus state</a></li>
+ <li><a href="#forms-control-disabled">Disabled state</a></li>
+ <li><a href="#forms-control-validation">Validation states</a></li>
<li><a href="#forms-control-sizes">Control sizing</a></li>
<li><a href="#forms-help-text">Help text</a></li>
</ul>
@@ -87,6 +89,8 @@
<li>
<a href="#helper-classes">Helper classes</a>
<ul class="nav">
+ <li><a href="#helper-classes-colors">Contextual colors</a></li>
+ <li><a href="#helper-classes-backgrounds">Contextual backgrounds</a></li>
<li><a href="#helper-classes-close">Close icon</a></li>
<li><a href="#helper-classes-carets">Carets</a></li>
<li><a href="#helper-classes-floats">Quick floats</a></li>
@@ -105,3 +109,11 @@
<li><a href="#responsive-utilities-tests">Test cases</a></li>
</ul>
</li>
+<li>
+ <a href="#less">Using LESS</a>
+ <ul class="nav">
+ <li><a href="#less-variables">Variables</a></li>
+ <li><a href="#less-mixins-vendor">Vendor mixins</a></li>
+ <li><a href="#less-mixins-utility">Utility mixins</a></li>
+ </ul>
+</li>
diff --git a/_includes/nav-getting-started.html b/_includes/nav-getting-started.html
index ce7a718d6..6c041eef3 100644
--- a/_includes/nav-getting-started.html
+++ b/_includes/nav-getting-started.html
@@ -32,7 +32,19 @@
</ul>
</li>
<li>
- <a href="#browsers">Browser support</a>
+ <a href="#browsers">Browser and device support</a>
+ <ul class="nav">
+ <li><a href="#support-browsers">Supported browsers</a></li>
+ <li><a href="#support-ie8-ie9">Internet Explorer 8-9</a></li>
+ <li><a href="#support-ie8-respondjs">IE8 and Respond.js</a></li>
+ <li><a href="#support-ie8-box-sizing">IE8 and box-sizing</a></li>
+ <li><a href="#support-ie-compatibility-modes">IE Compatibility modes</a></li>
+ <li><a href="#support-ie10-width">IE10 and Windows (Phone) 8</a></li>
+ <li><a href="#support-safari-percentages">Safari percent rounding</a></li>
+ <li><a href="#support-fixed-position-keyboards">Modals, navbars, and virtual keyboards</a></li>
+ <li><a href="#support-browser-zooming">Browser zooming</a></li>
+ <li><a href="#support-android-stock-browser">Android stock browser</a></li>
+ </ul>
</li>
<li>
<a href="#third-parties">Third party support</a>
diff --git a/_includes/nav-javascript.html b/_includes/nav-javascript.html
index e97027096..aeeafe264 100644
--- a/_includes/nav-javascript.html
+++ b/_includes/nav-javascript.html
@@ -13,6 +13,7 @@
<a href="#modals">Modal</a>
<ul class="nav">
<li><a href="#modals-examples">Examples</a></li>
+ <li><a href="#modals-sizes">Sizes</a></li>
<li><a href="#modals-usage">Usage</a></li>
</ul>
</li>