rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00
Code Issues Actions Packages Releases Activity

buttons and pre updates for font-size

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

3
docs/assets/css/docs.css
View File

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

2
less/buttons.less
View File

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

2
less/variables.less
View File

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