diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 9803e2a6a2..838d5a611a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1269,6 +1269,7 @@ textarea::-webkit-input-placeholder { .input-prepend, .input-append { margin-bottom: 5px; + font-size: 0; } .input-prepend input, @@ -1280,6 +1281,7 @@ textarea::-webkit-input-placeholder { position: relative; margin-bottom: 0; *margin-left: 0; + font-size: 13px; vertical-align: middle; -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; @@ -1307,6 +1309,7 @@ textarea::-webkit-input-placeholder { height: 18px; min-width: 16px; padding: 4px 5px; + font-size: 13px; font-weight: normal; line-height: 18px; text-align: center; diff --git a/docs/base-css.html b/docs/base-css.html index 8f0c092d81..4b9e6d1ede 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -965,11 +965,13 @@ For example, <code>section</code> should be wrapped as inline.
Wrap a .add-on
and an input
with one of two classes to prepend or append text to an input.
@@ -985,7 +987,9 @@ For example, <code>section</code> should be wrapped as inline.Use both classes and two instances of
.add-on
to prepend and append an input.
@@ -998,11 +1002,14 @@ For example, <code>section</code> should be wrapped as inline.Instead of a
<span>
with text, use a.btn
to attach a button (or two) to an input.
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 5ad952c850..9a122711a2 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -896,11 +896,13 @@{{_i}}Wrap a
.add-on
and aninput
with one of two classes to prepend or append text to an input.{{/i}}
@@ -916,7 +918,9 @@{{_i}}Use both classes and two instances of
.add-on
to prepend and append an input.{{/i}}
@@ -929,11 +933,14 @@{{_i}}Instead of a
<span>
with text, use a.btn
to attach a button (or two) to an input.{{/i}}
diff --git a/less/forms.less b/less/forms.less index 633ad45517..9f5e721bbe 100644 --- a/less/forms.less +++ b/less/forms.less @@ -380,12 +380,14 @@ textarea { .input-prepend, .input-append { margin-bottom: 5px; + font-size: 0; input, select, .uneditable-input { position: relative; // placed here by default so that on :focus we can place the input above the .add-on for full border and box-shadow goodness margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms *margin-left: 0; + font-size: @baseFontSize; vertical-align: middle; .border-radius(0 @inputBorderRadius @inputBorderRadius 0); // Make input on top when focused so blue border and shadow always show @@ -402,6 +404,7 @@ textarea { height: @baseLineHeight; min-width: 16px; padding: 4px 5px; + font-size: @baseFontSize; font-weight: normal; line-height: @baseLineHeight; text-align: center;