diff options
| author | Jacob Thornton <[email protected]> | 2015-11-14 19:52:17 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2015-11-14 19:52:17 -0800 |
| commit | a3d7f79ae9f09e5772fe3ee30ba9c7cad4f8baaa (patch) | |
| tree | 8bbfd7e3b331fb3b5c2001de8e94c8dcceaa8162 /scss | |
| parent | 418f169999311d79460c1b054bdc9d68c46540b0 (diff) | |
| parent | 65b1d57386acf8793cb01e2992dd663b2c7821dd (diff) | |
| download | bootstrap-a3d7f79ae9f09e5772fe3ee30ba9c7cad4f8baaa.tar.xz bootstrap-a3d7f79ae9f09e5772fe3ee30ba9c7cad4f8baaa.zip | |
Merge branch 'v4-dev' of github.com:twbs/bootstrap into v4-dev
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_forms.scss | 4 | ||||
| -rw-r--r-- | scss/_responsive-embed.scss | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/scss/_forms.scss b/scss/_forms.scss index 1d3184842..8796cbb77 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -261,7 +261,7 @@ input[type="checkbox"] { .form-control-success, .form-control-warning, -.form-control-error { +.form-control-danger { padding-right: ($input-padding-x * 3); background-repeat: no-repeat; background-position: center right ($input-height * .25); @@ -288,7 +288,7 @@ input[type="checkbox"] { .has-danger { @include form-control-validation($brand-danger); - .form-control-error { + .form-control-danger { background-image: url($form-icon-danger); } } diff --git a/scss/_responsive-embed.scss b/scss/_responsive-embed.scss index ac4dc743a..aaf8c0470 100644 --- a/scss/_responsive-embed.scss +++ b/scss/_responsive-embed.scss @@ -22,17 +22,14 @@ } } -// Modifier class for 21:9 aspect ratio .embed-responsive-21by9 { padding-bottom: percentage(9 / 21); } -// Modifier class for 16:9 aspect ratio .embed-responsive-16by9 { padding-bottom: percentage(9 / 16); } -// Modifier class for 4:3 aspect ratio .embed-responsive-4by3 { padding-bottom: percentage(3 / 4); } |