diff options
| author | Mark Otto <[email protected]> | 2013-06-09 23:45:23 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-06-09 23:45:23 -0700 |
| commit | d74a9634b0cb21a712f5e805c7a21132dc9bee5e (patch) | |
| tree | f3edcacc7b1bde1eec5255fc3d3dc28b1d73c372 | |
| parent | 9fac2c04679042ffc84ee74fce2516497f965419 (diff) | |
| parent | 8b136f5b66cf922d434a9d3b96c13979284bf94b (diff) | |
| download | bootstrap-d74a9634b0cb21a712f5e805c7a21132dc9bee5e.tar.xz bootstrap-d74a9634b0cb21a712f5e805c7a21132dc9bee5e.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
| -rw-r--r-- | docs/assets/css/bootstrap.css | 18 | ||||
| -rw-r--r-- | docs/css.html | 2 | ||||
| -rw-r--r-- | less/mixins.less | 6 |
3 files changed, 25 insertions, 1 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 4d65d053b..f9f1fb932 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -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; } +.has-warning .input-group-addon { + color: #c09853; + background-color: #fcf8e3; + border-color: #c09853; +} + .has-error .control-label { 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; } +.has-error .input-group-addon { + color: #b94a48; + background-color: #f2dede; + border-color: #b94a48; +} + .has-success .control-label { 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; } +.has-success .input-group-addon { + color: #468847; + background-color: #dff0d8; + border-color: #468847; +} + input:focus:invalid, textarea:focus:invalid, select:focus:invalid { diff --git a/docs/css.html b/docs/css.html index 843715aad..7cc50602e 100644 --- a/docs/css.html +++ b/docs/css.html @@ -621,7 +621,7 @@ lead: "Fundamental HTML elements styled and enhanced with extensible classes." {% highlight html %} <blockquote> <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> {% endhighlight %} diff --git a/less/mixins.less b/less/mixins.less index d4c628e13..9825e9a2d 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -486,4 +486,10 @@ .box-shadow(@shadow); } } + // Set validation states also for addons + .input-group-addon { + color: @text-color; + border-color: @border-color; + background-color: @background-color; + } } |