diff options
| author | Jacob Thornton <[email protected]> | 2012-01-27 11:07:17 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-27 11:07:17 -0800 |
| commit | 3b3dbd7229f53eb71759def4eca90dfd7a2699f8 (patch) | |
| tree | 89a8af1724ef8791a315a028c5515a5ec8500d3b /docs/templates | |
| parent | aa594501bd24d51181dc3504602aa4aaefb1cb60 (diff) | |
| parent | 97546adc90a9c8149bb4560641b4164338e38063 (diff) | |
| download | bootstrap-3b3dbd7229f53eb71759def4eca90dfd7a2699f8.tar.xz bootstrap-3b3dbd7229f53eb71759def4eca90dfd7a2699f8.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
docs/assets/css/bootstrap.css
Diffstat (limited to 'docs/templates')
| -rw-r--r-- | docs/templates/pages/download.mustache | 6 | ||||
| -rw-r--r-- | docs/templates/pages/scaffolding.mustache | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache index 0f997d368..5b9f765ab 100644 --- a/docs/templates/pages/download.mustache +++ b/docs/templates/pages/download.mustache @@ -19,7 +19,7 @@ <section class="download" id="components"> <div class="page-header"> - <a class="pull-right toggle-all" href="#">Toggle all</a> + <a class="btn small pull-right toggle-all" href="#">Toggle all</a> <h1> 1. Select components <small>Get just the CSS you need</small> @@ -79,7 +79,7 @@ <section class="download" id="variables"> <div class="page-header"> - <a class="pull-right toggle-all" href="#">Reset to defaults</a> + <a class="btn small pull-right toggle-all" href="#">Reset to defaults</a> <h1> 2. Modify variables <small>Customize Bootstrap without using a LESS compiler</small> @@ -157,7 +157,7 @@ <section class="download" id="plugins"> <div class="page-header"> - <a class="pull-right toggle-all" href="#">Toggle all</a> + <a class="btn small pull-right toggle-all" href="#">Toggle all</a> <h1> 3. Select jQuery plugins <small>Quickly add only the necessary javascript</small> diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index 7781e86f6..cf672cc6e 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -71,6 +71,8 @@ </div> </div><!-- /row --> + <br> + <h2>Offsetting columns</h2> <div class="row show-grid"> <div class="span4">4</div> @@ -83,6 +85,12 @@ <div class="row show-grid"> <div class="span8 offset4">8 offset 4</div> </div><!-- /row --> +<pre class="prettyprint linenums"> +<div class="row"> + <div class="span4">...</div> + <div class="span4 offset4">...</div> +</div> +</pre> <br> |