rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-17 14:54:30 +01:00
Code Issues Actions Packages Releases Activity

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Browse Source
This commit is contained in:
Mark Otto 2013-06-09 23:45:23 -07:00
commit d74a9634b0
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docs/assets/css/bootstrap.css vendored
View File

@ -1550,6 +1550,12 @@ fieldset[disabled] input[type="checkbox"] {
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
} }
.has-warning .input-group-addon {
color: #c09853;
background-color: #fcf8e3;
border-color: #c09853;
}
.has-error .control-label { .has-error .control-label {
color: #b94a48; color: #b94a48;
} }
@ -1567,6 +1573,12 @@ fieldset[disabled] input[type="checkbox"] {
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
} }
.has-error .input-group-addon {
color: #b94a48;
background-color: #f2dede;
border-color: #b94a48;
}
.has-success .control-label { .has-success .control-label {
color: #468847; color: #468847;
} }
@ -1584,6 +1596,12 @@ fieldset[disabled] input[type="checkbox"] {
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
} }
.has-success .input-group-addon {
color: #468847;
background-color: #dff0d8;
border-color: #468847;
}
input:focus:invalid, input:focus:invalid,
textarea:focus:invalid, textarea:focus:invalid,
select:focus:invalid { select:focus:invalid {

2
docs/css.html
View File

@ -621,7 +621,7 @@ lead: "Fundamental HTML elements styled and enhanced with extensible classes."
{% highlight html %} {% highlight html %}
<blockquote> <blockquote>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p> <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
<small>Someone famous <cite title="Source Title">Source Title</cite></small> <small>Someone famous in <cite title="Source Title">Source Title</cite></small>
</blockquote> </blockquote>
{% endhighlight %} {% endhighlight %}

6
less/mixins.less
View File

@ -486,4 +486,10 @@
.box-shadow(@shadow); .box-shadow(@shadow);
} }
} }
// Set validation states also for addons
.input-group-addon {
color: @text-color;
border-color: @border-color;
background-color: @background-color;
}
} }