Commit d4aa8c6e authored by Thomas Park's avatar Thomas Park
Browse files

fix border on input-group-addon states

parent fbd23d02
......@@ -5836,6 +5836,9 @@ legend {
font-family: 'Lobster', cursive;
color: #fff;
}
.input-group-addon {
color: #444444;
}
.has-warning .help-block,
.has-warning .control-label,
.has-warning .form-control-feedback {
......@@ -5845,6 +5848,9 @@ legend {
.has-warning .form-control:focus {
border-color: #ecd77f;
}
.has-warning .input-group-addon {
border: none;
}
.has-error .help-block,
.has-error .control-label,
.has-error .form-control-feedback {
......@@ -5854,6 +5860,9 @@ legend {
.has-error .form-control:focus {
border-color: #f0a6ac;
}
.has-error .input-group-addon {
border: none;
}
.has-success .help-block,
.has-success .control-label,
.has-success .form-control-feedback {
......@@ -5863,8 +5872,8 @@ legend {
.has-success .form-control:focus {
border-color: #93e08b;
}
.input-group-addon {
color: #444444;
.has-success .input-group-addon {
border: none;
}
.pagination a:hover {
color: #fff;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -98,6 +98,10 @@ legend {
color: #fff;
}
.input-group-addon {
color: @btn-default-color;
}
.has-warning {
.help-block,
.control-label,
......@@ -109,6 +113,10 @@ legend {
.form-control:focus {
border-color: lighten(@brand-warning, 20%);
}
.input-group-addon {
border: none;
}
}
.has-error {
......@@ -122,6 +130,10 @@ legend {
.form-control:focus {
border-color: lighten(@brand-primary, 40%);
}
.input-group-addon {
border: none;
}
}
.has-success {
......@@ -135,10 +147,10 @@ legend {
.form-control:focus {
border-color: lighten(@brand-success, 20%);
}
}
.input-group-addon {
color: @btn-default-color;
.input-group-addon {
border: none;
}
}
// Navs =======================================================================
......
......@@ -5838,7 +5838,8 @@ table .info a,
color: #ff7518;
}
.has-warning .form-control,
.has-warning .form-control:focus {
.has-warning .form-control:focus,
.has-warning .input-group-addon {
border: 1px solid #ff7518;
}
.has-error .help-block,
......@@ -5847,7 +5848,8 @@ table .info a,
color: #ff0039;
}
.has-error .form-control,
.has-error .form-control:focus {
.has-error .form-control:focus,
.has-error .input-group-addon {
border: 1px solid #ff0039;
}
.has-success .help-block,
......@@ -5856,7 +5858,8 @@ table .info a,
color: #3fb618;
}
.has-success .form-control,
.has-success .form-control:focus {
.has-success .form-control:focus,
.has-success .input-group-addon {
border: 1px solid #3fb618;
}
.nav-pills > li > a {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -82,7 +82,8 @@ table,
}
.form-control,
.form-control:focus {
.form-control:focus,
.input-group-addon {
border: 1px solid @brand-warning;
}
}
......@@ -95,7 +96,8 @@ table,
}
.form-control,
.form-control:focus {
.form-control:focus,
.input-group-addon {
border: 1px solid @brand-danger;
}
}
......@@ -108,7 +110,8 @@ table,
}
.form-control,
.form-control:focus {
.form-control:focus,
.input-group-addon {
border: 1px solid @brand-success;
}
}
......
......@@ -5825,7 +5825,8 @@ table .text-muted,
color: #ff8800;
}
.has-warning .form-control,
.has-warning .form-control:focus {
.has-warning .form-control:focus,
.has-warning .input-group-addon {
border-color: #ff8800;
}
.has-error .help-block,
......@@ -5834,7 +5835,8 @@ table .text-muted,
color: #cc0000;
}
.has-error .form-control,
.has-error .form-control:focus {
.has-error .form-control:focus,
.has-error .input-group-addon {
border-color: #cc0000;
}
.has-success .help-block,
......@@ -5843,7 +5845,8 @@ table .text-muted,
color: #77b300;
}
.has-success .form-control,
.has-success .form-control:focus {
.has-success .form-control:focus,
.has-success .input-group-addon {
border-color: #77b300;
}
legend {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -70,7 +70,8 @@ table,
}
.form-control,
.form-control:focus {
.form-control:focus,
.input-group-addon {
border-color: @brand-warning;
}
}
......@@ -83,7 +84,8 @@ table,
}
.form-control,
.form-control:focus {
.form-control:focus,
.input-group-addon {
border-color: @brand-danger;
}
}
......@@ -96,7 +98,8 @@ table,
}
.form-control,
.form-control:focus {
.form-control:focus,
.input-group-addon {
border-color: @brand-success;
}
}
......
......@@ -5947,6 +5947,9 @@ label {
-webkit-box-shadow: inset 0 2px 0 rgba(0, 0, 0, 0.075);
box-shadow: inset 0 2px 0 rgba(0, 0, 0, 0.075);
}
.has-warning .input-group-addon {
border: 1px solid #ff851b;
}
.has-error .help-block,
.has-error .control-label,
.has-error .form-control-feedback {
......@@ -5958,6 +5961,9 @@ label {
-webkit-box-shadow: inset 0 2px 0 rgba(0, 0, 0, 0.075);
box-shadow: inset 0 2px 0 rgba(0, 0, 0, 0.075);
}
.has-error .input-group-addon {
border: 1px solid #ff4136;
}
.has-success .help-block,
.has-success .control-label,
.has-success .form-control-feedback {
......@@ -5969,6 +5975,9 @@ label {
-webkit-box-shadow: inset 0 2px 0 rgba(0, 0, 0, 0.075);
box-shadow: inset 0 2px 0 rgba(0, 0, 0, 0.075);
}
.has-success .input-group-addon {
border: 1px solid #28b62c;
}
.nav .open > a,
.nav .open > a:hover,
.nav .open > a:focus {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -206,6 +206,10 @@ label {
border: 1px solid @brand-warning;
.box-shadow(inset 0 2px 0 rgba(0, 0, 0, 0.075));
}
.input-group-addon {
border: 1px solid @brand-warning;
}
}
.has-error {
......@@ -220,6 +224,10 @@ label {
border: 1px solid @brand-danger;
.box-shadow(inset 0 2px 0 rgba(0, 0, 0, 0.075));
}
.input-group-addon {
border: 1px solid @brand-danger;
}
}
.has-success {
......@@ -234,6 +242,10 @@ label {
border: 1px solid @brand-success;
.box-shadow(inset 0 2px 0 rgba(0, 0, 0, 0.075));
}
.input-group-addon {
border: 1px solid @brand-success;
}
}
// Navs =======================================================================
......
......@@ -5974,6 +5974,10 @@ textarea {
.has-warning .form-control:focus {
border-color: #f89406;
}
.has-warning .input-group-addon {
background-color: #272b30;
border: none;
}
.has-error .help-block,
.has-error .control-label,
.has-error .form-control-feedback {
......@@ -5983,6 +5987,10 @@ textarea {
.has-error .form-control:focus {
border-color: #ee5f5b;
}
.has-error .input-group-addon {
background-color: #272b30;
border: none;
}
.has-success .help-block,
.has-success .control-label,
.has-success .form-control-feedback {
......@@ -5992,6 +6000,10 @@ textarea {
.has-success .form-control:focus {
border-color: #62c462;
}
.has-success .input-group-addon {
background-color: #272b30;
border: none;
}
legend {
color: #fff;
}
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -195,6 +195,11 @@ textarea {
.form-control:focus {
border-color: @brand-warning;
}
.input-group-addon {
background-color: @body-bg;
border: none;
}
}
.has-error {
......@@ -208,6 +213,11 @@ textarea {
.form-control:focus {
border-color: @brand-danger;
}
.input-group-addon {
background-color: @body-bg;
border: none;
}
}
.has-success {
......@@ -221,6 +231,11 @@ textarea {
.form-control:focus {
border-color: @brand-success;
}
.input-group-addon {
background-color: @body-bg;
border: none;
}
}
legend {
......
......@@ -5887,16 +5887,25 @@ label,
.has-warning .form-control-feedback {
color: #f0ad4e;
}
.has-warning .input-group-addon {
border: none;
}
.has-error .help-block,
.has-error .control-label,
.has-error .form-control-feedback {
color: #d9534f;
}
.has-error .input-group-addon {
border: none;
}
.has-success .help-block,
.has-success .control-label,
.has-success .form-control-feedback {
color: #5cb85c;
}
.has-success .input-group-addon {
border: none;
}
.form-control:focus {
-webkit-box-shadow: none;
box-shadow: none;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -152,6 +152,10 @@ label,
.form-control-feedback {
color: @brand-warning;
}
.input-group-addon {
border: none;
}
}
.has-error {
......@@ -160,6 +164,10 @@ label,
.form-control-feedback {
color: @brand-danger;
}
.input-group-addon {
border: none;
}
}
.has-success {
......@@ -168,6 +176,10 @@ label,
.form-control-feedback {
color: @brand-success;
}
.input-group-addon {
border: none;
}
}
.form-control:focus {
......
......@@ -809,6 +809,21 @@
</div>
</form>
</p><form class="bs-example">
<div class="form-group input-group has-warning">
<span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span>
<input type="text" class="form-control" id="inputWarning">
</div>
<div class="form-group input-group has-error">
<span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span>
<input type="text" class="form-control" id="inputError">
</div>
<div class="form-group input-group has-success">
<span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span>
<input type="text" class="form-control" id="inputSuccess">
</div>
</form>
<div class="bs-callout bs-callout-warning">
<h4>Icons, labels, and input groups</h4>
<p>Manual positioning of feedback icons is required for inputs without a label and for <a href="../components#input-groups">input groups</a> with an add-on on the right. For inputs without labels, adjust the <code>top</code>value. For input groups, adjust the <code>right</code> value to an appropriate pixel value depending on the width of your addon.</p>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment