From 5b947b8a2f801d33af2fe8d78f9655ce1ebd5e7c Mon Sep 17 00:00:00 2001
From: Mark Otto
Date: Fri, 17 Aug 2012 16:11:52 -0700
Subject: [PATCH] fix up padding on small buttons, add button examples
---
docs/assets/css/bootstrap.css | 7 ++++---
docs/base-css.html | 10 +++++++++-
docs/templates/pages/base-css.mustache | 8 ++++++++
less/buttons.less | 2 +-
4 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index c726bf0a3f..71209d601f 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2037,6 +2037,7 @@ table .span24 {
display: inline-block;
width: 14px;
height: 14px;
+ margin-top: 1px;
*margin-right: .3em;
line-height: 14px;
vertical-align: text-top;
@@ -3016,17 +3017,17 @@ button.close {
}
.btn-large [class^="icon-"] {
- margin-top: 1px;
+ margin-top: 2px;
}
.btn-small {
- padding: 5px 9px;
+ padding: 3px 9px;
font-size: 12px;
line-height: 18px;
}
.btn-small [class^="icon-"] {
- margin-top: -1px;
+ margin-top: 0;
}
.btn-mini {
diff --git a/docs/base-css.html b/docs/base-css.html
index fb6616fb71..3ea3bdce36 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -967,7 +967,7 @@ For example, <code>section</code> should be wrapped as inline.
Textarea
- Form control which supports multiple lines of text. Change rows
attribute as necessary.
+ Form control which supports multiple lines of text. Change row
attribute as necessary.
@@ -1445,6 +1445,10 @@ For example, <code>section</code> should be wrapped as inline.
+
+
+
+
@@ -1457,6 +1461,7 @@ For example, <code>section</code> should be wrapped as inline.
<button class="btn btn-large" type="button">Large button</button>
<button class="btn btn-small" type="button">Small button</button>
+<button class="btn" type="button">Default button</button>
<button class="btn btn-mini" type="button">Mini button</button>
Create block level buttons—those that span the full width of a parent— by adding .btn-block
.
@@ -1740,6 +1745,7 @@ For example, <code>section</code> should be wrapped as inline.
+
User
@@ -1751,6 +1757,8 @@ For example, <code>section</code> should be wrapped as inline.
Make admin
+
+
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 36f0d1ea51..4cc21e9755 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1382,6 +1382,10 @@
+
+
+
+
@@ -1394,6 +1398,7 @@
<button class="btn btn-large" type="button">{{_i}}Large button{{/i}}</button>
<button class="btn btn-small" type="button">{{_i}}Small button{{/i}}</button>
+<button class="btn" type="button">{{_i}}Default button{{/i}}</button>
<button class="btn btn-mini" type="button">{{_i}}Mini button{{/i}}</button>
{{_i}}Create block level buttons—those that span the full width of a parent— by adding .btn-block
.{{/i}}
@@ -1677,6 +1682,7 @@
+
+
+
{{! /bs-docs-example }}
diff --git a/less/buttons.less b/less/buttons.less
index 872b5aec1f..204b1269e1 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -84,7 +84,7 @@
// Small
.btn-small {
- padding: 5px 9px;
+ padding: 3px 9px;
font-size: @baseFontSize - 2px;
line-height: @baseLineHeight - 2px;
}