rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-29 21:52:22 +01:00
Code Issues Actions Packages Releases Activity

fix type shorthand in blockquote

Browse Source
This commit is contained in:
Mark Otto 2012-01-12 10:19:07 -08:00
parent 620d987f9f
commit 5e3c211334
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bootstrap.css vendored
View File

@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * 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 { html, body {
margin: 0; margin: 0;
@ -459,8 +459,8 @@ blockquote {
} }
blockquote p { blockquote p {
margin-bottom: 0; margin-bottom: 0;
font-size: 300; font-size: 16px;
font-weight: 16px; font-weight: 300;
line-height: 22.5px; line-height: 22.5px;
} }
blockquote small { blockquote small {

2
bootstrap.min.css vendored
View File

@ -81,7 +81,7 @@ strong{font-style:inherit;font-weight:bold;}
em{font-style:italic;font-weight:inherit;line-height:inherit;} em{font-style:italic;font-weight:inherit;line-height:inherit;}
.muted{color:#999999;} .muted{color:#999999;}
abbr{font-size:90%;text-transform:uppercase;border-bottom:1px dotted #ddd;cursor:help;} 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 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;} 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;} address{display:block;margin-bottom:18px;line-height:18px;}

2
lib/type.less
View File

@ -151,7 +151,7 @@ blockquote {
border-left: 5px solid #eee; border-left: 5px solid #eee;
p { p {
margin-bottom: 0; margin-bottom: 0;
#font > .shorthand(300,16px,@baseLineHeight * 1.25); #font > .shorthand(16px,300,@baseLineHeight * 1.25);
} }
small { small {
display: block; display: block;