kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

docs cleanup and blockquote cleanup for .pull-right option

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/assets/css/bootstrap.css vendored
View File

@ -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,

3
docs/assets/css/docs.css
View File

@ -61,6 +61,9 @@ section > .page-header,
section > .lead {
color: #5a5a5a;
}
section > ul li {
margin-bottom: 5px;
}
/* Separators (hr) */
.bs-docs-separator {

5
docs/base-css.html
View File

@ -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">
&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;Someone famous &lt;cite title="Source Title"&gt;Source Title&lt;/cite&gt;&lt;/small&gt;
...
&lt;/blockquote&gt;
</pre>

12
docs/scaffolding.html
View File

@ -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">
&lt;div class="row"&gt;
&lt;div class="span4"&gt;...&lt;/div&gt;
@ -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">
&lt;div class="row"&gt;
&lt;div class="span10"&gt;
&lt;div class="span9"&gt;
Level 1 column
&lt;div class="row"&gt;
&lt;div class="span5"&gt;Level 2&lt;/div&gt;
&lt;div class="span5"&gt;Level 2&lt;/div&gt;
&lt;div class="span6"&gt;Level 2&lt;/div&gt;
&lt;div class="span3"&gt;Level 2&lt;/div&gt;
&lt;/div&gt;
&lt;/div&gt;
&lt;/div&gt;

5
docs/templates/pages/base-css.mustache vendored
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>

12
docs/templates/pages/scaffolding.mustache vendored
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;

1
less/tests/css-tests.html
View File

@ -1053,7 +1053,6 @@
</div><!-- /container -->

8
less/type.less
View File

@ -179,6 +179,14 @@ blockquote {
small {
text-align: right;
}
small {
&:before {
content: '';
}
&:after {
content: '\00A0 \2014';
}
}
}
}