From 3f512adf953da3a3fbbfca18b138fb6659f2b77f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 30 Oct 2011 20:14:27 -0700 Subject: [PATCH] updated docs and type styles for blockquotes and a few fixes for type --- bootstrap.css | 8 ++++- bootstrap.min.css | 1 + docs/assets/css/docs.css | 3 +- docs/base-css.html | 68 ++++++++++++++++++++++++++++++++------ docs/index.html | 70 +--------------------------------------- docs/scaffolding.html | 2 +- lib/type.less | 9 ++++++ 7 files changed, 78 insertions(+), 83 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index ec9217a21b..ca2bfe0b19 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Fri Oct 28 18:37:59 PDT 2011 + * Date: Sun Oct 30 20:12:53 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -490,6 +490,12 @@ blockquote small { blockquote small:before { content: '\2014 \00A0'; } +blockquote.pull-right { + float: right; +} +blockquote.pull-right p, blockquote.pull-right small { + text-align: right; +} address { display: block; line-height: 18px; diff --git a/bootstrap.min.css b/bootstrap.min.css index 7eb8efe2fa..776cb6e7bb 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -85,6 +85,7 @@ em{font-style:italic;font-weight:inherit;line-height:inherit;} abbr{font-size:90%;text-transform:uppercase;border-bottom:1px dotted #ddd;cursor:help;} blockquote{margin-bottom:18px;border-left:5px solid #eee;padding-left:15px;}blockquote p{font-size:16px;font-weight:300;line-height:22.5px;margin-bottom:0;} blockquote small{display:block;line-height:18px;color:#bfbfbf;}blockquote small:before{content:'\2014 \00A0';} +blockquote.pull-right{float:right;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;} address{display:block;line-height:18px;margin-bottom:18px;} code,pre{padding:0 3px 2px;font-family:Menlo, Monaco, Andale Mono, Courier New, monospace;font-size:12px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} code{background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:1px 3px;} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 52738d808b..185f381e92 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -164,7 +164,6 @@ body > .navbar-fixed .brand:hover { .marketing h2, .marketing h3 { font-weight: 300; - color: #000; } .marketing h2 { margin-bottom: 9px; @@ -175,6 +174,7 @@ body > .navbar-fixed .brand:hover { .marketing .icon { float: left; margin: 7px 10px 0 0; + opacity: .8; } .marketing .small-icon { float: left; @@ -300,7 +300,6 @@ pre.prettyprint { margin-bottom: 0; } - .browser-support { max-width: 100%; } diff --git a/docs/base-css.html b/docs/base-css.html index 47dff40e72..750bbd2b3b 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -92,8 +92,8 @@ Element - Description Usage + Optional @@ -175,24 +175,72 @@

Blockquotes

+ + + + + + + + + + + + + + + + + + + + +
ElementUsageOptional
+ <blockquote> + + Block-level element for quoting content from another source + +

Add cite attribute for source URL

+ Use .pull-left and .pull-right classes for floated options +
+ <small> + + Optional element for adding a user-facing citation, typically an author with title of work + + Place the <cite> around the title or name of source +
-
-

To include a blockquote, wrap <blockquote> around <p> and <small> tags. Use the <small> element to cite your source and you'll get an em dash &mdash; before it.

-
-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis dapibus posuere velit aliquet.

- Someone famous -
+
+

To include a blockquote, wrap <blockquote> around any HTML as the quote. For straight quotes we recommend a <p>.

+

Include an optional <small> element to cite your source and you'll get an em dash &mdash; before it for styling purposes.

-
+ 
 <blockquote>
-  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis dapibus posuere velit aliquet.</p>
-  <small>Dr. Julius Hibbert</small>
+  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis.</p>
+  <small>Someone famous</small>
 </blockquote>
+
+ +

Example blockquotes

+
+
+
+

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

+ Someone famous +
+
+
+
+

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

+ Someone famous +
+
+

Lists

diff --git a/docs/index.html b/docs/index.html index e712f6ed05..7b91315029 100644 --- a/docs/index.html +++ b/docs/index.html @@ -38,41 +38,6 @@
  • Components
  • Javascript plugins
  • Using LESS
    • - -
    @@ -204,40 +169,7 @@
    - - +