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

buttons and pre updates for font-size

This commit is contained in:
Mark Otto 2012-07-05 15:15:57 -07:00
parent 3c07eaa251
commit 68146db004
4 changed files with 7 additions and 4 deletions

View file

@ -786,7 +786,7 @@ cite {
code,
pre {
padding: 0 3px 2px;
font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
font-size: 13px;
color: #333333;
-webkit-border-radius: 3px;
@ -2726,7 +2726,7 @@ button.close {
.btn {
display: inline-block;
*display: inline;
padding: 4px 10px 4px;
padding: 4px 14px 4px;
margin-bottom: 0;
*margin-left: .3em;
font-size: 14px;

View file

@ -428,6 +428,9 @@ h2 + .row {
margin-left: 0;
list-style: none;
}
.the-icons li {
line-height: 25px;
}
.the-icons i:hover {
background-color: rgba(255,0,0,.25);
}

View file

@ -10,7 +10,7 @@
.btn {
display: inline-block;
.ie7-inline-block();
padding: 4px 10px 4px;
padding: 4px 14px 4px;
margin-bottom: 0; // For input.btn
font-size: @baseFontSize;
line-height: @baseLineHeight;

View file

@ -46,7 +46,7 @@
// -------------------------
@sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif;
@serifFontFamily: Georgia, "Times New Roman", Times, serif;
@monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace;
@monoFontFamily: Monaco, Menlo, Consolas, "Courier New", monospace;
@baseFontSize: 14px;
@baseFontFamily: @sansFontFamily;