diff options
author | Mark Otto <otto@github.com> | 2013-12-07 23:47:37 +0400 |
---|---|---|
committer | Mark Otto <otto@github.com> | 2013-12-07 23:47:37 +0400 |
commit | c07632e4e8398f55d796d00b520ca43df38dbf29 (patch) | |
tree | 100364c1095e063b1f2889af2c30d4b6eb828353 /dist/css/bootstrap.css | |
parent | 107b334d349be065421967553f57aa186736ffcf (diff) |
Reorder button and table variants for consistent order
Diffstat (limited to 'dist/css/bootstrap.css')
-rw-r--r-- | dist/css/bootstrap.css | 128 |
1 files changed, 64 insertions, 64 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index f9d3907acd..435c969d56 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1767,24 +1767,6 @@ table th[class*="col-"] { background-color: #d0e9c6; } -.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 > .danger:hover, -.table-hover > tbody > .danger:hover > td, -.table-hover > tbody > .danger:hover > th { - background-color: #ebcccc; -} - .table > thead > tr > .warning, .table > tbody > tr > .warning, .table > tfoot > tr > .warning, @@ -1803,6 +1785,24 @@ table th[class*="col-"] { background-color: #faf2cc; } +.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 > .danger:hover, +.table-hover > tbody > .danger:hover > td, +.table-hover > tbody > .danger:hover > th { + background-color: #ebcccc; +} + @media (max-width: 767px) { .table-responsive { width: 100%; @@ -2393,6 +2393,52 @@ fieldset[disabled] .btn-primary.active { background-color: #ffffff; } +.btn-success { + color: #ffffff; + background-color: #5cb85c; + border-color: #4cae4c; +} + +.btn-success:hover, +.btn-success:focus, +.btn-success:active, +.btn-success.active, +.open .dropdown-toggle.btn-success { + color: #ffffff; + background-color: #47a447; + border-color: #398439; +} + +.btn-success:active, +.btn-success.active, +.open .dropdown-toggle.btn-success { + background-image: none; +} + +.btn-success.disabled, +.btn-success[disabled], +fieldset[disabled] .btn-success, +.btn-success.disabled:hover, +.btn-success[disabled]:hover, +fieldset[disabled] .btn-success:hover, +.btn-success.disabled:focus, +.btn-success[disabled]:focus, +fieldset[disabled] .btn-success:focus, +.btn-success.disabled:active, +.btn-success[disabled]:active, +fieldset[disabled] .btn-success:active, +.btn-success.disabled.active, +.btn-success[disabled].active, +fieldset[disabled] .btn-success.active { + background-color: #5cb85c; + border-color: #4cae4c; +} + +.btn-success .badge { + color: #5cb85c; + background-color: #ffffff; +} + .btn-warning { color: #ffffff; background-color: #f0ad4e; @@ -2485,52 +2531,6 @@ fieldset[disabled] .btn-danger.active { background-color: #ffffff; } -.btn-success { - color: #ffffff; - background-color: #5cb85c; - border-color: #4cae4c; -} - -.btn-success:hover, -.btn-success:focus, -.btn-success:active, -.btn-success.active, -.open .dropdown-toggle.btn-success { - color: #ffffff; - background-color: #47a447; - border-color: #398439; -} - -.btn-success:active, -.btn-success.active, -.open .dropdown-toggle.btn-success { - background-image: none; -} - -.btn-success.disabled, -.btn-success[disabled], -fieldset[disabled] .btn-success, -.btn-success.disabled:hover, -.btn-success[disabled]:hover, -fieldset[disabled] .btn-success:hover, -.btn-success.disabled:focus, -.btn-success[disabled]:focus, -fieldset[disabled] .btn-success:focus, -.btn-success.disabled:active, -.btn-success[disabled]:active, -fieldset[disabled] .btn-success:active, -.btn-success.disabled.active, -.btn-success[disabled].active, -fieldset[disabled] .btn-success.active { - background-color: #5cb85c; - border-color: #4cae4c; -} - -.btn-success .badge { - color: #5cb85c; - background-color: #ffffff; -} - .btn-info { color: #ffffff; background-color: #5bc0de; |