mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00
Code Activity

docs cleanup and blockquote cleanup for .pull-right option

Browse Source
This commit is contained in:
Mark Otto
2012-07-15 16:13:25 -07:00
parent 750badabf7
commit e20d2dfe9d
8 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/templates/pages/base-css.mustache
Vendored
+2 -3
View File
@@ -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">
&lt;blockquote class="pull-right"&gt;
&lt;p&gt;Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.&lt;/p&gt;
&lt;small&gt;{{_i}}Someone famous &lt;cite title="Source Title"&gt;Source Title&lt;/cite&gt;{{/i}}&lt;/small&gt;
...
&lt;/blockquote&gt;
</pre>
docs/templates/pages/scaffolding.mustache
Vendored
+6 -6
View File
@@ -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">
&lt;div class="row"&gt;
&lt;div class="span4"&gt;...&lt;/div&gt;
@@ -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">
&lt;div class="row"&gt;
&lt;div class="span10"&gt;
&lt;div class="span9"&gt;
{{_i}}Level 1 column{{/i}}
&lt;div class="row"&gt;
&lt;div class="span5"&gt;{{_i}}Level 2{{/i}}&lt;/div&gt;
&lt;div class="span5"&gt;{{_i}}Level 2{{/i}}&lt;/div&gt;
&lt;div class="span6"&gt;{{_i}}Level 2{{/i}}&lt;/div&gt;
&lt;div class="span3"&gt;{{_i}}Level 2{{/i}}&lt;/div&gt;
&lt;/div&gt;
&lt;/div&gt;
&lt;/div&gt;