From 705fb5361eeed1cbc0ef4b8c34c1e8638798a92b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Aug 2015 15:06:36 -0700 Subject: grunt --- dist/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 908c89eaf..d604cac99 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2271,7 +2271,7 @@ fieldset[disabled] .btn { opacity: .65; } -a.btn.disaabled, +a.btn.disabled, fieldset[disabled] a.btn { pointer-events: none; } -- cgit v1.2.3 From a93c42bbbeed129f840d6cbc7aff9972f90217d4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 22 Aug 2015 18:36:48 -0700 Subject: grunt --- dist/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index d604cac99..c241526eb 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3274,7 +3274,7 @@ input[type="button"].btn-block { .input-group-addon.form-control-lg, .input-group-lg > .input-group-addon, .input-group-lg > .input-group-btn > .input-group-addon.btn { - padding: 1.25rem 1.25rem; + padding: .75rem 1.25rem; font-size: 1.25rem; border-radius: .3rem; } -- cgit v1.2.3 From 1f153b640de55a4fff1aca3cf7331e9b7e3a408f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 22 Aug 2015 19:05:43 -0700 Subject: re-fix #16154 in v4-dev /cc #17101 --- dist/css/bootstrap.css | 156 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 120 insertions(+), 36 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index c241526eb..af6a4e2f5 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2282,17 +2282,14 @@ fieldset[disabled] a.btn { border-color: #0275d8; } -.btn-primary:focus, -.btn-primary.focus, -.btn-primary:active, -.btn-primary.active, -.open > .btn-primary.dropdown-toggle { +.btn-primary:hover { color: #fff; background-color: #025aa5; border-color: #01549b; } -.btn-primary:hover { +.btn-primary:focus, +.btn-primary.focus { color: #fff; background-color: #025aa5; border-color: #01549b; @@ -2301,7 +2298,24 @@ fieldset[disabled] a.btn { .btn-primary:active, .btn-primary.active, .open > .btn-primary.dropdown-toggle { + color: #fff; + background-color: #025aa5; background-image: none; + border-color: #01549b; +} + +.btn-primary:active:hover, +.btn-primary:active:focus, +.btn-primary:active.focus, +.btn-primary.active:hover, +.btn-primary.active:focus, +.btn-primary.active.focus, +.open > .btn-primary.dropdown-toggle:hover, +.open > .btn-primary.dropdown-toggle:focus, +.open > .btn-primary.dropdown-toggle.focus { + color: #fff; + background-color: #014682; + border-color: #01315a; } .btn-primary.disabled:focus, @@ -2327,17 +2341,14 @@ fieldset[disabled] .btn-primary:hover { border-color: #ccc; } -.btn-secondary:focus, -.btn-secondary.focus, -.btn-secondary:active, -.btn-secondary.active, -.open > .btn-secondary.dropdown-toggle { +.btn-secondary:hover { color: #373a3c; background-color: #e6e6e6; border-color: #adadad; } -.btn-secondary:hover { +.btn-secondary:focus, +.btn-secondary.focus { color: #373a3c; background-color: #e6e6e6; border-color: #adadad; @@ -2346,7 +2357,24 @@ fieldset[disabled] .btn-primary:hover { .btn-secondary:active, .btn-secondary.active, .open > .btn-secondary.dropdown-toggle { + color: #373a3c; + background-color: #e6e6e6; background-image: none; + border-color: #adadad; +} + +.btn-secondary:active:hover, +.btn-secondary:active:focus, +.btn-secondary:active.focus, +.btn-secondary.active:hover, +.btn-secondary.active:focus, +.btn-secondary.active.focus, +.open > .btn-secondary.dropdown-toggle:hover, +.open > .btn-secondary.dropdown-toggle:focus, +.open > .btn-secondary.dropdown-toggle.focus { + color: #373a3c; + background-color: #d4d4d4; + border-color: #8c8c8c; } .btn-secondary.disabled:focus, @@ -2372,17 +2400,14 @@ fieldset[disabled] .btn-secondary:hover { border-color: #5bc0de; } -.btn-info:focus, -.btn-info.focus, -.btn-info:active, -.btn-info.active, -.open > .btn-info.dropdown-toggle { +.btn-info:hover { color: #fff; background-color: #31b0d5; border-color: #2aabd2; } -.btn-info:hover { +.btn-info:focus, +.btn-info.focus { color: #fff; background-color: #31b0d5; border-color: #2aabd2; @@ -2391,7 +2416,24 @@ fieldset[disabled] .btn-secondary:hover { .btn-info:active, .btn-info.active, .open > .btn-info.dropdown-toggle { + color: #fff; + background-color: #31b0d5; background-image: none; + border-color: #2aabd2; +} + +.btn-info:active:hover, +.btn-info:active:focus, +.btn-info:active.focus, +.btn-info.active:hover, +.btn-info.active:focus, +.btn-info.active.focus, +.open > .btn-info.dropdown-toggle:hover, +.open > .btn-info.dropdown-toggle:focus, +.open > .btn-info.dropdown-toggle.focus { + color: #fff; + background-color: #269abc; + border-color: #1f7e9a; } .btn-info.disabled:focus, @@ -2417,17 +2459,14 @@ fieldset[disabled] .btn-info:hover { border-color: #5cb85c; } -.btn-success:focus, -.btn-success.focus, -.btn-success:active, -.btn-success.active, -.open > .btn-success.dropdown-toggle { +.btn-success:hover { color: #fff; background-color: #449d44; border-color: #419641; } -.btn-success:hover { +.btn-success:focus, +.btn-success.focus { color: #fff; background-color: #449d44; border-color: #419641; @@ -2436,7 +2475,24 @@ fieldset[disabled] .btn-info:hover { .btn-success:active, .btn-success.active, .open > .btn-success.dropdown-toggle { + color: #fff; + background-color: #449d44; background-image: none; + border-color: #419641; +} + +.btn-success:active:hover, +.btn-success:active:focus, +.btn-success:active.focus, +.btn-success.active:hover, +.btn-success.active:focus, +.btn-success.active.focus, +.open > .btn-success.dropdown-toggle:hover, +.open > .btn-success.dropdown-toggle:focus, +.open > .btn-success.dropdown-toggle.focus { + color: #fff; + background-color: #398439; + border-color: #2d672d; } .btn-success.disabled:focus, @@ -2462,17 +2518,14 @@ fieldset[disabled] .btn-success:hover { border-color: #f0ad4e; } -.btn-warning:focus, -.btn-warning.focus, -.btn-warning:active, -.btn-warning.active, -.open > .btn-warning.dropdown-toggle { +.btn-warning:hover { color: #fff; background-color: #ec971f; border-color: #eb9316; } -.btn-warning:hover { +.btn-warning:focus, +.btn-warning.focus { color: #fff; background-color: #ec971f; border-color: #eb9316; @@ -2481,7 +2534,24 @@ fieldset[disabled] .btn-success:hover { .btn-warning:active, .btn-warning.active, .open > .btn-warning.dropdown-toggle { + color: #fff; + background-color: #ec971f; background-image: none; + border-color: #eb9316; +} + +.btn-warning:active:hover, +.btn-warning:active:focus, +.btn-warning:active.focus, +.btn-warning.active:hover, +.btn-warning.active:focus, +.btn-warning.active.focus, +.open > .btn-warning.dropdown-toggle:hover, +.open > .btn-warning.dropdown-toggle:focus, +.open > .btn-warning.dropdown-toggle.focus { + color: #fff; + background-color: #d58512; + border-color: #b06d0f; } .btn-warning.disabled:focus, @@ -2507,17 +2577,14 @@ fieldset[disabled] .btn-warning:hover { border-color: #d9534f; } -.btn-danger:focus, -.btn-danger.focus, -.btn-danger:active, -.btn-danger.active, -.open > .btn-danger.dropdown-toggle { +.btn-danger:hover { color: #fff; background-color: #c9302c; border-color: #c12e2a; } -.btn-danger:hover { +.btn-danger:focus, +.btn-danger.focus { color: #fff; background-color: #c9302c; border-color: #c12e2a; @@ -2526,7 +2593,24 @@ fieldset[disabled] .btn-warning:hover { .btn-danger:active, .btn-danger.active, .open > .btn-danger.dropdown-toggle { + color: #fff; + background-color: #c9302c; background-image: none; + border-color: #c12e2a; +} + +.btn-danger:active:hover, +.btn-danger:active:focus, +.btn-danger:active.focus, +.btn-danger.active:hover, +.btn-danger.active:focus, +.btn-danger.active.focus, +.open > .btn-danger.dropdown-toggle:hover, +.open > .btn-danger.dropdown-toggle:focus, +.open > .btn-danger.dropdown-toggle.focus { + color: #fff; + background-color: #ac2925; + border-color: #8b211e; } .btn-danger.disabled:focus, -- cgit v1.2.3 From 0644ce37033570f01ac8ac4a92f4ddcdf88d95d8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 22 Aug 2015 19:12:40 -0700 Subject: grunt --- dist/css/bootstrap.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index af6a4e2f5..7297f1615 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3448,6 +3448,11 @@ input[type="button"].btn-block { background-color: #0074d9; } +.c-input > input:focus ~ .c-indicator { + -webkit-box-shadow: 0 0 0 .075rem #fff, 0 0 0 .2rem #0074d9; + box-shadow: 0 0 0 .075rem #fff, 0 0 0 .2rem #0074d9; +} + .c-input > input:active ~ .c-indicator { color: #fff; background-color: #84c6ff; -- cgit v1.2.3 From db87ffb0db59ca1024f94477bec59e6d49ea206c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 22 Aug 2015 21:46:49 -0700 Subject: grunt --- dist/css/bootstrap.css | 120 ++++++++++++++++++++++++------------------------- 1 file changed, 60 insertions(+), 60 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 7297f1615..6cbc26586 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4917,137 +4917,137 @@ button.list-group-item:hover { color: #a8d6fe; } -.list-group-item-state { +.list-group-item-success { color: #3c763d; background-color: #dff0d8; } -a.list-group-item-state, -button.list-group-item-state { +a.list-group-item-success, +button.list-group-item-success { color: #3c763d; } -a.list-group-item-state .list-group-item-heading, -button.list-group-item-state .list-group-item-heading { +a.list-group-item-success .list-group-item-heading, +button.list-group-item-success .list-group-item-heading { color: inherit; } -a.list-group-item-state:focus, -a.list-group-item-state:hover, -button.list-group-item-state:focus, -button.list-group-item-state:hover { +a.list-group-item-success:focus, +a.list-group-item-success:hover, +button.list-group-item-success:focus, +button.list-group-item-success:hover { color: #3c763d; background-color: #d0e9c6; } -a.list-group-item-state.active, -a.list-group-item-state.active:focus, -a.list-group-item-state.active:hover, -button.list-group-item-state.active, -button.list-group-item-state.active:focus, -button.list-group-item-state.active:hover { +a.list-group-item-success.active, +a.list-group-item-success.active:focus, +a.list-group-item-success.active:hover, +button.list-group-item-success.active, +button.list-group-item-success.active:focus, +button.list-group-item-success.active:hover { color: #fff; background-color: #3c763d; border-color: #3c763d; } -.list-group-item-state { +.list-group-item-info { color: #31708f; background-color: #d9edf7; } -a.list-group-item-state, -button.list-group-item-state { +a.list-group-item-info, +button.list-group-item-info { color: #31708f; } -a.list-group-item-state .list-group-item-heading, -button.list-group-item-state .list-group-item-heading { +a.list-group-item-info .list-group-item-heading, +button.list-group-item-info .list-group-item-heading { color: inherit; } -a.list-group-item-state:focus, -a.list-group-item-state:hover, -button.list-group-item-state:focus, -button.list-group-item-state:hover { +a.list-group-item-info:focus, +a.list-group-item-info:hover, +button.list-group-item-info:focus, +button.list-group-item-info:hover { color: #31708f; background-color: #c4e3f3; } -a.list-group-item-state.active, -a.list-group-item-state.active:focus, -a.list-group-item-state.active:hover, -button.list-group-item-state.active, -button.list-group-item-state.active:focus, -button.list-group-item-state.active:hover { +a.list-group-item-info.active, +a.list-group-item-info.active:focus, +a.list-group-item-info.active:hover, +button.list-group-item-info.active, +button.list-group-item-info.active:focus, +button.list-group-item-info.active:hover { color: #fff; background-color: #31708f; border-color: #31708f; } -.list-group-item-state { +.list-group-item-warning { color: #8a6d3b; background-color: #fcf8e3; } -a.list-group-item-state, -button.list-group-item-state { +a.list-group-item-warning, +button.list-group-item-warning { color: #8a6d3b; } -a.list-group-item-state .list-group-item-heading, -button.list-group-item-state .list-group-item-heading { +a.list-group-item-warning .list-group-item-heading, +button.list-group-item-warning .list-group-item-heading { color: inherit; } -a.list-group-item-state:focus, -a.list-group-item-state:hover, -button.list-group-item-state:focus, -button.list-group-item-state:hover { +a.list-group-item-warning:focus, +a.list-group-item-warning:hover, +button.list-group-item-warning:focus, +button.list-group-item-warning:hover { color: #8a6d3b; background-color: #faf2cc; } -a.list-group-item-state.active, -a.list-group-item-state.active:focus, -a.list-group-item-state.active:hover, -button.list-group-item-state.active, -button.list-group-item-state.active:focus, -button.list-group-item-state.active:hover { +a.list-group-item-warning.active, +a.list-group-item-warning.active:focus, +a.list-group-item-warning.active:hover, +button.list-group-item-warning.active, +button.list-group-item-warning.active:focus, +button.list-group-item-warning.active:hover { color: #fff; background-color: #8a6d3b; border-color: #8a6d3b; } -.list-group-item-state { +.list-group-item-danger { color: #a94442; background-color: #f2dede; } -a.list-group-item-state, -button.list-group-item-state { +a.list-group-item-danger, +button.list-group-item-danger { color: #a94442; } -a.list-group-item-state .list-group-item-heading, -button.list-group-item-state .list-group-item-heading { +a.list-group-item-danger .list-group-item-heading, +button.list-group-item-danger .list-group-item-heading { color: inherit; } -a.list-group-item-state:focus, -a.list-group-item-state:hover, -button.list-group-item-state:focus, -button.list-group-item-state:hover { +a.list-group-item-danger:focus, +a.list-group-item-danger:hover, +button.list-group-item-danger:focus, +button.list-group-item-danger:hover { color: #a94442; background-color: #ebcccc; } -a.list-group-item-state.active, -a.list-group-item-state.active:focus, -a.list-group-item-state.active:hover, -button.list-group-item-state.active, -button.list-group-item-state.active:focus, -button.list-group-item-state.active:hover { +a.list-group-item-danger.active, +a.list-group-item-danger.active:focus, +a.list-group-item-danger.active:hover, +button.list-group-item-danger.active, +button.list-group-item-danger.active:focus, +button.list-group-item-danger.active:hover { color: #fff; background-color: #a94442; border-color: #a94442; -- cgit v1.2.3 From d4e7252a835175575a79142fc014f11feccf217b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 23 Aug 2015 00:18:35 -0700 Subject: grunt --- dist/css/bootstrap.css | 72 +++++++++----------------------------------------- 1 file changed, 12 insertions(+), 60 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 6cbc26586..1824356c3 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -584,14 +584,10 @@ mark, margin-left: -1.875rem; } -.dl-horizontal:before, .dl-horizontal:after { display: table; - content: " "; -} - -.dl-horizontal:after { clear: both; + content: ""; } .initialism { @@ -740,14 +736,10 @@ pre code { margin-left: auto; } -.container:before, .container:after { display: table; - content: " "; -} - -.container:after { clear: both; + content: ""; } @media (min-width: 34em) { @@ -781,14 +773,10 @@ pre code { margin-left: auto; } -.container-fluid:before, .container-fluid:after { display: table; - content: " "; -} - -.container-fluid:after { clear: both; + content: ""; } .row { @@ -796,14 +784,10 @@ pre code { margin-left: -.9375rem; } -.row:before, .row:after { display: table; - content: " "; -} - -.row:after { clear: both; + content: ""; } .col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12 { @@ -3146,14 +3130,10 @@ input[type="button"].btn-block { margin-left: -5px; } -.btn-toolbar:before, .btn-toolbar:after { display: table; - content: " "; -} - -.btn-toolbar:after { clear: both; + content: ""; } .btn-toolbar .btn-group, @@ -3242,14 +3222,10 @@ input[type="button"].btn-block { max-width: 100%; } -.btn-group-vertical > .btn-group:before, .btn-group-vertical > .btn-group:after { display: table; - content: " "; -} - -.btn-group-vertical > .btn-group:after { clear: both; + content: ""; } .btn-group-vertical > .btn-group > .btn { @@ -3654,14 +3630,10 @@ input[type="button"].btn-block { border-bottom: 1px solid #ddd; } -.nav-tabs:before, .nav-tabs:after { display: table; - content: " "; -} - -.nav-tabs:after { clear: both; + content: ""; } .nav-tabs .nav-item { @@ -3758,14 +3730,10 @@ input[type="button"].btn-block { padding: .5rem 1rem; } -.navbar:before, .navbar:after { display: table; - content: " "; -} - -.navbar:after { clear: both; + content: ""; } @media (min-width: 34em) { @@ -4320,14 +4288,10 @@ input[type="button"].btn-block { list-style: none; } -.pager:before, .pager:after { display: table; - content: " "; -} - -.pager:after { clear: both; + content: ""; } .pager li { @@ -5201,14 +5165,10 @@ button.close { border-bottom: 1px solid #e5e5e5; } -.modal-header:before, .modal-header:after { display: table; - content: " "; -} - -.modal-header:after { clear: both; + content: ""; } .modal-header .close { @@ -5231,14 +5191,10 @@ button.close { border-top: 1px solid #e5e5e5; } -.modal-footer:before, .modal-footer:after { display: table; - content: " "; -} - -.modal-footer:after { clear: both; + content: ""; } .modal-footer .btn + .btn { @@ -5776,14 +5732,10 @@ button.close { } } -.clearfix:before, .clearfix:after { display: table; - content: " "; -} - -.clearfix:after { clear: both; + content: ""; } .center-block { -- cgit v1.2.3 From 95292fd0e778dac7af5aee215997e1de64304dd2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 23 Aug 2015 00:26:03 -0700 Subject: grunt --- dist/css/bootstrap.css | 2 -- 1 file changed, 2 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 1824356c3..afcb00f66 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3951,7 +3951,6 @@ input[type="button"].btn-block { } .card-title { - margin-top: 0; margin-bottom: .75rem; } @@ -4466,7 +4465,6 @@ a.label:hover { } .alert-heading { - margin-top: 0; color: inherit; } -- cgit v1.2.3 From 47d5168dc88c3902488c7f5d44f41a394551d0d9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 23 Aug 2015 00:28:58 -0700 Subject: grunt --- dist/css/bootstrap.css | 1 - 1 file changed, 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index afcb00f66..fede5b773 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3758,7 +3758,6 @@ input[type="button"].btn-block { right: 0; left: 0; z-index: 1030; - margin-bottom: 0; } @media (min-width: 34em) { -- cgit v1.2.3 From 3453f55ec5df38ef200583b8da220d437bae4c35 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 23 Aug 2015 01:00:29 -0700 Subject: grunt --- dist/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index fede5b773..593247fea 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3817,7 +3817,7 @@ input[type="button"].btn-block { } .navbar-divider:before { - content: '\00a0'; + content: "\00a0"; } .navbar-toggler { -- cgit v1.2.3 From e7ed4ff283fa7461970de313629fd555b070b177 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 23 Aug 2015 01:12:06 -0700 Subject: grunt --- dist/css/bootstrap.css | 1 - 1 file changed, 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 593247fea..818f97794 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3509,7 +3509,6 @@ input[type="button"].btn-block { border: 1px solid #ccc; -moz-appearance: none; - appearance: none; } .c-select:focus { -- cgit v1.2.3