aboutsummaryrefslogtreecommitdiff
path: root/_includes
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-12-15 11:16:57 -0800
committerMark Otto <[email protected]>2013-12-15 11:16:57 -0800
commitfd62247bf8bbb1bce072f5ee03e996dfc4abed94 (patch)
tree487766325e03d40c7af16c58873b70d8638a72ba /_includes
parentfbf31f965e27a6665c7e0f2d97eb74c0df7585d4 (diff)
parent2b86e05a6150ef13905519070ea82ce895fbae85 (diff)
downloadbootstrap-fd62247bf8bbb1bce072f5ee03e996dfc4abed94.tar.xz
bootstrap-fd62247bf8bbb1bce072f5ee03e996dfc4abed94.zip
Merge branch 'master' into cover_template
Diffstat (limited to '_includes')
-rw-r--r--_includes/nav-css.html10
-rw-r--r--_includes/nav-javascript.html1
2 files changed, 11 insertions, 0 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-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>