allow alternate form layouts to hide inputs with .hide on them

Conflicts: docs/assets/bootstrap.zip docs/assets/css/bootstrap.css
mislav · Feb 11, 2012 · 1d9f1f3 · 1d9f1f3
1 parent a500b3c
commit 1d9f1f3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/docs/base-css.html b/docs/base-css.html
@@ -886,7 +886,7 @@ <h3>Inline form</h3>
       <p>Inputs are block level to start. For <code>.form-inline</code> and <code>.form-horizontal</code>, we use inline-block.</p>
     </div>
     <div class="span9">
-      <form class="well form-search">
+      <form class="well form-inline">
         <input type="text" class="input-small" placeholder="Email">
         <input type="password" class="input-small" placeholder="Password">
         <button type="submit" class="btn">Go</button>

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
@@ -810,7 +810,7 @@
       <p>{{_i}}Inputs are block level to start. For <code>.form-inline</code> and <code>.form-horizontal</code>, we use inline-block.{{/i}}</p>
     </div>
     <div class="span9">
-      <form class="well form-search">
+      <form class="well form-inline">
         <input type="text" class="input-small" placeholder="{{_i}}Email{{/i}}">
         <input type="password" class="input-small" placeholder="{{_i}}Password{{/i}}">
         <button type="submit" class="btn">{{_i}}Go{{/i}}</button>

diff --git a/lib/_forms.scss b/lib/_forms.scss
@@ -461,6 +461,10 @@ select:focus:required:invalid {
     display: inline-block;
     margin-bottom: 0;
   }
+  // Re-hide hidden elements due to specifity
+  .hide {
+    display: none;
+  }
 }
 .form-search label,
 .form-inline label,