diff options
| author | Mark Otto <[email protected]> | 2014-07-07 22:10:22 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-07 22:10:22 -0700 |
| commit | 81b59d35368bc51d361d0352cc92fe99dc580fbf (patch) | |
| tree | 2395d5e79edaaa8c0a7ad82e99931ec895421532 /docs/_includes/nav/css.html | |
| parent | fed2b0f7eb78438eb1b768782b04651881d88740 (diff) | |
| parent | ddee04038f946ac103eb4e70c8eb7adeb2cf563b (diff) | |
| download | bootstrap-81b59d35368bc51d361d0352cc92fe99dc580fbf.tar.xz bootstrap-81b59d35368bc51d361d0352cc92fe99dc580fbf.zip | |
Merge branch 'master' into derp
Conflicts:
docs/_layouts/default.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/docs.min.js
docs/assets/js/src/application.js
Diffstat (limited to 'docs/_includes/nav/css.html')
| -rw-r--r-- | docs/_includes/nav/css.html | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/docs/_includes/nav/css.html b/docs/_includes/nav/css.html index d67ad20be..ac86dffce 100644 --- a/docs/_includes/nav/css.html +++ b/docs/_includes/nav/css.html @@ -18,6 +18,7 @@ <li><a href="#grid-example-fluid">Ex: Fluid container</a></li> <li><a href="#grid-example-mixed">Ex: Mobile and desktops</a></li> <li><a href="#grid-example-mixed-complete">Ex: Mobile, tablet, desktops</a></li> + <li><a href="#grid-example-wrapping">Ex: Column wrapping</a></li> <li><a href="#grid-responsive-resets">Responsive column resets</a></li> <li><a href="#grid-offsetting">Offsetting columns</a></li> <li><a href="#grid-nesting">Nesting columns</a></li> @@ -32,6 +33,7 @@ <li><a href="#type-body-copy">Body copy</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-transformation">Transformation 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> @@ -132,10 +134,3 @@ <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> |