aboutsummaryrefslogtreecommitdiff
path: root/docs/_includes/nav-css.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-03-07 01:30:28 -0800
committerMark Otto <[email protected]>2014-03-07 01:30:28 -0800
commit0143e38a672335b7ca2d73d0de5b2a2b4618f9e9 (patch)
tree7188809b7c2194fc0aca9a65b7d07725ee4206d5 /docs/_includes/nav-css.html
parent642fd5100293755a6003448d4a481f3b314edf15 (diff)
parent1f148427de6d35a06e225deeee0b162b11955232 (diff)
downloadbootstrap-0143e38a672335b7ca2d73d0de5b2a2b4618f9e9.tar.xz
bootstrap-0143e38a672335b7ca2d73d0de5b2a2b4618f9e9.zip
Merge branch 'master' into document_popover_focus
Conflicts: docs/assets/js/docs.min.js
Diffstat (limited to 'docs/_includes/nav-css.html')
-rw-r--r--docs/_includes/nav-css.html13
1 files changed, 12 insertions, 1 deletions
diff --git a/docs/_includes/nav-css.html b/docs/_includes/nav-css.html
index 15025da0c..d67ad20be 100644
--- a/docs/_includes/nav-css.html
+++ b/docs/_includes/nav-css.html
@@ -30,7 +30,8 @@
<ul class="nav">
<li><a href="#type-headings">Headings</a></li>
<li><a href="#type-body-copy">Body copy</a></li>
- <li><a href="#type-emphasis">Emphasis</a></li>
+ <li><a href="#type-inline-text">Inline text elements</a></li>
+ <li><a href="#type-alignment">Alignment classes</a></li>
<li><a href="#type-abbreviations">Abbreviations</a></li>
<li><a href="#type-addresses">Addresses</a></li>
<li><a href="#type-blockquotes">Blockquotes</a></li>
@@ -43,6 +44,8 @@
<li><a href="#code-inline">Inline code</a></li>
<li><a href="#code-user-input">User input</a></li>
<li><a href="#code-block">Blocks of code</a></li>
+ <li><a href="#code-variables">Variables</a></li>
+ <li><a href="#code-sample-output">Sample output</a></li>
</ul>
</li>
<li>
@@ -67,6 +70,7 @@
<li><a href="#forms-controls-static">Static control</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-readonly">Readonly 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>
@@ -128,3 +132,10 @@
<li><a href="#sass-installation">Rails install</a></li>
</ul>
</li>
+<li>
+ <a href="#rtl">RTL version</a>
+ <ul class="nav">
+ <li><a href="#rtl-how-to">How to use</a></li>
+ <li><a href="#rtl-css-flip">CSS Flip</a></li>
+ </ul>
+</li>