diff options
| author | Mark Otto <[email protected]> | 2013-12-15 15:07:38 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-15 15:07:38 -0800 |
| commit | d1f15baa713764440e8335b8dbab580887caaa12 (patch) | |
| tree | 22795d45cb61184ae349c66e47352051a2f7ec0b /_includes | |
| parent | 3b5e0c9a3cae9bfae38253ae153a3426d1f81ad3 (diff) | |
| parent | b04a1de9b097de7f4df95b30df040efe86563e75 (diff) | |
| download | bootstrap-d1f15baa713764440e8335b8dbab580887caaa12.tar.xz bootstrap-d1f15baa713764440e8335b8dbab580887caaa12.zip | |
Merge branch 'master' into pr/11817
Conflicts:
dist/css/bootstrap.min.css
less/input-groups.less
Diffstat (limited to '_includes')
| -rw-r--r-- | _includes/nav-css.html | 10 | ||||
| -rw-r--r-- | _includes/nav-getting-started.html | 14 | ||||
| -rw-r--r-- | _includes/nav-javascript.html | 1 |
3 files changed, 24 insertions, 1 deletions
diff --git a/_includes/nav-css.html b/_includes/nav-css.html index 0228932dd..531b067e6 100644 --- a/_includes/nav-css.html +++ b/_includes/nav-css.html @@ -87,6 +87,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 +107,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> |