diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/css/bootstrap.css | 8 | ||||
| -rw-r--r-- | docs/assets/css/docs.css | 3 | ||||
| -rw-r--r-- | docs/base-css.html | 5 | ||||
| -rw-r--r-- | docs/scaffolding.html | 12 | ||||
| -rw-r--r-- | docs/templates/pages/base-css.mustache | 5 | ||||
| -rw-r--r-- | docs/templates/pages/scaffolding.mustache | 12 |
6 files changed, 27 insertions, 18 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 123b2ac33..0040d4d0f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -763,6 +763,14 @@ blockquote.pull-right small { text-align: right; } +blockquote.pull-right small:before { + content: ''; +} + +blockquote.pull-right small:after { + content: '\00A0 \2014'; +} + q:before, q:after, blockquote:before, diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 2c73a78c2..a3ca5850e 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -61,6 +61,9 @@ section > .page-header, section > .lead { color: #5a5a5a; } +section > ul li { + margin-bottom: 5px; +} /* Separators (hr) */ .bs-docs-separator { diff --git a/docs/base-css.html b/docs/base-css.html index d01d5350c..46685b112 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -253,7 +253,7 @@ </pre> <h4>Alternate displays</h4> - <p>Use <code>.pull-left</code> and <code>.pull-right</code> classes for floated, right-aligned blockquote content.</p> + <p>Use <code>.pull-right</code> for a floated, right-aligned blockquote.</p> <div class="bs-docs-example" style="overflow: hidden;"> <blockquote class="pull-right"> <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p> @@ -262,8 +262,7 @@ </div> <pre class="prettyprint linenums"> <blockquote class="pull-right"> - <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p> - <small>Someone famous <cite title="Source Title">Source Title</cite></small> + ... </blockquote> </pre> diff --git a/docs/scaffolding.html b/docs/scaffolding.html index dcdbadda4..1aca819f9 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -168,7 +168,7 @@ </div> <h3>Basic grid HTML</h3> - <p>For a simple two column layout, create a <code>.row</code> and add the appropriate number of <code>.span*</code> columns. As this is a 12-column grid, each <code>.span*</code> spans a number of those 12 columns, and should always add up to 12 for each row.</p> + <p>For a simple two column layout, create a <code>.row</code> and add the appropriate number of <code>.span*</code> columns. As this is a 12-column grid, each <code>.span*</code> spans a number of those 12 columns, and should always add up to 12 for each row (or the number of columns in the parent).</p> <pre class="prettyprint linenums"> <div class="row"> <div class="span4">...</div> @@ -207,10 +207,10 @@ <div class="span9"> Level 1 of column <div class="row show-grid"> - <div class="span5"> + <div class="span6"> Level 2 </div> - <div class="span4"> + <div class="span3"> Level 2 </div> </div> @@ -218,11 +218,11 @@ </div> <pre class="prettyprint linenums"> <div class="row"> - <div class="span10"> + <div class="span9"> Level 1 column <div class="row"> - <div class="span5">Level 2</div> - <div class="span5">Level 2</div> + <div class="span6">Level 2</div> + <div class="span3">Level 2</div> </div> </div> </div> diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 7e7106fb6..a630acfed 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -190,7 +190,7 @@ </pre> <h4>{{_i}}Alternate displays{{/i}}</h4> - <p>{{_i}}Use <code>.pull-left</code> and <code>.pull-right</code> classes for floated, right-aligned blockquote content.{{/i}}</p> + <p>{{_i}}Use <code>.pull-right</code> for a floated, right-aligned blockquote.{{/i}}</p> <div class="bs-docs-example" style="overflow: hidden;"> <blockquote class="pull-right"> <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p> @@ -199,8 +199,7 @@ </div> <pre class="prettyprint linenums"> <blockquote class="pull-right"> - <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p> - <small>{{_i}}Someone famous <cite title="Source Title">Source Title</cite>{{/i}}</small> + ... </blockquote> </pre> diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index 86806bb56..4b9d4c5b2 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -97,7 +97,7 @@ </div> <h3>{{_i}}Basic grid HTML{{/i}}</h3> - <p>{{_i}}For a simple two column layout, create a <code>.row</code> and add the appropriate number of <code>.span*</code> columns. As this is a 12-column grid, each <code>.span*</code> spans a number of those 12 columns, and should always add up to 12 for each row.{{/i}}</p> + <p>{{_i}}For a simple two column layout, create a <code>.row</code> and add the appropriate number of <code>.span*</code> columns. As this is a 12-column grid, each <code>.span*</code> spans a number of those 12 columns, and should always add up to 12 for each row (or the number of columns in the parent).{{/i}}</p> <pre class="prettyprint linenums"> <div class="row"> <div class="span4">...</div> @@ -136,10 +136,10 @@ <div class="span9"> {{_i}}Level 1 of column{{/i}} <div class="row show-grid"> - <div class="span5"> + <div class="span6"> {{_i}}Level 2{{/i}} </div> - <div class="span4"> + <div class="span3"> {{_i}}Level 2{{/i}} </div> </div> @@ -147,11 +147,11 @@ </div> <pre class="prettyprint linenums"> <div class="row"> - <div class="span10"> + <div class="span9"> {{_i}}Level 1 column{{/i}} <div class="row"> - <div class="span5">{{_i}}Level 2{{/i}}</div> - <div class="span5">{{_i}}Level 2{{/i}}</div> + <div class="span6">{{_i}}Level 2{{/i}}</div> + <div class="span3">{{_i}}Level 2{{/i}}</div> </div> </div> </div> |