remove bug in docs for example icon in an input-prepend by removing margin on any...

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 4a90bab808f0b12da9d39ec01439132d0926b59a..82d184fdcbc91113895f297e108e8f73c72e165b 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 7e39e62a17d5c9c080a5c2ced1ad35ffe1b0d0f1..825c764f3c799d2d810e3cb7d58ca151b62e76fd 100644 (file)
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -992,6 +992,7 @@ select:focus:required:invalid:focus {
 .input-append select,
 .input-prepend .uneditable-input,
 .input-append .uneditable-input {
+  margin-bottom: 0;
   *margin-left: 0;
   -webkit-border-radius: 0 3px 3px 0;
   -moz-border-radius: 0 3px 3px 0;

diff --git a/docs/base-css.html b/docs/base-css.html
index d44b658913bb3874d068ddbcb8b4d769a2378c47..76b13b7836b22731a935f46780d4a1e1312ad72b 100644 (file)
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1639,8 +1639,7 @@ For example, <code>section</code> should be wrapped as inline.
           <label class="control-label" for="inputIcon">Email address</label>
           <div class="controls">
             <div class="input-prepend">
-              <span class="add-on"><i class="icon-envelope"></i></span>
-              <input class="span2" id="inputIcon" type="text">
+              <span class="add-on"><i class="icon-envelope"></i></span><input class="span2" id="inputIcon" type="text">
             </div>
           </div>
         </div>

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 9b2964d7406a1fbff9aff1e734552019e34f6d80..b463462bc22cda81aa72280a1843b0c6ed621a88 100644 (file)
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1563,8 +1563,7 @@
           <label class="control-label" for="inputIcon">{{_i}}Email address{{/i}}</label>
           <div class="controls">
             <div class="input-prepend">
-              <span class="add-on"><i class="icon-envelope"></i></span>
-              <input class="span2" id="inputIcon" type="text">
+              <span class="add-on"><i class="icon-envelope"></i></span><input class="span2" id="inputIcon" type="text">
             </div>
           </div>
         </div>

diff --git a/less/forms.less b/less/forms.less
index 8d9c253083e5dc03782ceac90659bee5136cc88a..a53b273b906296f9cc0a1604192961df21c152d5 100644 (file)
--- a/less/forms.less
+++ b/less/forms.less
@@ -365,6 +365,7 @@ select:focus:required:invalid {
   input,
   select,
   .uneditable-input {
+    margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
     *margin-left: 0;
     .border-radius(0 3px 3px 0);
     &:focus {