aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-07-05 15:15:57 -0700
committerMark Otto <[email protected]>2012-07-05 15:15:57 -0700
commit68146db00454b46493545aff34d06cf2c11e0f6d (patch)
treef2a9ddc882b449755dd1d5f8e10b4cf3aac12200
parent3c07eaa251b73e6c5eff4b56e074c54708a4b4ba (diff)
downloadbootstrap-68146db00454b46493545aff34d06cf2c11e0f6d.tar.xz
bootstrap-68146db00454b46493545aff34d06cf2c11e0f6d.zip
buttons and pre updates for font-size
-rw-r--r--docs/assets/css/bootstrap.css4
-rw-r--r--docs/assets/css/docs.css3
-rw-r--r--less/buttons.less2
-rw-r--r--less/variables.less2
4 files changed, 7 insertions, 4 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 4ec240ba5..329618b05 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -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;
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 6d64028f8..bee42dc36 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -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);
}
diff --git a/less/buttons.less b/less/buttons.less
index c46b7cf3e..b48b0555b 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -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;
diff --git a/less/variables.less b/less/variables.less
index 9a3e0ed4e..bc8ff4bed 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -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;