kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

Merge pull request #7670 from DarDar/3.0.0-wip

Browse source 
Use @font-size-... variables instead of hardcoded font-size in px
This commit is contained in:
Mark Otto 2013-05-03 15:05:29 -07:00
commit 747e108e0b
9 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
docs/assets/css/bootstrap.css vendored
View file

@ -3196,9 +3196,9 @@ a.list-group-item.active .list-group-item-text {
.close { .close {
float: right; float: right;
font-size: 20px; font-size: 21px;
font-weight: bold; font-weight: bold;
line-height: 20px; line-height: 1;
color: #000; color: #000;
text-shadow: 0 1px 0 #ffffff; text-shadow: 0 1px 0 #ffffff;
opacity: 0.2; opacity: 0.2;
@ -3386,7 +3386,7 @@ button.close {
.nav-header { .nav-header {
display: block; display: block;
padding: 3px 15px; padding: 3px 15px;
font-size: 11px; font-size: 10.5px;
font-weight: bold; font-weight: bold;
line-height: 20px; line-height: 20px;
color: #999999; color: #999999;
@ -3580,7 +3580,7 @@ button.close {
padding: 15px; padding: 15px;
margin-right: auto; margin-right: auto;
margin-left: auto; margin-left: auto;
font-size: 18px; font-size: 17.5px;
font-weight: 500; font-weight: 500;
line-height: 20px; line-height: 20px;
color: #777777; color: #777777;
@ -4312,7 +4312,7 @@ button.close {
position: absolute; position: absolute;
z-index: 1030; z-index: 1030;
display: block; display: block;
font-size: 11px; font-size: 10.5px;
line-height: 1.4; line-height: 1.4;
opacity: 0; opacity: 0;
filter: alpha(opacity=0); filter: alpha(opacity=0);
@ -4759,7 +4759,7 @@ a.thumbnail:focus {
display: inline-block; display: inline-block;
min-width: 10px; min-width: 10px;
padding: 3px 7px; padding: 3px 7px;
font-size: 12px; font-size: 11.9px;
font-weight: bold; font-weight: bold;
line-height: 1; line-height: 1;
color: #fff; color: #fff;
@ -4859,7 +4859,7 @@ a.list-group-item.active > .badge,
float: left; float: left;
width: 0; width: 0;
height: 100%; height: 100%;
font-size: 12px; font-size: 11.9px;
color: #fff; color: #fff;
text-align: center; text-align: center;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
@ -5173,7 +5173,7 @@ a.list-group-item.active > .badge,
border-radius: 6px; border-radius: 6px;
} }
.jumbotron h1 { .jumbotron h1 {
font-size: 60px; font-size: 63px;
} }
} }

2
less/badges.less
View file

@ -8,7 +8,7 @@
display: inline-block; display: inline-block;
min-width: 10px; min-width: 10px;
padding: 3px 7px; padding: 3px 7px;
font-size: 12px; font-size: @font-size-small;
font-weight: bold; font-weight: bold;
color: #fff; color: #fff;
line-height: 1; line-height: 1;

4
less/close.less
View file

@ -5,9 +5,9 @@
.close { .close {
float: right; float: right;
font-size: 20px; font-size: (@font-size-base * 1.5);
font-weight: bold; font-weight: bold;
line-height: @line-height-base; line-height: 1;
color: #000; color: #000;
text-shadow: 0 1px 0 rgba(255,255,255,1); text-shadow: 0 1px 0 rgba(255,255,255,1);
.opacity(.2); .opacity(.2);

4
less/jumbotron.less
View file

@ -6,7 +6,7 @@
.jumbotron { .jumbotron {
padding: 30px; padding: 30px;
margin-bottom: 30px; margin-bottom: 30px;
font-size: 21px; font-size: (@font-size-base * 1.5);
font-weight: 200; font-weight: 200;
line-height: (@line-height-base * 1.5); line-height: (@line-height-base * 1.5);
color: @jumbotron-lead-color; color: @jumbotron-lead-color;
@ -26,7 +26,7 @@
border-radius: @border-radius-large; // Only round corners at higher resolutions border-radius: @border-radius-large; // Only round corners at higher resolutions
h1 { h1 {
font-size: 60px; font-size: (@font-size-base * 4.5);
} }
} }
} }

2
less/navbar.less
View file

@ -83,7 +83,7 @@
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
padding: 15px; padding: 15px;
font-size: 18px; font-size: @font-size-large;
font-weight: 500; font-weight: 500;
line-height: @line-height-base; line-height: @line-height-base;
color: @navbar-brand-color; color: @navbar-brand-color;

2
less/navs.less
View file

@ -183,7 +183,7 @@
.nav-header { .nav-header {
display: block; display: block;
padding: 3px 15px; padding: 3px 15px;
font-size: 11px; font-size: @font-size-mini;
font-weight: bold; font-weight: bold;
line-height: @line-height-base; line-height: @line-height-base;
color: @gray-light; color: @gray-light;

2
less/popovers.less
View file

@ -34,7 +34,7 @@
.popover-title { .popover-title {
margin: 0; // reset heading margin margin: 0; // reset heading margin
padding: 8px 14px; padding: 8px 14px;
font-size: 14px; font-size: @font-size-base;
font-weight: normal; font-weight: normal;
line-height: 18px; line-height: 18px;
background-color: @popover-title-bg; background-color: @popover-title-bg;

2
less/progress-bars.less
View file

@ -56,7 +56,7 @@
float: left; float: left;
width: 0%; width: 0%;
height: 100%; height: 100%;
font-size: 12px; font-size: @font-size-small;
color: #fff; color: #fff;
text-align: center; text-align: center;
text-shadow: 0 -1px 0 rgba(0,0,0,.25); text-shadow: 0 -1px 0 rgba(0,0,0,.25);

2
less/tooltip.less
View file

@ -9,7 +9,7 @@
z-index: @zindex-tooltip; z-index: @zindex-tooltip;
display: block; display: block;
visibility: visible; visibility: visible;
font-size: 11px; font-size: @font-size-mini;
line-height: 1.4; line-height: 1.4;
.opacity(0); .opacity(0);