diff --git a/bootstrap.css b/bootstrap.css index c055a79c9..0baa88d11 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: Sat Oct 22 22:49:01 PDT 2011 + * Date: Wed Oct 26 21:03:54 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). @@ -479,15 +479,13 @@ blockquote { padding-left: 15px; } blockquote p { - font-size: 14px; + font-size: 16px; font-weight: 300; - line-height: 18px; + line-height: 22.5px; margin-bottom: 0; } blockquote small { display: block; - font-size: 12px; - font-weight: 300; line-height: 18px; color: #bfbfbf; } diff --git a/bootstrap.min.css b/bootstrap.min.css index 0aa889207..b443f02e3 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -84,8 +84,8 @@ strong{font-style:inherit;font-weight:bold;} em{font-style:italic;font-weight:inherit;line-height:inherit;} .muted{color:#bfbfbf;} 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:14px;font-weight:300;line-height:18px;margin-bottom:0;} -blockquote small{display:block;font-size:12px;font-weight:300;line-height:18px;color:#bfbfbf;}blockquote small:before{content:'\2014 \00A0';} +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';} 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 0a31ac998..59c64e4a7 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -328,10 +328,18 @@ h2 + table { display: block; line-height: 20px; } + /* More space between sections */ + h2 { + margin-top: 27px; + } + h3 { + margin-top: 18px; + } /* Adjust the jumbotron */ .jumbotron h1, .jumbotron p { + text-align: center; margin-right: 0; } .jumbotron h1 { @@ -349,8 +357,15 @@ h2 + table { margin: 36px 0; } .jumbotron .btn { + display: block; font-size: 18px; padding: 10px 14px; + margin: 0 auto 10px; + } + + /* Don't space out quick links so much */ + .quick-links { + margin: 40px 0 0; } /* Popovers */ @@ -361,6 +376,15 @@ h2 + table { margin-left: 0; } + /* Space out the show-grid examples */ + .show-grid [class*="span"] { + margin-bottom: 5px; + } + + /* Unfloat the back to top link in footer */ + .footer .pull-right { + float: none; + } } diff --git a/docs/index.html b/docs/index.html index 2cb5eb8e4..cf3b8b805 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1715,38 +1715,29 @@
diff --git a/lib/type.less b/lib/type.less
index d092b203d..7f8044cd8 100644
--- a/lib/type.less
+++ b/lib/type.less
@@ -149,12 +149,12 @@ blockquote {
border-left: 5px solid #eee;
padding-left: 15px;
p {
- #font > .shorthand(300,14px,@baseLineHeight);
+ #font > .shorthand(300,16px,@baseLineHeight * 1.25);
margin-bottom: 0;
}
small {
display: block;
- #font > .shorthand(300,12px,@baseLineHeight);
+ line-height: @baseLineHeight;
color: @grayLight;
&:before {
content: '\2014 \00A0';