kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

Remove the handful of rem font-sizes

This commit is contained in:
Mark Otto 2013-03-31 11:26:13 -07:00
parent b96ab36d38
commit fc16e37aaa
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/assets/css/bootstrap.css vendored
View File

@ -290,7 +290,6 @@ html {
body { body {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px; font-size: 14px;
font-size: 1.4rem;
line-height: 20px; line-height: 20px;
color: #333333; color: #333333;
background-color: #ffffff; background-color: #ffffff;
@ -343,10 +342,9 @@ p {
.lead { .lead {
margin-bottom: 20px; margin-bottom: 20px;
font-size: 21px; font-size: 21;
font-size: 2.1rem;
font-weight: 200; font-weight: 200;
line-height: 1.3; line-height: 1.4;
} }
small { small {
@ -3034,8 +3032,7 @@ a.list-group-item.active .list-group-item-text {
.panel-heading { .panel-heading {
padding: 10px 15px; padding: 10px 15px;
margin: -15px -15px 15px; margin: -15px -15px 15px;
font-size: 16px; font-size: 17.5;
font-size: 1.6rem;
font-weight: 500; font-weight: 500;
background-color: #f5f5f5; background-color: #f5f5f5;
border-bottom: 1px solid #dddddd; border-bottom: 1px solid #dddddd;

2
less/panels.less
View File

@ -17,7 +17,7 @@
.panel-heading { .panel-heading {
margin: -15px -15px 15px; margin: -15px -15px 15px;
padding: 10px 15px; padding: 10px 15px;
.font-size(16); font-size: @font-size-base * 1.25;
font-weight: 500; font-weight: 500;
background-color: @panel-heading-bg; background-color: @panel-heading-bg;
border-bottom: 1px solid @panel-border; border-bottom: 1px solid @panel-border;

2
less/scaffolding.less
View File

@ -31,7 +31,7 @@ html {
body { body {
font-family: @font-family-base; font-family: @font-family-base;
.font-size(); font-size: 14px;
line-height: @line-height-base; line-height: @line-height-base;
color: @text-color; color: @text-color;
background-color: @body-background; background-color: @body-background;

4
less/type.less
View File

@ -11,9 +11,9 @@ p {
} }
.lead { .lead {
margin-bottom: @line-height-base; margin-bottom: @line-height-base;
.font-size((@font-size-base * 1.5)); font-size: (@font-size-base * 1.5);
font-weight: 200; font-weight: 200;
line-height: 1.3; line-height: 1.4;
} }