docs cleanup and blockquote cleanup for .pull-right option

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 123b2ac33f8125d20120d67937391951fa203c2b..0040d4d0f7287308e7eed7c2c41c60ffd7c079ff 100644 (file)
--- 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 2c73a78c2e8f9370f0cf3426094326fc5363152f..a3ca5850e307de5a8a65653b29c6be4cfd0881ed 100644 (file)
--- 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 d01d5350c9d616ad1eb4a08de7a25d37662ebfcb..46685b11290a81590c53eeaaa9fccaf21a321cd9 100644 (file)
--- 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">
 &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>
 

diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index dcdbadda4affeeb0359e7b91c58b8fdd30286ad1..1aca819f918225cb9905fe4001b20e91438cc943 100644 (file)
--- 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">
 &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;

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 7e7106fb6e31a73a4517e963f92e74c2885d374a..a630acfeda076c1239fe8754c526bb17857193f5 100644 (file)
--- 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">
 &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>
 

diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 86806bb563f0d6714e1b57934aa536063285d88c..4b9d4c5b253eb6cc06aac597e1f424a0a510e76d 100644 (file)
--- 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">
 &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;

diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html
index 6cc48a60824499275f1dd07d1b801b5f9b1d3fcd..fd687ac3a5e3d6596d2a1dd202f193a77ef61e8c 100644 (file)
--- a/less/tests/css-tests.html
+++ b/less/tests/css-tests.html
@@ -1053,7 +1053,6 @@
 
 
 
-
     </div><!-- /container -->
 
 

diff --git a/less/type.less b/less/type.less
index 697b64a54bab7572df0b40cda42cc2dc3d7e05e9..5cb93af0fe6bf8452d6c2971cdacd4ac87be640a 100644 (file)
--- a/less/type.less
+++ b/less/type.less
@@ -179,6 +179,14 @@ blockquote {
     small {
       text-align: right;
     }
+    small {
+      &:before {
+        content: '';
+      }
+      &:after {
+        content: '\00A0 \2014';
+      }
+    }
   }
 }