From e20d2dfe9d1f43e164d8fdbef64f4041df70b762 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 15 Jul 2012 16:13:25 -0700 Subject: [PATCH] docs cleanup and blockquote cleanup for .pull-right option --- docs/assets/css/bootstrap.css | 8 ++++++++ docs/assets/css/docs.css | 3 +++ docs/base-css.html | 5 ++--- docs/scaffolding.html | 12 ++++++------ docs/templates/pages/base-css.mustache | 5 ++--- docs/templates/pages/scaffolding.mustache | 12 ++++++------ less/tests/css-tests.html | 1 - less/type.less | 8 ++++++++ 8 files changed, 35 insertions(+), 19 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 123b2ac33f..0040d4d0f7 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 2c73a78c2e..a3ca5850e3 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 d01d5350c9..46685b1129 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -253,7 +253,7 @@

Alternate displays

-

Use .pull-left and .pull-right classes for floated, right-aligned blockquote content.

+

Use .pull-right for a floated, right-aligned blockquote.

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

@@ -262,8 +262,7 @@ 
 <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>
diff --git a/docs/scaffolding.html b/docs/scaffolding.html index dcdbadda4a..1aca819f91 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -168,7 +168,7 @@

Basic grid HTML

-

For a simple two column layout, create a .row and add the appropriate number of .span* columns. As this is a 12-column grid, each .span* spans a number of those 12 columns, and should always add up to 12 for each row.

+

For a simple two column layout, create a .row and add the appropriate number of .span* columns. As this is a 12-column grid, each .span* 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).

 <div class="row">
   <div class="span4">...</div>
@@ -207,10 +207,10 @@
             

               Level 1 of column
               

-                

+                

                   Level 2
                 

-                

+                

                   Level 2
                 

               

@@ -218,11 +218,11 @@
           

 
 <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 7e7106fb6e..a630acfeda 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -190,7 +190,7 @@
 

 
         
{{_i}}Alternate displays{{/i}}

-        
{{_i}}Use .pull-left and .pull-right classes for floated, right-aligned blockquote content.{{/i}}

+        
{{_i}}Use .pull-right for a floated, right-aligned blockquote.{{/i}}

         

           

             
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

@@ -199,8 +199,7 @@
         

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

 
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 86806bb563..4b9d4c5b25 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -97,7 +97,7 @@
         

 
         
{{_i}}Basic grid HTML{{/i}}

-        
{{_i}}For a simple two column layout, create a .row and add the appropriate number of .span* columns. As this is a 12-column grid, each .span* spans a number of those 12 columns, and should always add up to 12 for each row.{{/i}}

+        
{{_i}}For a simple two column layout, create a .row and add the appropriate number of .span* columns. As this is a 12-column grid, each .span* 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}}

 
 <div class="row">
   <div class="span4">...</div>
@@ -136,10 +136,10 @@
             

               {{_i}}Level 1 of column{{/i}}
               

-                

+                

                   {{_i}}Level 2{{/i}}
                 

-                

+                

                   {{_i}}Level 2{{/i}}
                 

               

@@ -147,11 +147,11 @@
           

 
 <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>
diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html
index 6cc48a6082..fd687ac3a5 100644
--- a/less/tests/css-tests.html
+++ b/less/tests/css-tests.html
@@ -1053,7 +1053,6 @@
 
 
 
-
     

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