aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-25 11:35:08 -0800
committerMark Otto <[email protected]>2012-01-25 11:35:08 -0800
commit58d08a2db3e2ed1b789a5290ced2f0327c9c163b (patch)
treef4d14cbb196b768679763ae650e2109bca3b9bae
parenta4b8cc2a9c8c7f16c4a93e64d2a187d839bfbb40 (diff)
downloadbootstrap-58d08a2db3e2ed1b789a5290ced2f0327c9c163b.tar.xz
bootstrap-58d08a2db3e2ed1b789a5290ced2f0327c9c163b.zip
enable support for form states on select elements
-rw-r--r--bootstrap.css14
-rw-r--r--bootstrap.min.css6
-rw-r--r--docs/base-css.html13
-rw-r--r--docs/templates/pages/base-css.mustache13
-rw-r--r--lib/forms.less1
5 files changed, 37 insertions, 10 deletions
diff --git a/bootstrap.css b/bootstrap.css
index 730167f51..4bffde24d 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Wed Jan 25 11:27:15 PST 2012
+ * Date: Wed Jan 25 11:31:57 PST 2012
*/
article,
aside,
@@ -715,11 +715,11 @@ textarea[readonly] {
.control-group.warning > label, .control-group.warning .help-block, .control-group.warning .help-inline {
color: #c09853;
}
-.control-group.warning input, .control-group.warning textarea {
+.control-group.warning input, .control-group.warning select, .control-group.warning textarea {
color: #c09853;
border-color: #c09853;
}
-.control-group.warning input:focus, .control-group.warning textarea:focus {
+.control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus {
border-color: #a47e3c;
-webkit-box-shadow: 0 0 6px #dbc59e;
-moz-box-shadow: 0 0 6px #dbc59e;
@@ -733,11 +733,11 @@ textarea[readonly] {
.control-group.error > label, .control-group.error .help-block, .control-group.error .help-inline {
color: #b94a48;
}
-.control-group.error input, .control-group.error textarea {
+.control-group.error input, .control-group.error select, .control-group.error textarea {
color: #b94a48;
border-color: #b94a48;
}
-.control-group.error input:focus, .control-group.error textarea:focus {
+.control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus {
border-color: #953b39;
-webkit-box-shadow: 0 0 6px #d59392;
-moz-box-shadow: 0 0 6px #d59392;
@@ -751,11 +751,11 @@ textarea[readonly] {
.control-group.success > label, .control-group.success .help-block, .control-group.success .help-inline {
color: #468847;
}
-.control-group.success input, .control-group.success textarea {
+.control-group.success input, .control-group.success select, .control-group.success textarea {
color: #468847;
border-color: #468847;
}
-.control-group.success input:focus, .control-group.success textarea:focus {
+.control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus {
border-color: #356635;
-webkit-box-shadow: 0 0 6px #7aba7b;
-moz-box-shadow: 0 0 6px #7aba7b;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 20614ea73..c800de5e0 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -145,13 +145,13 @@ select.span11{width:870px;}
select.span12{width:950px;}
input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;}
.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853;}
-.control-group.warning input,.control-group.warning textarea{color:#c09853;border-color:#c09853;}.control-group.warning input:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;-moz-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e;}
+.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853;border-color:#c09853;}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;-moz-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e;}
.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853;}
.control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48;}
-.control-group.error input,.control-group.error textarea{color:#b94a48;border-color:#b94a48;}.control-group.error input:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;-moz-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392;}
+.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;border-color:#b94a48;}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;-moz-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392;}
.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48;}
.control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847;}
-.control-group.success input,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success input:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b;}
+.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b;}
.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847;}
input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;}
.form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #ddd;}
diff --git a/docs/base-css.html b/docs/base-css.html
index a8a87da42..1e9a3d942 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1066,6 +1066,19 @@
<span class="help-inline">Woohoo!</span>
</div>
</fieldset>
+ <fieldset class="control-group success">
+ <label class="control-label" for="selectError">Select with success</label>
+ <div class="controls">
+ <select name="selectError">
+ <option>1</option>
+ <option>2</option>
+ <option>3</option>
+ <option>4</option>
+ <option>5</option>
+ </select>
+ <span class="help-inline">Woohoo!</span>
+ </div>
+ </fieldset>
<fieldset class="form-actions">
<button type="submit" class="btn primary">Save changes</button>
<button type="reset" class="btn">Cancel</button>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 4daa98309..913eea31a 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1002,6 +1002,19 @@
<span class="help-inline">{{_i}}Woohoo!{{/i}}</span>
</div>
</fieldset>
+ <fieldset class="control-group success">
+ <label class="control-label" for="selectError">{{_i}}Select with success{{/i}}</label>
+ <div class="controls">
+ <select name="selectError">
+ <option>1</option>
+ <option>2</option>
+ <option>3</option>
+ <option>4</option>
+ <option>5</option>
+ </select>
+ <span class="help-inline">{{_i}}Woohoo!{{/i}}</span>
+ </div>
+ </fieldset>
<fieldset class="form-actions">
<button type="submit" class="btn primary">{{_i}}Save changes{{/i}}</button>
<button type="reset" class="btn">{{_i}}Cancel{{/i}}</button>
diff --git a/lib/forms.less b/lib/forms.less
index 70a065bdb..3b35a172c 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -283,6 +283,7 @@ textarea[readonly] {
}
// Style inputs accordingly
input,
+ select,
textarea {
color: @textColor;
border-color: @borderColor;