From 5e3c21133430112bf8361827dc7a6a29f3f56c72 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Thu, 12 Jan 2012 10:19:07 -0800
Subject: [PATCH] fix type shorthand in blockquote

---
 bootstrap.css     | 6 +++---
 bootstrap.min.css | 2 +-
 lib/type.less     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bootstrap.css b/bootstrap.css
index 1250507b5e..59cec1cd6b 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: Wed Jan 11 21:59:22 PST 2012
+ * Date: Thu Jan 12 10:18:57 PST 2012
  */
 html, body {
   margin: 0;
@@ -459,8 +459,8 @@ blockquote {
 }
 blockquote p {
   margin-bottom: 0;
-  font-size: 300;
-  font-weight: 16px;
+  font-size: 16px;
+  font-weight: 300;
   line-height: 22.5px;
 }
 blockquote small {
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 3e220de3ca..2cbb4427e5 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -81,7 +81,7 @@ strong{font-style:inherit;font-weight:bold;}
 em{font-style:italic;font-weight:inherit;line-height:inherit;}
 .muted{color:#999999;}
 abbr{font-size:90%;text-transform:uppercase;border-bottom:1px dotted #ddd;cursor:help;}
-blockquote{padding-left:15px;margin-bottom:18px;border-left:5px solid #eee;}blockquote p{margin-bottom:0;font-size:300;font-weight:16px;line-height:22.5px;}
+blockquote{padding-left:15px;margin-bottom:18px;border-left:5px solid #eee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;}
 blockquote small{display:block;line-height:18px;color:#999999;}blockquote small:before{content:'\2014 \00A0';}
 blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #eee;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;}
 address{display:block;margin-bottom:18px;line-height:18px;}
diff --git a/lib/type.less b/lib/type.less
index 84130f3fa1..73462b38a4 100644
--- a/lib/type.less
+++ b/lib/type.less
@@ -151,7 +151,7 @@ blockquote {
   border-left: 5px solid #eee;
   p {
     margin-bottom: 0;
-    #font > .shorthand(300,16px,@baseLineHeight * 1.25);
+    #font > .shorthand(16px,300,@baseLineHeight * 1.25);
   }
   small {
     display: block;