1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-25 14:30:46 +02:00

Merge pull request #7670 from DarDar/3.0.0-wip

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
9 changed files with 18 additions and 18 deletions

View File

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