diff options
| author | Mark Otto <[email protected]> | 2013-11-30 23:35:56 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-11-30 23:35:56 -0800 |
| commit | 53047fa587fc8ca5cc0cad751f71fca5470d453a (patch) | |
| tree | a013806bef23a01e7ff0615f82b629703c553d6a /dist/css/bootstrap.css | |
| parent | ba4c5dae9b8e34e90e86ba28aa6bd5acf3351f0d (diff) | |
| parent | 57070dcf4525fe82cab6a93300861867aa7f2d1e (diff) | |
| download | bootstrap-53047fa587fc8ca5cc0cad751f71fca5470d453a.tar.xz bootstrap-53047fa587fc8ca5cc0cad751f71fca5470d453a.zip | |
Merge branch 'master' into pr/11536
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 617 |
1 files changed, 287 insertions, 330 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index b1f5d96fe..6e27754c4 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1,9 +1,7 @@ /*! - * Bootstrap v3.0.2 by @fat and @mdo + * Bootstrap v3.0.2 (http://getbootstrap.com) * Copyright 2013 Twitter, Inc. * Licensed under http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world by @mdo and @fat. */ /*! normalize.css v2.1.3 | MIT License | git.io/normalize */ @@ -333,7 +331,7 @@ a:focus { } a:focus { - outline: thin dotted #333; + outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } @@ -387,88 +385,6 @@ hr { border: 0; } -p { - margin: 0 0 10px; -} - -.lead { - margin-bottom: 20px; - font-size: 16px; - font-weight: 200; - line-height: 1.4; -} - -@media (min-width: 768px) { - .lead { - font-size: 21px; - } -} - -small, -.small { - font-size: 85%; -} - -cite { - font-style: normal; -} - -.text-muted { - color: #999999; -} - -.text-primary { - color: #428bca; -} - -.text-primary:hover { - color: #3071a9; -} - -.text-warning { - color: #c09853; -} - -.text-warning:hover { - color: #a47e3c; -} - -.text-danger { - color: #b94a48; -} - -.text-danger:hover { - color: #953b39; -} - -.text-success { - color: #468847; -} - -.text-success:hover { - color: #356635; -} - -.text-info { - color: #3a87ad; -} - -.text-info:hover { - color: #2d6987; -} - -.text-left { - text-align: left; -} - -.text-right { - text-align: right; -} - -.text-center { - text-align: center; -} - h1, h2, h3, @@ -578,6 +494,88 @@ h6, font-size: 12px; } +p { + margin: 0 0 10px; +} + +.lead { + margin-bottom: 20px; + font-size: 16px; + font-weight: 200; + line-height: 1.4; +} + +@media (min-width: 768px) { + .lead { + font-size: 21px; + } +} + +small, +.small { + font-size: 85%; +} + +cite { + font-style: normal; +} + +.text-muted { + color: #999999; +} + +.text-primary { + color: #428bca; +} + +.text-primary:hover { + color: #3071a9; +} + +.text-warning { + color: #8a6d3b; +} + +.text-warning:hover { + color: #66512c; +} + +.text-danger { + color: #a94442; +} + +.text-danger:hover { + color: #843534; +} + +.text-success { + color: #3c763d; +} + +.text-success:hover { + color: #2b542c; +} + +.text-info { + color: #31708f; +} + +.text-info:hover { + color: #245269; +} + +.text-left { + text-align: left; +} + +.text-right { + text-align: right; +} + +.text-center { + text-align: center; +} + .page-header { padding-bottom: 9px; margin: 40px 0 20px; @@ -618,6 +616,7 @@ ol ol { } dl { + margin-top: 0; margin-bottom: 20px; } @@ -671,7 +670,7 @@ abbr[data-original-title] { border-bottom: 1px dotted #999999; } -abbr.initialism { +.initialism { font-size: 90%; text-transform: uppercase; } @@ -692,13 +691,15 @@ blockquote p:last-child { margin-bottom: 0; } -blockquote small { +blockquote small, +blockquote .small { display: block; line-height: 1.428571429; color: #999999; } -blockquote small:before { +blockquote small:before, +blockquote .small:before { content: '\2014 \00A0'; } @@ -807,6 +808,24 @@ pre code { clear: both; } +@media (min-width: 768px) { + .container { + width: 750px; + } +} + +@media (min-width: 992px) { + .container { + width: 970px; + } +} + +@media (min-width: 1200px) { + .container { + width: 1170px; + } +} + .row { margin-right: -15px; margin-left: -15px; @@ -896,7 +915,8 @@ pre code { .col-xs-8, .col-xs-9, .col-xs-10, -.col-xs-11 { +.col-xs-11, +.col-xs-12 { float: left; } @@ -1105,9 +1125,6 @@ pre code { } @media (min-width: 768px) { - .container { - width: 750px; - } .col-sm-1, .col-sm-2, .col-sm-3, @@ -1118,7 +1135,8 @@ pre code { .col-sm-8, .col-sm-9, .col-sm-10, - .col-sm-11 { + .col-sm-11, + .col-sm-12 { float: left; } .col-sm-12 { @@ -1277,9 +1295,6 @@ pre code { } @media (min-width: 992px) { - .container { - width: 970px; - } .col-md-1, .col-md-2, .col-md-3, @@ -1290,7 +1305,8 @@ pre code { .col-md-8, .col-md-9, .col-md-10, - .col-md-11 { + .col-md-11, + .col-md-12 { float: left; } .col-md-12 { @@ -1449,9 +1465,6 @@ pre code { } @media (min-width: 1200px) { - .container { - width: 1170px; - } .col-lg-1, .col-lg-2, .col-lg-3, @@ -1462,7 +1475,8 @@ pre code { .col-lg-8, .col-lg-9, .col-lg-10, - .col-lg-11 { + .col-lg-11, + .col-lg-12 { float: left; } .col-lg-12 { @@ -1706,6 +1720,7 @@ th { } table col[class*="col-"] { + position: static; display: table-column; float: none; } @@ -1716,84 +1731,75 @@ table th[class*="col-"] { float: none; } -.table > thead > tr > td.active, -.table > tbody > tr > td.active, -.table > tfoot > tr > td.active, -.table > thead > tr > th.active, -.table > tbody > tr > th.active, -.table > tfoot > tr > th.active, -.table > thead > tr.active > td, -.table > tbody > tr.active > td, -.table > tfoot > tr.active > td, -.table > thead > tr.active > th, -.table > tbody > tr.active > th, -.table > tfoot > tr.active > th { +.table > thead > tr > .active, +.table > tbody > tr > .active, +.table > tfoot > tr > .active, +.table > thead > .active > td, +.table > tbody > .active > td, +.table > tfoot > .active > td, +.table > thead > .active > th, +.table > tbody > .active > th, +.table > tfoot > .active > th { background-color: #f5f5f5; } -.table > thead > tr > td.success, -.table > tbody > tr > td.success, -.table > tfoot > tr > td.success, -.table > thead > tr > th.success, -.table > tbody > tr > th.success, -.table > tfoot > tr > th.success, -.table > thead > tr.success > td, -.table > tbody > tr.success > td, -.table > tfoot > tr.success > td, -.table > thead > tr.success > th, -.table > tbody > tr.success > th, -.table > tfoot > tr.success > th { +.table-hover > tbody > tr > .active:hover, +.table-hover > tbody > .active:hover > td, +.table-hover > tbody > .active:hover > th { + background-color: #e8e8e8; +} + +.table > thead > tr > .success, +.table > tbody > tr > .success, +.table > tfoot > tr > .success, +.table > thead > .success > td, +.table > tbody > .success > td, +.table > tfoot > .success > td, +.table > thead > .success > th, +.table > tbody > .success > th, +.table > tfoot > .success > th { background-color: #dff0d8; } -.table-hover > tbody > tr > td.success:hover, -.table-hover > tbody > tr > th.success:hover, -.table-hover > tbody > tr.success:hover > td, -.table-hover > tbody > tr.success:hover > th { +.table-hover > tbody > tr > .success:hover, +.table-hover > tbody > .success:hover > td, +.table-hover > tbody > .success:hover > th { background-color: #d0e9c6; } -.table > thead > tr > td.danger, -.table > tbody > tr > td.danger, -.table > tfoot > tr > td.danger, -.table > thead > tr > th.danger, -.table > tbody > tr > th.danger, -.table > tfoot > tr > th.danger, -.table > thead > tr.danger > td, -.table > tbody > tr.danger > td, -.table > tfoot > tr.danger > td, -.table > thead > tr.danger > th, -.table > tbody > tr.danger > th, -.table > tfoot > tr.danger > th { +.table > thead > tr > .danger, +.table > tbody > tr > .danger, +.table > tfoot > tr > .danger, +.table > thead > .danger > td, +.table > tbody > .danger > td, +.table > tfoot > .danger > td, +.table > thead > .danger > th, +.table > tbody > .danger > th, +.table > tfoot > .danger > th { background-color: #f2dede; } -.table-hover > tbody > tr > td.danger:hover, -.table-hover > tbody > tr > th.danger:hover, -.table-hover > tbody > tr.danger:hover > td, -.table-hover > tbody > tr.danger:hover > th { +.table-hover > tbody > tr > .danger:hover, +.table-hover > tbody > .danger:hover > td, +.table-hover > tbody > .danger:hover > th { background-color: #ebcccc; } -.table > thead > tr > td.warning, -.table > tbody > tr > td.warning, -.table > tfoot > tr > td.warning, -.table > thead > tr > th.warning, -.table > tbody > tr > th.warning, -.table > tfoot > tr > th.warning, -.table > thead > tr.warning > td, -.table > tbody > tr.warning > td, -.table > tfoot > tr.warning > td, -.table > thead > tr.warning > th, -.table > tbody > tr.warning > th, -.table > tfoot > tr.warning > th { +.table > thead > tr > .warning, +.table > tbody > tr > .warning, +.table > tfoot > tr > .warning, +.table > thead > .warning > td, +.table > tbody > .warning > td, +.table > tfoot > .warning > td, +.table > thead > .warning > th, +.table > tbody > .warning > th, +.table > tfoot > .warning > th { background-color: #fcf8e3; } -.table-hover > tbody > tr > td.warning:hover, -.table-hover > tbody > tr > th.warning:hover, -.table-hover > tbody > tr.warning:hover > td, -.table-hover > tbody > tr.warning:hover > th { +.table-hover > tbody > tr > .warning:hover, +.table-hover > tbody > .warning:hover > td, +.table-hover > tbody > .warning:hover > th { background-color: #faf2cc; } @@ -1902,7 +1908,7 @@ select optgroup { input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus { - outline: thin dotted #333; + outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } @@ -2059,7 +2065,7 @@ textarea.input-sm { } .input-lg { - height: 45px; + height: 46px; padding: 10px 16px; font-size: 18px; line-height: 1.33; @@ -2067,8 +2073,8 @@ textarea.input-sm { } select.input-lg { - height: 45px; - line-height: 45px; + height: 46px; + line-height: 46px; } textarea.input-lg { @@ -2081,25 +2087,25 @@ textarea.input-lg { .has-warning .checkbox, .has-warning .radio-inline, .has-warning .checkbox-inline { - color: #c09853; + color: #8a6d3b; } .has-warning .form-control { - border-color: #c09853; + border-color: #8a6d3b; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .has-warning .form-control:focus { - border-color: #a47e3c; - -webkit-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; + border-color: #66512c; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b; } .has-warning .input-group-addon { - color: #c09853; + color: #8a6d3b; background-color: #fcf8e3; - border-color: #c09853; + border-color: #8a6d3b; } .has-error .help-block, @@ -2108,25 +2114,25 @@ textarea.input-lg { .has-error .checkbox, .has-error .radio-inline, .has-error .checkbox-inline { - color: #b94a48; + color: #a94442; } .has-error .form-control { - border-color: #b94a48; + border-color: #a94442; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .has-error .form-control:focus { - border-color: #953b39; - -webkit-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; + border-color: #843534; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483; } .has-error .input-group-addon { - color: #b94a48; + color: #a94442; background-color: #f2dede; - border-color: #b94a48; + border-color: #a94442; } .has-success .help-block, @@ -2135,25 +2141,25 @@ textarea.input-lg { .has-success .checkbox, .has-success .radio-inline, .has-success .checkbox-inline { - color: #468847; + color: #3c763d; } .has-success .form-control { - border-color: #468847; + border-color: #3c763d; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .has-success .form-control:focus { - border-color: #356635; - -webkit-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; + border-color: #2b542c; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168; } .has-success .input-group-addon { - color: #468847; + color: #3c763d; background-color: #dff0d8; - border-color: #468847; + border-color: #3c763d; } .form-control-static { @@ -2176,6 +2182,9 @@ textarea.input-lg { .form-inline .form-control { display: inline-block; } + .form-inline select.form-control { + width: auto; + } .form-inline .radio, .form-inline .checkbox { display: inline-block; @@ -2200,6 +2209,11 @@ textarea.input-lg { margin-bottom: 0; } +.form-horizontal .radio, +.form-horizontal .checkbox { + min-height: 27px; +} + .form-horizontal .form-group { margin-right: -15px; margin-left: -15px; @@ -2257,7 +2271,7 @@ textarea.input-lg { } .btn:focus { - outline: thin dotted #333; + outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } @@ -2328,6 +2342,11 @@ fieldset[disabled] .btn-default.active { border-color: #cccccc; } +.btn-default .badge { + color: #ffffff; + background-color: #fff; +} + .btn-primary { color: #ffffff; background-color: #428bca; @@ -2369,6 +2388,11 @@ fieldset[disabled] .btn-primary.active { border-color: #357ebd; } +.btn-primary .badge { + color: #428bca; + background-color: #fff; +} + .btn-warning { color: #ffffff; background-color: #f0ad4e; @@ -2410,6 +2434,11 @@ fieldset[disabled] .btn-warning.active { border-color: #eea236; } +.btn-warning .badge { + color: #f0ad4e; + background-color: #fff; +} + .btn-danger { color: #ffffff; background-color: #d9534f; @@ -2451,6 +2480,11 @@ fieldset[disabled] .btn-danger.active { border-color: #d43f3a; } +.btn-danger .badge { + color: #d9534f; + background-color: #fff; +} + .btn-success { color: #ffffff; background-color: #5cb85c; @@ -2492,6 +2526,11 @@ fieldset[disabled] .btn-success.active { border-color: #4cae4c; } +.btn-success .badge { + color: #5cb85c; + background-color: #fff; +} + .btn-info { color: #ffffff; background-color: #5bc0de; @@ -2533,6 +2572,11 @@ fieldset[disabled] .btn-info.active { border-color: #46b8da; } +.btn-info .badge { + color: #5bc0de; + background-color: #fff; +} + .btn-link { font-weight: normal; color: #428bca; @@ -3461,7 +3505,7 @@ input[type="button"].btn-block { height: 0; margin-left: 2px; vertical-align: middle; - border-top: 4px solid #000000; + border-top: 4px solid; border-right: 4px solid transparent; border-left: 4px solid transparent; } @@ -3581,7 +3625,7 @@ input[type="button"].btn-block { .dropup .caret, .navbar-fixed-bottom .dropdown .caret { border-top: 0; - border-bottom: 4px solid #000000; + border-bottom: 4px solid; content: ""; } @@ -3599,30 +3643,6 @@ input[type="button"].btn-block { } } -.btn-default .caret { - border-top-color: #333333; -} - -.btn-primary .caret, -.btn-success .caret, -.btn-warning .caret, -.btn-danger .caret, -.btn-info .caret { - border-top-color: #fff; -} - -.dropup .btn-default .caret { - border-bottom-color: #333333; -} - -.dropup .btn-primary .caret, -.dropup .btn-success .caret, -.dropup .btn-warning .caret, -.dropup .btn-danger .caret, -.dropup .btn-info .caret { - border-bottom-color: #fff; -} - .btn-group, .btn-group-vertical { position: relative; @@ -3789,7 +3809,8 @@ input[type="button"].btn-block { } .btn-group-vertical > .btn, -.btn-group-vertical > .btn-group { +.btn-group-vertical > .btn-group, +.btn-group-vertical > .btn-group > .btn { display: block; float: none; width: 100%; @@ -3888,7 +3909,7 @@ input[type="button"].btn-block { border-collapse: separate; } -.input-group.col { +.input-group[class*="col-"] { float: none; padding-right: 0; padding-left: 0; @@ -3902,7 +3923,7 @@ input[type="button"].btn-block { .input-group-lg > .form-control, .input-group-lg > .input-group-addon, .input-group-lg > .input-group-btn > .btn { - height: 45px; + height: 46px; padding: 10px 16px; font-size: 18px; line-height: 1.33; @@ -3912,8 +3933,8 @@ input[type="button"].btn-block { select.input-group-lg > .form-control, select.input-group-lg > .input-group-addon, select.input-group-lg > .input-group-btn > .btn { - height: 45px; - line-height: 45px; + height: 46px; + line-height: 46px; } textarea.input-group-lg > .form-control, @@ -4107,13 +4128,6 @@ textarea.input-group-sm > .input-group-btn > .btn { border-color: #428bca; } -.nav .open > a .caret, -.nav .open > a:hover .caret, -.nav .open > a:focus .caret { - border-top-color: #2a6496; - border-bottom-color: #2a6496; -} - .nav .nav-divider { height: 1px; margin: 9px 0; @@ -4226,13 +4240,6 @@ textarea.input-group-sm > .input-group-btn > .btn { background-color: #428bca; } -.nav-pills > li.active > a .caret, -.nav-pills > li.active > a:hover .caret, -.nav-pills > li.active > a:focus .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - .nav-stacked > li { float: none; } @@ -4305,16 +4312,6 @@ textarea.input-group-sm > .input-group-btn > .btn { display: block; } -.nav .caret { - border-top-color: #428bca; - border-bottom-color: #428bca; -} - -.nav a:hover .caret { - border-top-color: #2a6496; - border-bottom-color: #2a6496; -} - .nav-tabs .dropdown-menu { margin-top: -1px; border-top-right-radius: 0; @@ -4517,6 +4514,7 @@ textarea.input-group-sm > .input-group-btn > .btn { margin-right: 15px; margin-bottom: 8px; background-color: transparent; + background-image: none; border: 1px solid transparent; border-radius: 4px; } @@ -4615,6 +4613,9 @@ textarea.input-group-sm > .input-group-btn > .btn { .navbar-form .form-control { display: inline-block; } + .navbar-form select.form-control { + width: auto; + } .navbar-form .radio, .navbar-form .checkbox { display: inline-block; @@ -4744,12 +4745,6 @@ textarea.input-group-sm > .input-group-btn > .btn { border-color: #e7e7e7; } -.navbar-default .navbar-nav > .dropdown > a:hover .caret, -.navbar-default .navbar-nav > .dropdown > a:focus .caret { - border-top-color: #333333; - border-bottom-color: #333333; -} - .navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus { @@ -4757,18 +4752,6 @@ textarea.input-group-sm > .input-group-btn > .btn { background-color: #e7e7e7; } -.navbar-default .navbar-nav > .open > a .caret, -.navbar-default .navbar-nav > .open > a:hover .caret, -.navbar-default .navbar-nav > .open > a:focus .caret { - border-top-color: #555555; - border-bottom-color: #555555; -} - -.navbar-default .navbar-nav > .dropdown > a .caret { - border-top-color: #777777; - border-bottom-color: #777777; -} - @media (max-width: 767px) { .navbar-default .navbar-nav .open .dropdown-menu > li > a { color: #777777; @@ -4868,27 +4851,13 @@ textarea.input-group-sm > .input-group-btn > .btn { background-color: #080808; } -.navbar-inverse .navbar-nav > .dropdown > a:hover .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - -.navbar-inverse .navbar-nav > .dropdown > a .caret { - border-top-color: #999999; - border-bottom-color: #999999; -} - -.navbar-inverse .navbar-nav > .open > a .caret, -.navbar-inverse .navbar-nav > .open > a:hover .caret, -.navbar-inverse .navbar-nav > .open > a:focus .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - @media (max-width: 767px) { .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header { border-color: #080808; } + .navbar-inverse .navbar-nav .open .dropdown-menu .divider { + background-color: #080808; + } .navbar-inverse .navbar-nav .open .dropdown-menu > li > a { color: #999999; } @@ -5134,6 +5103,11 @@ textarea.input-group-sm > .input-group-btn > .btn { display: none; } +.btn .label { + position: relative; + top: -1px; +} + .label-default { background-color: #999999; } @@ -5207,6 +5181,11 @@ textarea.input-group-sm > .input-group-btn > .btn { display: none; } +.btn .badge { + position: relative; + top: -1px; +} + a.badge:hover, a.badge:focus { color: #ffffff; @@ -5214,11 +5193,6 @@ a.badge:focus { cursor: pointer; } -.btn .badge { - position: relative; - top: -1px; -} - a.list-group-item.active > .badge, .nav-pills > .active > a > .badge { color: #428bca; @@ -5239,7 +5213,8 @@ a.list-group-item.active > .badge, background-color: #eeeeee; } -.jumbotron h1 { +.jumbotron h1, +.jumbotron .h1 { line-height: 1; color: inherit; } @@ -5252,6 +5227,10 @@ a.list-group-item.active > .badge, border-radius: 6px; } +.jumbotron .container { + max-width: 100%; +} + @media screen and (min-width: 768px) { .jumbotron { padding-top: 48px; @@ -5261,16 +5240,14 @@ a.list-group-item.active > .badge, padding-right: 60px; padding-left: 60px; } - .jumbotron h1 { + .jumbotron h1, + .jumbotron .h1 { font-size: 63px; } } .thumbnail { - display: inline-block; display: block; - height: auto; - max-width: 100%; padding: 4px; margin-bottom: 20px; line-height: 1.428571429; @@ -5337,7 +5314,7 @@ a.thumbnail.active { } .alert-success { - color: #468847; + color: #3c763d; background-color: #dff0d8; border-color: #d6e9c6; } @@ -5347,11 +5324,11 @@ a.thumbnail.active { } .alert-success .alert-link { - color: #356635; + color: #2b542c; } .alert-info { - color: #3a87ad; + color: #31708f; background-color: #d9edf7; border-color: #bce8f1; } @@ -5361,11 +5338,11 @@ a.thumbnail.active { } .alert-info .alert-link { - color: #2d6987; + color: #245269; } .alert-warning { - color: #c09853; + color: #8a6d3b; background-color: #fcf8e3; border-color: #faebcc; } @@ -5375,11 +5352,11 @@ a.thumbnail.active { } .alert-warning .alert-link { - color: #a47e3c; + color: #66512c; } .alert-danger { - color: #b94a48; + color: #a94442; background-color: #f2dede; border-color: #ebccd1; } @@ -5389,7 +5366,7 @@ a.thumbnail.active { } .alert-danger .alert-link { - color: #953b39; + color: #843534; } @-webkit-keyframes progress-bar-stripes { @@ -5661,7 +5638,7 @@ a.list-group-item.active:focus .list-group-item-text { } .panel > .table, -.panel > .table-responsive { +.panel > .table-responsive > .table { margin-bottom: 0; } @@ -5670,6 +5647,11 @@ a.list-group-item.active:focus .list-group-item-text { border-top: 1px solid #dddddd; } +.panel > .table > tbody:first-child th, +.panel > .table > tbody:first-child td { + border-top: 0; +} + .panel > .table-bordered, .panel > .table-responsive > .table-bordered { border: 0; @@ -5735,6 +5717,7 @@ a.list-group-item.active:focus .list-group-item-text { margin-top: 0; margin-bottom: 0; font-size: 16px; + color: inherit; } .panel-title > a { @@ -5789,10 +5772,6 @@ a.list-group-item.active:focus .list-group-item-text { border-top-color: #dddddd; } -.panel-default > .panel-heading > .dropdown .caret { - border-color: #333333 transparent; -} - .panel-default > .panel-footer + .panel-collapse .panel-body { border-bottom-color: #dddddd; } @@ -5811,10 +5790,6 @@ a.list-group-item.active:focus .list-group-item-text { border-top-color: #428bca; } -.panel-primary > .panel-heading > .dropdown .caret { - border-color: #ffffff transparent; -} - .panel-primary > .panel-footer + .panel-collapse .panel-body { border-bottom-color: #428bca; } @@ -5824,7 +5799,7 @@ a.list-group-item.active:focus .list-group-item-text { } .panel-success > .panel-heading { - color: #468847; + color: #3c763d; background-color: #dff0d8; border-color: #d6e9c6; } @@ -5833,10 +5808,6 @@ a.list-group-item.active:focus .list-group-item-text { border-top-color: #d6e9c6; } -.panel-success > .panel-heading > .dropdown .caret { - border-color: #468847 transparent; -} - .panel-success > .panel-footer + .panel-collapse .panel-body { border-bottom-color: #d6e9c6; } @@ -5846,7 +5817,7 @@ a.list-group-item.active:focus .list-group-item-text { } .panel-warning > .panel-heading { - color: #c09853; + color: #8a6d3b; background-color: #fcf8e3; border-color: #faebcc; } @@ -5855,10 +5826,6 @@ a.list-group-item.active:focus .list-group-item-text { border-top-color: #faebcc; } -.panel-warning > .panel-heading > .dropdown .caret { - border-color: #c09853 transparent; -} - .panel-warning > .panel-footer + .panel-collapse .panel-body { border-bottom-color: #faebcc; } @@ -5868,7 +5835,7 @@ a.list-group-item.active:focus .list-group-item-text { } .panel-danger > .panel-heading { - color: #b94a48; + color: #a94442; background-color: #f2dede; border-color: #ebccd1; } @@ -5877,10 +5844,6 @@ a.list-group-item.active:focus .list-group-item-text { border-top-color: #ebccd1; } -.panel-danger > .panel-heading > .dropdown .caret { - border-color: #b94a48 transparent; -} - .panel-danger > .panel-footer + .panel-collapse .panel-body { border-bottom-color: #ebccd1; } @@ -5890,7 +5853,7 @@ a.list-group-item.active:focus .list-group-item-text { } .panel-info > .panel-heading { - color: #3a87ad; + color: #31708f; background-color: #d9edf7; border-color: #bce8f1; } @@ -5899,10 +5862,6 @@ a.list-group-item.active:focus .list-group-item-text { border-top-color: #bce8f1; } -.panel-info > .panel-heading > .dropdown .caret { - border-color: #3a87ad transparent; -} - .panel-info > .panel-footer + .panel-collapse .panel-body { border-bottom-color: #bce8f1; } @@ -5997,9 +5956,7 @@ button.close { position: relative; z-index: 1050; width: auto; - padding: 10px; - margin-right: auto; - margin-left: auto; + margin: 10px; } .modal-content { @@ -6097,8 +6054,7 @@ button.close { @media screen and (min-width: 768px) { .modal-dialog { width: 600px; - padding-top: 30px; - padding-bottom: 30px; + margin: 30px auto; } .modal-content { -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); @@ -6458,6 +6414,7 @@ button.close { .carousel-control:focus { color: #ffffff; text-decoration: none; + outline: none; opacity: 0.9; filter: alpha(opacity=90); } |
