diff options
| author | Mark Otto <[email protected]> | 2013-08-06 18:29:54 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-06 18:29:54 -0700 |
| commit | 402dbfb6171e18aa44e19429e796169f02b0adf7 (patch) | |
| tree | aeb0cef7cc1b04988307a0ef79b07fbe2d7d197c /dist/css/bootstrap.css | |
| parent | 7e19b6b02ccd5417a6c2d3d418c08219773f1112 (diff) | |
| parent | 41bdd1a4823feb8b46b2fccfeec3e9c5057a0665 (diff) | |
| download | bootstrap-402dbfb6171e18aa44e19429e796169f02b0adf7.tar.xz bootstrap-402dbfb6171e18aa44e19429e796169f02b0adf7.zip | |
Merge branch '3.0.0-wip' into bs3_theme
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 839 |
1 files changed, 504 insertions, 335 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index e506b634e..46c22421c 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -564,38 +564,35 @@ dd { margin-left: 0; } -.dl-horizontal dt { - float: left; - width: 160px; - overflow: hidden; - clear: left; - text-align: right; - text-overflow: ellipsis; - white-space: nowrap; -} - -.dl-horizontal dd { - margin-left: 180px; -} - -.dl-horizontal dd:before, -.dl-horizontal dd:after { - display: table; - content: " "; -} - -.dl-horizontal dd:after { - clear: both; -} - -.dl-horizontal dd:before, -.dl-horizontal dd:after { - display: table; - content: " "; -} - -.dl-horizontal dd:after { - clear: both; +@media (min-width: 768px) { + .dl-horizontal dt { + float: left; + width: 160px; + overflow: hidden; + clear: left; + text-align: right; + text-overflow: ellipsis; + white-space: nowrap; + } + .dl-horizontal dd { + margin-left: 180px; + } + .dl-horizontal dd:before, + .dl-horizontal dd:after { + display: table; + content: " "; + } + .dl-horizontal dd:after { + clear: both; + } + .dl-horizontal dd:before, + .dl-horizontal dd:after { + display: table; + content: " "; + } + .dl-horizontal dd:after { + clear: both; + } } abbr[title], @@ -636,7 +633,6 @@ blockquote small:before { } blockquote.pull-right { - float: right; padding-right: 15px; padding-left: 0; border-right: 5px solid #eeeeee; @@ -877,7 +873,7 @@ pre code { width: 100%; } -@media (min-width: 768px) { +@media (min-width: 768px) and (max-width: 991px) { .container { max-width: 728px; } @@ -931,72 +927,105 @@ pre code { .col-sm-12 { width: 100%; } - .col-push-1 { + .col-sm-push-1 { left: 8.333333333333332%; } - .col-push-2 { + .col-sm-push-2 { left: 16.666666666666664%; } - .col-push-3 { + .col-sm-push-3 { left: 25%; } - .col-push-4 { + .col-sm-push-4 { left: 33.33333333333333%; } - .col-push-5 { + .col-sm-push-5 { left: 41.66666666666667%; } - .col-push-6 { + .col-sm-push-6 { left: 50%; } - .col-push-7 { + .col-sm-push-7 { left: 58.333333333333336%; } - .col-push-8 { + .col-sm-push-8 { left: 66.66666666666666%; } - .col-push-9 { + .col-sm-push-9 { left: 75%; } - .col-push-10 { + .col-sm-push-10 { left: 83.33333333333334%; } - .col-push-11 { + .col-sm-push-11 { left: 91.66666666666666%; } - .col-pull-1 { + .col-sm-pull-1 { right: 8.333333333333332%; } - .col-pull-2 { + .col-sm-pull-2 { right: 16.666666666666664%; } - .col-pull-3 { + .col-sm-pull-3 { right: 25%; } - .col-pull-4 { + .col-sm-pull-4 { right: 33.33333333333333%; } - .col-pull-5 { + .col-sm-pull-5 { right: 41.66666666666667%; } - .col-pull-6 { + .col-sm-pull-6 { right: 50%; } - .col-pull-7 { + .col-sm-pull-7 { right: 58.333333333333336%; } - .col-pull-8 { + .col-sm-pull-8 { right: 66.66666666666666%; } - .col-pull-9 { + .col-sm-pull-9 { right: 75%; } - .col-pull-10 { + .col-sm-pull-10 { right: 83.33333333333334%; } - .col-pull-11 { + .col-sm-pull-11 { right: 91.66666666666666%; } + .col-sm-offset-1 { + margin-left: 8.333333333333332%; + } + .col-sm-offset-2 { + margin-left: 16.666666666666664%; + } + .col-sm-offset-3 { + margin-left: 25%; + } + .col-sm-offset-4 { + margin-left: 33.33333333333333%; + } + .col-sm-offset-5 { + margin-left: 41.66666666666667%; + } + .col-sm-offset-6 { + margin-left: 50%; + } + .col-sm-offset-7 { + margin-left: 58.333333333333336%; + } + .col-sm-offset-8 { + margin-left: 66.66666666666666%; + } + .col-sm-offset-9 { + margin-left: 75%; + } + .col-sm-offset-10 { + margin-left: 83.33333333333334%; + } + .col-sm-offset-11 { + margin-left: 91.66666666666666%; + } } @media (min-width: 992px) { @@ -1053,37 +1082,103 @@ pre code { .col-lg-12 { width: 100%; } - .col-offset-1 { + .col-lg-push-1 { + left: 8.333333333333332%; + } + .col-lg-push-2 { + left: 16.666666666666664%; + } + .col-lg-push-3 { + left: 25%; + } + .col-lg-push-4 { + left: 33.33333333333333%; + } + .col-lg-push-5 { + left: 41.66666666666667%; + } + .col-lg-push-6 { + left: 50%; + } + .col-lg-push-7 { + left: 58.333333333333336%; + } + .col-lg-push-8 { + left: 66.66666666666666%; + } + .col-lg-push-9 { + left: 75%; + } + .col-lg-push-10 { + left: 83.33333333333334%; + } + .col-lg-push-11 { + left: 91.66666666666666%; + } + .col-lg-pull-1 { + right: 8.333333333333332%; + } + .col-lg-pull-2 { + right: 16.666666666666664%; + } + .col-lg-pull-3 { + right: 25%; + } + .col-lg-pull-4 { + right: 33.33333333333333%; + } + .col-lg-pull-5 { + right: 41.66666666666667%; + } + .col-lg-pull-6 { + right: 50%; + } + .col-lg-pull-7 { + right: 58.333333333333336%; + } + .col-lg-pull-8 { + right: 66.66666666666666%; + } + .col-lg-pull-9 { + right: 75%; + } + .col-lg-pull-10 { + right: 83.33333333333334%; + } + .col-lg-pull-11 { + right: 91.66666666666666%; + } + .col-lg-offset-1 { margin-left: 8.333333333333332%; } - .col-offset-2 { + .col-lg-offset-2 { margin-left: 16.666666666666664%; } - .col-offset-3 { + .col-lg-offset-3 { margin-left: 25%; } - .col-offset-4 { + .col-lg-offset-4 { margin-left: 33.33333333333333%; } - .col-offset-5 { + .col-lg-offset-5 { margin-left: 41.66666666666667%; } - .col-offset-6 { + .col-lg-offset-6 { margin-left: 50%; } - .col-offset-7 { + .col-lg-offset-7 { margin-left: 58.333333333333336%; } - .col-offset-8 { + .col-lg-offset-8 { margin-left: 66.66666666666666%; } - .col-offset-9 { + .col-lg-offset-9 { margin-left: 75%; } - .col-offset-10 { + .col-lg-offset-10 { margin-left: 83.33333333333334%; } - .col-offset-11 { + .col-lg-offset-11 { margin-left: 91.66666666666666%; } } @@ -1354,8 +1449,8 @@ input[type="number"]::-webkit-inner-spin-button { .form-control { display: block; width: 100%; - height: 38px; - padding: 8px 12px; + height: 34px; + padding: 6px 12px; font-size: 14px; line-height: 1.428571429; color: #555555; @@ -1370,10 +1465,10 @@ input[type="number"]::-webkit-inner-spin-button { } .form-control:focus { - border-color: rgba(82, 168, 236, 0.8); + border-color: #66afe9; outline: 0; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); } .form-control[disabled], @@ -1438,32 +1533,34 @@ textarea.form-control { margin-left: 10px; } -.input-large { - height: 56px; - padding: 14px 16px; +.input-lg { + height: 45px; + padding: 10px 16px; font-size: 18px; + line-height: 1.33; border-radius: 6px; } -.input-small { +.input-sm { height: 30px; padding: 5px 10px; font-size: 12px; + line-height: 1.5; border-radius: 3px; } -select.input-large { - height: 56px; - line-height: 56px; +select.input-lg { + height: 45px; + line-height: 45px; } -select.input-small { +select.input-sm { height: 30px; line-height: 30px; } -textarea.input-large, -textarea.input-small { +textarea.input-lg, +textarea.input-sm { height: auto; } @@ -1473,7 +1570,6 @@ textarea.input-small { } .has-warning .form-control { - padding-right: 32px; border-color: #c09853; -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); @@ -1497,7 +1593,6 @@ textarea.input-small { } .has-error .form-control { - padding-right: 32px; border-color: #b94a48; -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); @@ -1521,7 +1616,6 @@ textarea.input-small { } .has-success .form-control { - padding-right: 32px; border-color: #468847; -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); @@ -1539,6 +1633,11 @@ textarea.input-small { border-color: #468847; } +.form-control-static { + padding-top: 6px; + margin-bottom: 0; +} + .help-block { display: block; margin-top: 5px; @@ -1546,12 +1645,75 @@ textarea.input-small { color: #737373; } +.form-inline .form-control, +.form-inline .radio, +.form-inline .checkbox { + display: inline-block; +} + +.form-inline .radio, +.form-inline .checkbox { + padding-left: 0; + margin-top: 0; + margin-bottom: 0; +} + +.form-inline .radio input[type="radio"], +.form-inline .checkbox input[type="checkbox"] { + float: none; + margin-left: 0; +} + +.form-horizontal .control-label, +.form-horizontal .radio-inline, +.form-horizontal .checkbox-inline { + padding-top: 6px; +} + +.form-horizontal .form-group:before, +.form-horizontal .form-group:after { + display: table; + content: " "; +} + +.form-horizontal .form-group:after { + clear: both; +} + +.form-horizontal .form-group:before, +.form-horizontal .form-group:after { + display: table; + content: " "; +} + +.form-horizontal .form-group:after { + clear: both; +} + +@media (min-width: 768px) { + .form-horizontal .form-group { + margin-right: -15px; + margin-left: -15px; + } +} + +.form-horizontal .form-group .row { + margin-right: -15px; + margin-left: -15px; +} + +@media (min-width: 768px) { + .form-horizontal .control-label { + text-align: right; + } +} + .btn { display: inline-block; - padding: 8px 12px; + padding: 6px 12px; margin-bottom: 0; font-size: 14px; - font-weight: 500; + font-weight: bold; line-height: 1.428571429; text-align: center; white-space: nowrap; @@ -1574,7 +1736,7 @@ textarea.input-small { .btn:hover, .btn:focus { - color: #ffffff; + color: #333333; text-decoration: none; } @@ -1597,17 +1759,18 @@ fieldset[disabled] .btn { } .btn-default { - color: #ffffff; - background-color: #474949; - border-color: #474949; + color: #333333; + background-color: #ffffff; + border-color: #cccccc; } .btn-default:hover, .btn-default:focus, .btn-default:active, .btn-default.active { - background-color: #3a3c3c; - border-color: #2e2f2f; + color: #333333; + background-color: #ebebeb; + border-color: #adadad; } .btn-default.disabled, @@ -1625,22 +1788,23 @@ fieldset[disabled] .btn-default:active, .btn-default.disabled.active, .btn-default[disabled].active, fieldset[disabled] .btn-default.active { - background-color: #474949; - border-color: #474949; + background-color: #ffffff; + border-color: #cccccc; } .btn-primary { color: #ffffff; background-color: #428bca; - border-color: #428bca; + border-color: #357ebd; } .btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active { - background-color: #357ebd; - border-color: #3071a9; + color: #ffffff; + background-color: #3276b1; + border-color: #285e8e; } .btn-primary.disabled, @@ -1659,21 +1823,22 @@ fieldset[disabled] .btn-primary:active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { background-color: #428bca; - border-color: #428bca; + border-color: #357ebd; } .btn-warning { color: #ffffff; background-color: #f0ad4e; - border-color: #f0ad4e; + border-color: #eea236; } .btn-warning:hover, .btn-warning:focus, .btn-warning:active, .btn-warning.active { - background-color: #eea236; - border-color: #ec971f; + color: #ffffff; + background-color: #ed9c28; + border-color: #d58512; } .btn-warning.disabled, @@ -1692,21 +1857,22 @@ fieldset[disabled] .btn-warning:active, .btn-warning[disabled].active, fieldset[disabled] .btn-warning.active { background-color: #f0ad4e; - border-color: #f0ad4e; + border-color: #eea236; } .btn-danger { color: #ffffff; background-color: #d9534f; - border-color: #d9534f; + border-color: #d43f3a; } .btn-danger:hover, .btn-danger:focus, .btn-danger:active, .btn-danger.active { - background-color: #d43f3a; - border-color: #c9302c; + color: #ffffff; + background-color: #d2322d; + border-color: #ac2925; } .btn-danger.disabled, @@ -1725,21 +1891,22 @@ fieldset[disabled] .btn-danger:active, .btn-danger[disabled].active, fieldset[disabled] .btn-danger.active { background-color: #d9534f; - border-color: #d9534f; + border-color: #d43f3a; } .btn-success { color: #ffffff; background-color: #5cb85c; - border-color: #5cb85c; + border-color: #4cae4c; } .btn-success:hover, .btn-success:focus, .btn-success:active, .btn-success.active { - background-color: #4cae4c; - border-color: #449d44; + color: #ffffff; + background-color: #47a447; + border-color: #398439; } .btn-success.disabled, @@ -1758,21 +1925,22 @@ fieldset[disabled] .btn-success:active, .btn-success[disabled].active, fieldset[disabled] .btn-success.active { background-color: #5cb85c; - border-color: #5cb85c; + border-color: #4cae4c; } .btn-info { color: #ffffff; background-color: #5bc0de; - border-color: #5bc0de; + border-color: #46b8da; } .btn-info:hover, .btn-info:focus, .btn-info:active, .btn-info.active { - background-color: #46b8da; - border-color: #31b0d5; + color: #ffffff; + background-color: #39b3d7; + border-color: #269abc; } .btn-info.disabled, @@ -1791,7 +1959,7 @@ fieldset[disabled] .btn-info:active, .btn-info[disabled].active, fieldset[disabled] .btn-info.active { background-color: #5bc0de; - border-color: #5bc0de; + border-color: #46b8da; } .btn-link { @@ -1828,25 +1996,26 @@ fieldset[disabled] .btn-link { fieldset[disabled] .btn-link:hover, .btn-link[disabled]:focus, fieldset[disabled] .btn-link:focus { - color: #333333; + color: #999999; text-decoration: none; } -.btn-large { - padding: 14px 16px; +.btn-lg { + padding: 10px 16px; font-size: 18px; + line-height: 1.33; border-radius: 6px; } -.btn-small, -.btn-mini { +.btn-sm, +.btn-xs { padding: 5px 10px; font-size: 12px; line-height: 1.5; border-radius: 3px; } -.btn-mini { +.btn-xs { padding: 3px 5px; } @@ -1894,6 +2063,7 @@ input[type="button"].btn-block { } .input-group { + position: relative; display: table; border-collapse: separate; } @@ -1929,27 +2099,24 @@ input[type="button"].btn-block { } .input-group-addon { - padding: 8px 12px; + padding: 6px 12px; font-size: 14px; font-weight: normal; - line-height: 1.428571429; + line-height: 1; text-align: center; background-color: #eeeeee; border: 1px solid #cccccc; border-radius: 4px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; } -.input-group-addon.input-small { +.input-group-addon.input-sm { padding: 5px 10px; font-size: 12px; border-radius: 3px; } -.input-group-addon.input-large { - padding: 14px 16px; +.input-group-addon.input-lg { + padding: 10px 16px; font-size: 18px; border-radius: 6px; } @@ -2003,60 +2170,6 @@ input[type="button"].btn-block { z-index: 2; } -.form-inline .form-control, -.form-inline .radio, -.form-inline .checkbox { - display: inline-block; -} - -.form-inline .radio, -.form-inline .checkbox { - margin-top: 0; - margin-bottom: 0; -} - -.form-horizontal .control-label { - padding-top: 9px; -} - -.form-horizontal .form-group:before, -.form-horizontal .form-group:after { - display: table; - content: " "; -} - -.form-horizontal .form-group:after { - clear: both; -} - -.form-horizontal .form-group:before, -.form-horizontal .form-group:after { - display: table; - content: " "; -} - -.form-horizontal .form-group:after { - clear: both; -} - -@media (min-width: 768px) { - .form-horizontal .form-group { - margin-right: -15px; - margin-left: -15px; - } -} - -.form-horizontal .form-group .row { - margin-right: -15px; - margin-left: -15px; -} - -@media (min-width: 768px) { - .form-horizontal .control-label { - text-align: right; - } -} - .caret { display: inline-block; width: 0; @@ -2069,6 +2182,10 @@ input[type="button"].btn-block { content: ""; } +.dropdown { + position: relative; +} + .dropdown-menu { position: absolute; top: 100%; @@ -2228,6 +2345,10 @@ input[type="button"].btn-block { margin-right: -15px; } +.list-group-item > .badge + .badge { + margin-right: 0; +} + .list-group-item-heading { margin-top: 0; margin-bottom: 5px; @@ -2277,6 +2398,23 @@ a.list-group-item.active .list-group-item-text { box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); } +.panel .list-group { + margin: 15px -15px -15px; +} + +.panel .list-group .list-group-item { + border-width: 1px 0; +} + +.panel .list-group .list-group-item:first-child { + border-top-right-radius: 0; + border-top-left-radius: 0; +} + +.panel .list-group .list-group-item:last-child { + border-bottom: 0; +} + .panel-heading { padding: 10px 15px; margin: -15px -15px 15px; @@ -2293,6 +2431,10 @@ a.list-group-item.active .list-group-item-text { font-weight: 500; } +.panel-title > a { + color: inherit; +} + .panel-footer { padding: 10px 15px; margin: 15px -15px -15px; @@ -2352,23 +2494,6 @@ a.list-group-item.active .list-group-item-text { border-color: #bce8f1; } -.list-group-flush { - margin: 15px -15px -15px; -} - -.list-group-flush .list-group-item { - border-width: 1px 0; -} - -.list-group-flush .list-group-item:first-child { - border-top-right-radius: 0; - border-top-left-radius: 0; -} - -.list-group-flush .list-group-item:last-child { - border-bottom: 0; -} - .well { min-height: 20px; padding: 19px; @@ -2385,12 +2510,12 @@ a.list-group-item.active .list-group-item-text { border-color: rgba(0, 0, 0, 0.15); } -.well-large { +.well-lg { padding: 24px; border-radius: 6px; } -.well-small { +.well-sm { padding: 9px; border-radius: 3px; } @@ -2493,10 +2618,6 @@ button.close { border-bottom-color: #ffffff; } -.nav > .pull-right { - float: right; -} - .nav .nav-divider { height: 1px; margin: 9px 0; @@ -2504,33 +2625,6 @@ button.close { background-color: #e5e5e5; } -.nav-justified { - width: 100%; -} - -.nav-justified > li { - display: table-cell; - float: none; - width: 1%; -} - -.nav-justified > li > a { - text-align: center; -} - -.nav-tabs-justified { - border-bottom: 0; -} - -.nav-tabs-justified > li > a { - margin-right: 0; - border-bottom: 1px solid #dddddd; -} - -.nav-tabs-justified > .active > a { - border-bottom-color: #ffffff; -} - .nav-tabs { border-bottom: 1px solid #dddddd; } @@ -2613,6 +2707,33 @@ button.close { margin-left: 0; } +.nav-justified { + width: 100%; +} + +.nav-justified > li { + display: table-cell; + float: none; + width: 1%; +} + +.nav-justified > li > a { + text-align: center; +} + +.nav-tabs-justified { + border-bottom: 0; +} + +.nav-tabs-justified > li > a { + margin-right: 0; + border-bottom: 1px solid #dddddd; +} + +.nav-tabs-justified > .active > a { + border-bottom-color: #ffffff; +} + .tabbable:before, .tabbable:after { display: table; @@ -2690,7 +2811,6 @@ button.close { } .navbar-nav { - margin-top: 10px; margin-bottom: 15px; } @@ -2748,6 +2868,44 @@ button.close { margin-bottom: 0; } +.nav-collapse { + padding-bottom: 15px; +} + +.nav-collapse:before, +.nav-collapse:after { + display: table; + content: " "; +} + +.nav-collapse:after { + clear: both; +} + +.nav-collapse:before, +.nav-collapse:after { + display: table; + content: " "; +} + +.nav-collapse:after { + clear: both; +} + +.navbar-toggle + .nav-collapse { + width: 100%; + margin-top: 50px; +} + +@media (max-width: 768px) { + .nav-collapse-scrollable { + max-height: 360px; + margin-bottom: 15px; + overflow-y: scroll; + -webkit-overflow-scrolling: touch; + } +} + .navbar-brand { display: block; max-width: 200px; @@ -2769,12 +2927,13 @@ button.close { } .navbar-toggle { - position: absolute; - top: 9px; - right: 10px; + position: relative; + float: right; width: 48px; - height: 32px; - padding: 8px 12px; + height: 34px; + padding: 6px 12px; + margin-top: 8px; + margin-bottom: 8px; background-color: transparent; border: 1px solid #dddddd; border-radius: 4px; @@ -2798,8 +2957,8 @@ button.close { } .navbar-form { - margin-top: 6px; - margin-bottom: 6px; + margin-top: 8px; + margin-bottom: 8px; } .navbar-form .form-control, @@ -2810,10 +2969,17 @@ button.close { .navbar-form .radio, .navbar-form .checkbox { + padding-left: 0; margin-top: 0; margin-bottom: 0; } +.navbar-form .radio input[type="radio"], +.navbar-form .checkbox input[type="checkbox"] { + float: none; + margin-left: 0; +} + .navbar-nav > li > .dropdown-menu { margin-top: 0; border-top-right-radius: 0; @@ -2938,6 +3104,7 @@ button.close { @media screen and (min-width: 768px) { .navbar-brand { float: left; + max-width: none; margin-right: 5px; margin-left: -15px; } @@ -2953,7 +3120,6 @@ button.close { border-radius: 0; } .navbar-nav.pull-right { - float: right; width: auto; } .navbar-toggle { @@ -2965,15 +3131,18 @@ button.close { .nav-collapse.collapse { display: block !important; height: auto !important; + padding-bottom: 0; overflow: visible !important; } } .navbar-btn { - margin-top: 6px; + margin-top: 8px; } .navbar-text { + float: left; + padding: 0 15px; margin-top: 15px; margin-bottom: 15px; } @@ -2994,12 +3163,28 @@ button.close { color: #ffffff; } -.btn .caret { - border-top-color: #ffffff; +.btn-default .caret { + border-top-color: #333333; } -.dropup .btn .caret { - border-bottom-color: #ffffff; +.btn-primary .caret, +.btn-success .caret, +.btn-warning .caret, +.btn-danger .caret, +.btn-info .caret { + border-top-color: #fff; +} + +.btn-default .dropup .caret { + border-bottom-color: #333333; +} + +.btn-primary .dropup .caret, +.btn-success .dropup .caret, +.btn-warning .dropup .caret, +.btn-danger .dropup .caret, +.btn-info .dropup .caret { + border-bottom-color: #fff; } .btn-group, @@ -3020,10 +3205,17 @@ button.close { .btn-group > .btn:focus, .btn-group-vertical > .btn:focus, .btn-group > .btn:active, -.btn-group-vertical > .btn:active { +.btn-group-vertical > .btn:active, +.btn-group > .btn.active, +.btn-group-vertical > .btn.active { z-index: 2; } +.btn-group > .btn:focus, +.btn-group-vertical > .btn:focus { + outline: none; +} + .btn-group .btn + .btn { margin-left: -1px; } @@ -3107,7 +3299,7 @@ button.close { padding-left: 8px; } -.btn-group > .btn-large + .dropdown-toggle { +.btn-group > .btn-lg + .dropdown-toggle { padding-right: 12px; padding-left: 12px; } @@ -3121,11 +3313,11 @@ button.close { margin-left: 0; } -.btn-large .caret { +.btn-lg .caret { border-width: 5px; } -.dropup .btn-large .caret { +.dropup .btn-lg .caret { border-bottom-width: 5px; } @@ -3144,12 +3336,12 @@ button.close { border-radius: 0; } -.btn-group-vertical .btn:first-child { +.btn-group-vertical .btn:first-child:not(:last-child) { border-bottom-right-radius: 0; border-bottom-left-radius: 0; } -.btn-group-vertical .btn:last-child { +.btn-group-vertical .btn:last-child:not(:first-child) { border-top-right-radius: 0; border-top-left-radius: 0; } @@ -3157,6 +3349,7 @@ button.close { .btn-group-justified { display: table; width: 100%; + table-layout: fixed; } .btn-group-justified .btn { @@ -3206,7 +3399,7 @@ button.close { .pagination > li > a, .pagination > li > span { float: left; - padding: 4px 12px; + padding: 6px 12px; line-height: 1.428571429; text-decoration: none; background-color: #ffffff; @@ -3249,38 +3442,38 @@ button.close { background-color: #ffffff; } -.pagination-large > li > a, -.pagination-large > li > span { - padding: 14px 16px; +.pagination-lg > li > a, +.pagination-lg > li > span { + padding: 10px 16px; font-size: 18px; } -.pagination-large > li:first-child > a, -.pagination-large > li:first-child > span { +.pagination-lg > li:first-child > a, +.pagination-lg > li:first-child > span { border-bottom-left-radius: 6px; border-top-left-radius: 6px; } -.pagination-large > li:last-child > a, -.pagination-large > li:last-child > span { +.pagination-lg > li:last-child > a, +.pagination-lg > li:last-child > span { border-top-right-radius: 6px; border-bottom-right-radius: 6px; } -.pagination-small > li > a, -.pagination-small > li > span { +.pagination-sm > li > a, +.pagination-sm > li > span { padding: 5px 10px; font-size: 12px; } -.pagination-small > li:first-child > a, -.pagination-small > li:first-child > span { +.pagination-sm > li:first-child > a, +.pagination-sm > li:first-child > span { border-bottom-left-radius: 3px; border-top-left-radius: 3px; } -.pagination-small > li:last-child > a, -.pagination-small > li:last-child > span { +.pagination-sm > li:last-child > a, +.pagination-sm > li:last-child > span { border-top-right-radius: 3px; border-bottom-right-radius: 3px; } @@ -3376,7 +3569,7 @@ button.close { transition: transform 0.3s ease-out; } -.modal.fade.in .modal-dialog { +.modal.in .modal-dialog { -webkit-transform: translate(0, 0); -ms-transform: translate(0, 0); transform: translate(0, 0); @@ -3417,7 +3610,7 @@ button.close { filter: alpha(opacity=0); } -.modal-backdrop.fade.in { +.modal-backdrop.in { opacity: 0.5; filter: alpha(opacity=50); } @@ -3508,8 +3701,8 @@ button.close { } .tooltip.in { - opacity: 1; - filter: alpha(opacity=100); + opacity: 0.9; + filter: alpha(opacity=90); } .tooltip.top { @@ -3538,7 +3731,7 @@ button.close { color: #ffffff; text-align: center; text-decoration: none; - background-color: rgba(0, 0, 0, 0.9); + background-color: #000000; border-radius: 4px; } @@ -3554,21 +3747,21 @@ button.close { bottom: 0; left: 50%; margin-left: -5px; - border-top-color: rgba(0, 0, 0, 0.9); + border-top-color: #000000; border-width: 5px 5px 0; } .tooltip.top-left .tooltip-arrow { bottom: 0; left: 5px; - border-top-color: rgba(0, 0, 0, 0.9); + border-top-color: #000000; border-width: 5px 5px 0; } .tooltip.top-right .tooltip-arrow { right: 5px; bottom: 0; - border-top-color: rgba(0, 0, 0, 0.9); + border-top-color: #000000; border-width: 5px 5px 0; } @@ -3576,7 +3769,7 @@ button.close { top: 50%; left: 0; margin-top: -5px; - border-right-color: rgba(0, 0, 0, 0.9); + border-right-color: #000000; border-width: 5px 5px 5px 0; } @@ -3584,7 +3777,7 @@ button.close { top: 50%; right: 0; margin-top: -5px; - border-left-color: rgba(0, 0, 0, 0.9); + border-left-color: #000000; border-width: 5px 0 5px 5px; } @@ -3592,21 +3785,21 @@ button.close { top: 0; left: 50%; margin-left: -5px; - border-bottom-color: rgba(0, 0, 0, 0.9); + border-bottom-color: #000000; border-width: 0 5px 5px; } .tooltip.bottom-left .tooltip-arrow { top: 0; left: 5px; - border-bottom-color: rgba(0, 0, 0, 0.9); + border-bottom-color: #000000; border-width: 0 5px 5px; } .tooltip.bottom-right .tooltip-arrow { top: 0; right: 5px; - border-bottom-color: rgba(0, 0, 0, 0.9); + border-bottom-color: #000000; border-width: 0 5px 5px; } @@ -3750,7 +3943,7 @@ button.close { } .alert { - padding: 10px 35px 10px 15px; + padding: 15px 35px 15px 15px; margin-bottom: 20px; color: #c09853; background-color: #fcf8e3; @@ -3768,7 +3961,7 @@ button.close { } .alert .alert-link { - font-weight: 500; + font-weight: bold; color: #a47e3c; } @@ -3779,6 +3972,15 @@ button.close { color: inherit; } +.alert > p, +.alert > ul { + margin-bottom: 0; +} + +.alert > p + p { + margin-top: 5px; +} + .alert-success { color: #468847; background-color: #dff0d8; @@ -3821,20 +4023,6 @@ button.close { color: #2d6987; } -.alert-block { - padding-top: 15px; - padding-bottom: 15px; -} - -.alert-block > p, -.alert-block > ul { - margin-bottom: 0; -} - -.alert-block p + p { - margin-top: 5px; -} - .thumbnail, .img-thumbnail { padding: 4px; @@ -3918,7 +4106,6 @@ a.thumbnail:focus { text-align: center; white-space: nowrap; vertical-align: baseline; - background-color: #999999; border-radius: .25em; } @@ -3927,6 +4114,14 @@ a.thumbnail:focus { color: #ffffff; text-decoration: none; cursor: pointer; +} + +.label-default { + background-color: #999999; +} + +.label-default[href]:hover, +.label-default[href]:focus { background-color: #808080; } @@ -4025,15 +4220,6 @@ a.list-group-item.active > .badge, } } -@-ms-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - @-o-keyframes progress-bar-stripes { from { background-position: 0 0; @@ -4077,7 +4263,6 @@ a.list-group-item.active > .badge, } .progress-striped .progress-bar { - background-color: #428bca; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); @@ -4098,7 +4283,6 @@ a.list-group-item.active > .badge, } .progress-striped .progress-bar-danger { - background-color: #d9534f; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); @@ -4110,7 +4294,6 @@ a.list-group-item.active > .badge, } .progress-striped .progress-bar-success { - background-color: #5cb85c; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); @@ -4122,7 +4305,6 @@ a.list-group-item.active > .badge, } .progress-striped .progress-bar-warning { - background-color: #f0ad4e; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); @@ -4134,7 +4316,6 @@ a.list-group-item.active > .badge, } .progress-striped .progress-bar-info { - background-color: #5bc0de; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); @@ -4244,8 +4425,6 @@ a.list-group-item.active > .badge, } .carousel-control.left { - background-color: rgba(0, 0, 0, 0.0001); - background-color: transparent; background-image: -webkit-gradient(linear, 0 top, 100% top, from(rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0.0001))); background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, 0.5) 0), color-stop(rgba(0, 0, 0, 0.0001) 100%)); background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.5) 0, rgba(0, 0, 0, 0.0001) 100%); @@ -4257,8 +4436,6 @@ a.list-group-item.active > .badge, .carousel-control.right { right: 0; left: auto; - background-color: rgba(0, 0, 0, 0.5); - background-color: transparent; background-image: -webkit-gradient(linear, 0 top, 100% top, from(rgba(0, 0, 0, 0.0001)), to(rgba(0, 0, 0, 0.5))); background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, 0.0001) 0), color-stop(rgba(0, 0, 0, 0.5) 100%)); background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.0001) 0, rgba(0, 0, 0, 0.5) 100%); @@ -4303,9 +4480,9 @@ a.list-group-item.active > .badge, bottom: 10px; left: 50%; z-index: 15; - width: 120px; + width: 60%; padding-left: 0; - margin-left: -60px; + margin-left: -30%; text-align: center; list-style: none; } @@ -4405,11 +4582,11 @@ a.list-group-item.active > .badge, } .pull-right { - float: right; + float: right !important; } .pull-left { - float: left; + float: left !important; } .hide { @@ -4698,29 +4875,27 @@ td.visible-print { .btn-default { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #2e2f2f; - background-image: -webkit-gradient(linear, left 0%, left 100%, from(#474949), to(#2e2f2f)); - background-image: -webkit-linear-gradient(top, #474949, 0%, #2e2f2f, 100%); - background-image: -moz-linear-gradient(top, #474949 0%, #2e2f2f 100%); - background-image: linear-gradient(to bottom, #474949 0%, #2e2f2f 100%); + background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#e6e6e6)); + background-image: -webkit-linear-gradient(top, #ffffff, 0%, #e6e6e6, 100%); + background-image: -moz-linear-gradient(top, #ffffff 0%, #e6e6e6 100%); + background-image: linear-gradient(to bottom, #ffffff 0%, #e6e6e6 100%); background-repeat: repeat-x; - border-color: #292a2a; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff474949', endColorstr='#ff2e2f2f', GradientType=0); + border-color: #e0e0e0; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075); } .btn-default:active, .btn-default.active { - background-color: #2e2f2f; - border-color: #292a2a; + background-color: #e6e6e6; + border-color: #e0e0e0; -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); } .btn-primary { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #3071a9; background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#3071a9)); background-image: -webkit-linear-gradient(top, #428bca, 0%, #3071a9, 100%); background-image: -moz-linear-gradient(top, #428bca 0%, #3071a9 100%); @@ -4742,7 +4917,6 @@ td.visible-print { .btn-success { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #449d44; background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5cb85c), to(#449d44)); background-image: -webkit-linear-gradient(top, #5cb85c, 0%, #449d44, 100%); background-image: -moz-linear-gradient(top, #5cb85c 0%, #449d44 100%); @@ -4764,7 +4938,6 @@ td.visible-print { .btn-warning { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #ec971f; background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f0ad4e), to(#ec971f)); background-image: -webkit-linear-gradient(top, #f0ad4e, 0%, #ec971f, 100%); background-image: -moz-linear-gradient(top, #f0ad4e 0%, #ec971f 100%); @@ -4786,7 +4959,6 @@ td.visible-print { .btn-danger { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #c9302c; background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9534f), to(#c9302c)); background-image: -webkit-linear-gradient(top, #d9534f, 0%, #c9302c, 100%); background-image: -moz-linear-gradient(top, #d9534f 0%, #c9302c 100%); @@ -4808,7 +4980,6 @@ td.visible-print { .btn-info { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #31b0d5; background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5bc0de), to(#31b0d5)); background-image: -webkit-linear-gradient(top, #5bc0de, 0%, #31b0d5, 100%); background-image: -moz-linear-gradient(top, #5bc0de 0%, #31b0d5 100%); @@ -4829,7 +5000,6 @@ td.visible-print { } .navbar { - background-color: #eeeeee; background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#eeeeee)); background-image: -webkit-linear-gradient(top, #ffffff, 0%, #eeeeee, 100%); background-image: -moz-linear-gradient(top, #ffffff 0%, #eeeeee 100%); @@ -4839,7 +5009,6 @@ td.visible-print { } .navbar-inverse { - background-color: #222222; background-image: -webkit-gradient(linear, left 0%, left 100%, from(#3c3c3c), to(#222222)); background-image: -webkit-linear-gradient(top, #3c3c3c, 0%, #222222, 100%); background-image: -moz-linear-gradient(top, #3c3c3c 0%, #222222 100%); |
