aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-05-24 20:55:58 -0700
committerMark Otto <[email protected]>2013-05-24 20:55:58 -0700
commitf820de4b325c4a9049c822374701efd2bcb7e26e (patch)
treeb63890606241b1e2b7fb151f632094c37988ce46
parent3160bd872ee02567ae369ad1d940207523cd5a44 (diff)
parent79666385f761bd27a31fc363fa26cdbe5b037017 (diff)
downloadbootstrap-f820de4b325c4a9049c822374701efd2bcb7e26e.tar.xz
bootstrap-f820de4b325c4a9049c822374701efd2bcb7e26e.zip
Merge pull request #7980 from burnsra/3.0.0-wip
Use base padding for input-group-addon class
-rw-r--r--docs/assets/css/bootstrap.css2
-rw-r--r--less/forms.less2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index b65d86480..53dcf2edc 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1579,7 +1579,7 @@ select:focus:invalid:focus {
}
.input-group-addon {
- padding: 6px 8px;
+ padding: 8px 12px;
font-size: 14px;
font-weight: normal;
line-height: 1.428571429;
diff --git a/less/forms.less b/less/forms.less
index c61fd50fa..10a315da6 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -359,7 +359,7 @@ select:focus:invalid {
// -------------------------
.input-group-addon {
.box-sizing(border-box);
- padding: 6px 8px;
+ padding: @padding-base-vertical @padding-base-horizontal;
font-size: @font-size-base;
font-weight: normal;
line-height: @line-height-base;