diff options
| author | Thomas McDonald <[email protected]> | 2015-08-24 16:19:19 -0700 |
|---|---|---|
| committer | Thomas McDonald <[email protected]> | 2015-08-24 16:19:19 -0700 |
| commit | 22717a12426af5567f65be1da3d4d968c22276a7 (patch) | |
| tree | 491c47f72160c5b1133fa138c1fbacd00e253377 /dist/css/bootstrap.css | |
| parent | ec523617a3eb6da5b3e14f878931c769999f89a7 (diff) | |
| parent | 0da684ff8501768c0ecd4c60c0c7cf043bde1a1d (diff) | |
| download | bootstrap-22717a12426af5567f65be1da3d4d968c22276a7.tar.xz bootstrap-22717a12426af5567f65be1da3d4d968c22276a7.zip | |
Merge branch 'v4-dev' into fix-travis-v4
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 363 |
1 files changed, 200 insertions, 163 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 908c89eaf..818f97794 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 { @@ -2271,7 +2255,7 @@ fieldset[disabled] .btn { opacity: .65; } -a.btn.disaabled, +a.btn.disabled, fieldset[disabled] a.btn { pointer-events: none; } @@ -2282,17 +2266,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 +2282,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 +2325,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 +2341,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 +2384,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 +2400,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 +2443,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 +2459,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 +2502,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 +2518,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 +2561,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 +2577,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, @@ -3062,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, @@ -3158,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 { @@ -3274,7 +3334,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; } @@ -3364,6 +3424,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; @@ -3444,7 +3509,6 @@ input[type="button"].btn-block { border: 1px solid #ccc; -moz-appearance: none; - appearance: none; } .c-select:focus { @@ -3565,14 +3629,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 { @@ -3669,14 +3729,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) { @@ -3701,7 +3757,6 @@ input[type="button"].btn-block { right: 0; left: 0; z-index: 1030; - margin-bottom: 0; } @media (min-width: 34em) { @@ -3761,7 +3816,7 @@ input[type="button"].btn-block { } .navbar-divider:before { - content: '\00a0'; + content: "\00a0"; } .navbar-toggler { @@ -3894,7 +3949,6 @@ input[type="button"].btn-block { } .card-title { - margin-top: 0; margin-bottom: .75rem; } @@ -4231,14 +4285,10 @@ input[type="button"].btn-block { list-style: none; } -.pager:before, .pager:after { display: table; - content: " "; -} - -.pager:after { clear: both; + content: ""; } .pager li { @@ -4413,7 +4463,6 @@ a.label:hover { } .alert-heading { - margin-top: 0; color: inherit; } @@ -4828,137 +4877,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; @@ -5112,14 +5161,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 { @@ -5142,14 +5187,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 { @@ -5687,14 +5728,10 @@ button.close { } } -.clearfix:before, .clearfix:after { display: table; - content: " "; -} - -.clearfix:after { clear: both; + content: ""; } .center-block { |
