clones/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-09-25 04:27:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

restore px unit on @font-size-base

Browse Source
This commit is contained in:
Mark Otto 2013-03-31 12:00:04 -07:00
parent a2145df7c4
commit 674768b177
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -342,7 +342,7 @@ p {
.lead {
margin-bottom: 20px;
font-size: 21;
font-size: 21px;
font-weight: 200;
line-height: 1.4;
}
@ -467,58 +467,58 @@ h6 {
h1,
.h1 {
font-size: 38.5;
font-size: 38.5px;
font-size: 4rem;
}
h2,
.h2 {
font-size: 31.5;
font-size: 31.5px;
font-size: 3rem;
}
h3,
.h3 {
font-size: 24.5;
font-size: 24.5px;
font-size: 2.5rem;
}
h4,
.h4 {
font-size: 17.5;
font-size: 17.5px;
font-size: 2rem;
}
h5,
.h5 {
font-size: 14;
font-size: 14px;
font-size: 1.6rem;
}
h6,
.h6 {
font-size: 11.9;
font-size: 11.9px;
font-size: 1.2rem;
}
h1 small,
.h1 small {
font-size: 24.5;
font-size: 24.5px;
}
h2 small,
.h2 small {
font-size: 17.5;
font-size: 17.5px;
}
h3 small,
.h3 small {
font-size: 14;
font-size: 14px;
}
h4 small,
.h4 small {
font-size: 14;
font-size: 14px;
}
.page-header {
@ -638,7 +638,7 @@ blockquote {
blockquote p {
margin-bottom: 0;
font-size: 17.5;
font-size: 17.5px;
font-weight: 300;
line-height: 1.25;
}
@ -692,7 +692,7 @@ code,
pre {
padding: 0 3px 2px;
font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
font-size: 12;
font-size: 12px;
color: #333333;
border-radius: 4px;
}
@ -709,7 +709,7 @@ pre {
display: block;
padding: 9.5px;
margin: 0 0 10px;
font-size: 13;
font-size: 13px;
line-height: 20px;
word-break: break-all;
word-wrap: break-word;
@ -1167,7 +1167,7 @@ legend {
width: 100%;
padding: 0;
margin-bottom: 20px;
font-size: 21;
font-size: 21px;
line-height: 40px;
color: #333333;
border: 0;
@ -1199,7 +1199,7 @@ input[type="color"] {
display: inline-block;
min-height: 34px;
padding: 6px 9px;
font-size: 14;
font-size: 14px;
line-height: 20px;
color: #555555;
vertical-align: middle;
@ -1375,7 +1375,7 @@ input[type="search"].input-large,
input[type="tel"].input-large,
input[type="color"].input-large {
padding: 11px 14px;
font-size: 17.5;
font-size: 17.5px;
border-radius: 6px;
}
@ -1397,7 +1397,7 @@ input[type="tel"].input-small,
input[type="color"].input-small {
min-height: 26px;
padding: 2px 10px;
font-size: 11.9;
font-size: 11.9px;
border-radius: 3px;
}
@ -1594,7 +1594,7 @@ select:focus:invalid:focus {
.input-group-addon {
padding: 6px 8px;
font-size: 14;
font-size: 14px;
font-weight: normal;
line-height: 20px;
text-align: center;
@ -1608,12 +1608,12 @@ select:focus:invalid:focus {
.input-group-addon.input-small {
padding: 2px 10px;
font-size: 11.9;
font-size: 11.9px;
}
.input-group-addon.input-large {
padding: 11px 14px;
font-size: 17.5;
font-size: 17.5px;
}
.input-group input:first-child,
@ -1760,7 +1760,7 @@ select:focus:invalid:focus {
display: inline-block;
padding: 6px 12px;
margin-bottom: 0;
font-size: 14;
font-size: 14px;
font-weight: 500;
line-height: 20px;
text-align: center;
@ -1804,19 +1804,19 @@ fieldset[disabled] .btn {
.btn-large {
padding: 11px 14px;
font-size: 17.5;
font-size: 17.5px;
border-radius: 6px;
}
.btn-small {
padding: 2px 10px;
font-size: 11.9;
font-size: 11.9px;
border-radius: 3px;
}
.btn-mini {
padding: 0 6px;
font-size: 10.5;
font-size: 10.5px;
border-radius: 3px;
}
@ -3032,7 +3032,7 @@ a.list-group-item.active .list-group-item-text {
.panel-heading {
padding: 10px 15px;
margin: -15px -15px 15px;
font-size: 17.5;
font-size: 17.5px;
font-weight: 500;
background-color: #f5f5f5;
border-bottom: 1px solid #dddddd;
@ -4049,7 +4049,7 @@ button.close {
.pagination-large > li > a,
.pagination-large > li > span {
padding: 11px 14px;
font-size: 17.5;
font-size: 17.5px;
}
.pagination-large > li:first-child > a,
@ -4083,13 +4083,13 @@ button.close {
.pagination-small > li > a,
.pagination-small > li > span {
padding: 2px 10px;
font-size: 11.9;
font-size: 11.9px;
}
.pagination-mini > li > a,
.pagination-mini > li > span {
padding: 0 6px;
font-size: 10.5;
font-size: 10.5px;
}
.pager {

2
less/variables.less
View File

@ -45,7 +45,7 @@
@font-family-monospace: Monaco, Menlo, Consolas, "Courier New", monospace;
@font-family-base: @font-family-sans-serif;
@font-size-base: 14;
@font-size-base: 14px;
@font-size-large: (@font-size-base * 1.25); // ~18px
@font-size-small: (@font-size-base * 0.85); // ~12px
@font-size-mini: (@font-size-base * 0.75); // ~11px