From: Marius Gavrilescu Date: Mon, 27 Jul 2015 16:30:36 +0000 (+0300) Subject: Update bootswatch to 3.3.5 X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=001804841a6bb98729bf166bccedac7ea84fe7ae;hp=dee46c5bb42f8fdaa70e70d6bdd4da5072a99ecd;p=gruntmaster-page.git Update bootswatch to 3.3.5 --- diff --git a/css/themes/cyborg.css b/css/themes/cyborg.css index 32c642a..ca686c9 100644 --- a/css/themes/cyborg.css +++ b/css/themes/cyborg.css @@ -1,11 +1,16 @@ /*! - * bootswatch v3.3.4+1 + * bootswatch v3.3.5 * Homepage: http://bootswatch.com * Copyright 2012-2015 Thomas Park * Licensed under MIT * Based on Bootstrap */ -/*! normalize.css v3.0.2 | MIT License | git.io/normalize */ +/*! + * Bootstrap v3.3.5 (http://getbootstrap.com) + * Copyright 2011-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ +/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ html { font-family: sans-serif; -ms-text-size-adjust: 100%; @@ -232,9 +237,6 @@ th { h3 { page-break-after: avoid; } - select { - background: #fff !important; - } .navbar { display: none; } @@ -521,62 +523,72 @@ mark, .text-primary { color: #2a9fd6; } -a.text-primary:hover { +a.text-primary:hover, +a.text-primary:focus { color: #2180ac; } .text-success { color: #ffffff; } -a.text-success:hover { +a.text-success:hover, +a.text-success:focus { color: #e6e6e6; } .text-info { color: #ffffff; } -a.text-info:hover { +a.text-info:hover, +a.text-info:focus { color: #e6e6e6; } .text-warning { color: #ffffff; } -a.text-warning:hover { +a.text-warning:hover, +a.text-warning:focus { color: #e6e6e6; } .text-danger { color: #ffffff; } -a.text-danger:hover { +a.text-danger:hover, +a.text-danger:focus { color: #e6e6e6; } .bg-primary { color: #fff; background-color: #2a9fd6; } -a.bg-primary:hover { +a.bg-primary:hover, +a.bg-primary:focus { background-color: #2180ac; } .bg-success { background-color: #77b300; } -a.bg-success:hover { +a.bg-success:hover, +a.bg-success:focus { background-color: #558000; } .bg-info { background-color: #9933cc; } -a.bg-info:hover { +a.bg-info:hover, +a.bg-info:focus { background-color: #7a29a3; } .bg-warning { background-color: #ff8800; } -a.bg-warning:hover { +a.bg-warning:hover, +a.bg-warning:focus { background-color: #cc6d00; } .bg-danger { background-color: #cc0000; } -a.bg-danger:hover { +a.bg-danger:hover, +a.bg-danger:focus { background-color: #990000; } .page-header { @@ -1045,9 +1057,17 @@ textarea.form-control { background-color: #424242; border-color: #424242; } -.btn-default:hover, .btn-default:focus, -.btn-default.focus, +.btn-default.focus { + color: #ffffff; + background-color: #282828; + border-color: #020202; +} +.btn-default:hover { + color: #ffffff; + background-color: #282828; + border-color: #232323; +} .btn-default:active, .btn-default.active, .open > .dropdown-toggle.btn-default { @@ -1055,6 +1075,19 @@ textarea.form-control { background-color: #282828; border-color: #232323; } +.btn-default:active:hover, +.btn-default.active:hover, +.open > .dropdown-toggle.btn-default:hover, +.btn-default:active:focus, +.btn-default.active:focus, +.open > .dropdown-toggle.btn-default:focus, +.btn-default:active.focus, +.btn-default.active.focus, +.open > .dropdown-toggle.btn-default.focus { + color: #ffffff; + background-color: #161616; + border-color: #020202; +} .btn-default:active, .btn-default.active, .open > .dropdown-toggle.btn-default { @@ -1090,9 +1123,17 @@ fieldset[disabled] .btn-default.active { background-color: #2a9fd6; border-color: #2a9fd6; } -.btn-primary:hover, .btn-primary:focus, -.btn-primary.focus, +.btn-primary.focus { + color: #ffffff; + background-color: #2180ac; + border-color: #15506c; +} +.btn-primary:hover { + color: #ffffff; + background-color: #2180ac; + border-color: #1f79a3; +} .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary { @@ -1100,6 +1141,19 @@ fieldset[disabled] .btn-default.active { background-color: #2180ac; border-color: #1f79a3; } +.btn-primary:active:hover, +.btn-primary.active:hover, +.open > .dropdown-toggle.btn-primary:hover, +.btn-primary:active:focus, +.btn-primary.active:focus, +.open > .dropdown-toggle.btn-primary:focus, +.btn-primary:active.focus, +.btn-primary.active.focus, +.open > .dropdown-toggle.btn-primary.focus { + color: #ffffff; + background-color: #1b698e; + border-color: #15506c; +} .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary { @@ -1427,6 +1481,12 @@ fieldset[disabled] .btn-primary.active { .text-info:hover { color: #9933cc; } +.bg-success, +.bg-info, +.bg-warning, +.bg-danger { + color: #fff; +} .nav-tabs a, .nav-pills a, .breadcrumb a, diff --git a/css/themes/readable.css b/css/themes/readable.css index 63f7ae5..3a7b322 100644 --- a/css/themes/readable.css +++ b/css/themes/readable.css @@ -1,11 +1,16 @@ /*! - * bootswatch v3.3.4+1 + * bootswatch v3.3.5 * Homepage: http://bootswatch.com * Copyright 2012-2015 Thomas Park * Licensed under MIT * Based on Bootstrap */ -/*! normalize.css v3.0.2 | MIT License | git.io/normalize */ +/*! + * Bootstrap v3.3.5 (http://getbootstrap.com) + * Copyright 2011-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ +/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ html { font-family: sans-serif; -ms-text-size-adjust: 100%; @@ -232,9 +237,6 @@ th { h3 { page-break-after: avoid; } - select { - background: #fff !important; - } .navbar { display: none; } @@ -521,62 +523,72 @@ mark, .text-primary { color: #4582ec; } -a.text-primary:hover { +a.text-primary:hover, +a.text-primary:focus { color: #1863e6; } .text-success { color: #3fad46; } -a.text-success:hover { +a.text-success:hover, +a.text-success:focus { color: #318837; } .text-info { color: #5bc0de; } -a.text-info:hover { +a.text-info:hover, +a.text-info:focus { color: #31b0d5; } .text-warning { color: #f0ad4e; } -a.text-warning:hover { +a.text-warning:hover, +a.text-warning:focus { color: #ec971f; } .text-danger { color: #d9534f; } -a.text-danger:hover { +a.text-danger:hover, +a.text-danger:focus { color: #c9302c; } .bg-primary { color: #fff; background-color: #4582ec; } -a.bg-primary:hover { +a.bg-primary:hover, +a.bg-primary:focus { background-color: #1863e6; } .bg-success { background-color: #dff0d8; } -a.bg-success:hover { +a.bg-success:hover, +a.bg-success:focus { background-color: #c1e2b3; } .bg-info { background-color: #d9edf7; } -a.bg-info:hover { +a.bg-info:hover, +a.bg-info:focus { background-color: #afd9ee; } .bg-warning { background-color: #fcf8e3; } -a.bg-warning:hover { +a.bg-warning:hover, +a.bg-warning:focus { background-color: #f7ecb5; } .bg-danger { background-color: #f2dede; } -a.bg-danger:hover { +a.bg-danger:hover, +a.bg-danger:focus { background-color: #e4b9b9; } .page-header { @@ -1045,9 +1057,17 @@ textarea.form-control { background-color: #ffffff; border-color: #dddddd; } -.btn-default:hover, .btn-default:focus, -.btn-default.focus, +.btn-default.focus { + color: #333333; + background-color: #e6e6e6; + border-color: #9d9d9d; +} +.btn-default:hover { + color: #333333; + background-color: #e6e6e6; + border-color: #bebebe; +} .btn-default:active, .btn-default.active, .open > .dropdown-toggle.btn-default { @@ -1055,6 +1075,19 @@ textarea.form-control { background-color: #e6e6e6; border-color: #bebebe; } +.btn-default:active:hover, +.btn-default.active:hover, +.open > .dropdown-toggle.btn-default:hover, +.btn-default:active:focus, +.btn-default.active:focus, +.open > .dropdown-toggle.btn-default:focus, +.btn-default:active.focus, +.btn-default.active.focus, +.open > .dropdown-toggle.btn-default.focus { + color: #333333; + background-color: #d4d4d4; + border-color: #9d9d9d; +} .btn-default:active, .btn-default.active, .open > .dropdown-toggle.btn-default { @@ -1090,9 +1123,17 @@ fieldset[disabled] .btn-default.active { background-color: #4582ec; border-color: #4582ec; } -.btn-primary:hover, .btn-primary:focus, -.btn-primary.focus, +.btn-primary.focus { + color: #ffffff; + background-color: #1863e6; + border-color: #1045a1; +} +.btn-primary:hover { + color: #ffffff; + background-color: #1863e6; + border-color: #175fdd; +} .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary { @@ -1100,6 +1141,19 @@ fieldset[disabled] .btn-default.active { background-color: #1863e6; border-color: #175fdd; } +.btn-primary:active:hover, +.btn-primary.active:hover, +.open > .dropdown-toggle.btn-primary:hover, +.btn-primary:active:focus, +.btn-primary.active:focus, +.open > .dropdown-toggle.btn-primary:focus, +.btn-primary:active.focus, +.btn-primary.active.focus, +.open > .dropdown-toggle.btn-primary.focus { + color: #ffffff; + background-color: #1455c6; + border-color: #1045a1; +} .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary { @@ -1506,18 +1560,3 @@ legend { border: 1px solid #ddd; color: #333333; } -.badge { - padding: 1px 7px 5px; - vertical-align: 2px; - font-family: sans-serif; - font-weight: normal; -} -.panel { - box-shadow: none; -} -.panel-default .close { - color: #333333; -} -.modal .close { - color: #333333; -} diff --git a/css/themes/slate.css b/css/themes/slate.css index d20c8fe..9b484e0 100644 --- a/css/themes/slate.css +++ b/css/themes/slate.css @@ -1,11 +1,16 @@ /*! - * bootswatch v3.3.4+1 + * bootswatch v3.3.5 * Homepage: http://bootswatch.com * Copyright 2012-2015 Thomas Park * Licensed under MIT * Based on Bootstrap */ -/*! normalize.css v3.0.2 | MIT License | git.io/normalize */ +/*! + * Bootstrap v3.3.5 (http://getbootstrap.com) + * Copyright 2011-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ +/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ html { font-family: sans-serif; -ms-text-size-adjust: 100%; @@ -232,9 +237,6 @@ th { h3 { page-break-after: avoid; } - select { - background: #fff !important; - } .navbar { display: none; } @@ -521,62 +523,72 @@ mark, .text-primary { color: #7a8288; } -a.text-primary:hover { +a.text-primary:hover, +a.text-primary:focus { color: #62686d; } .text-success { color: #ffffff; } -a.text-success:hover { +a.text-success:hover, +a.text-success:focus { color: #e6e6e6; } .text-info { color: #ffffff; } -a.text-info:hover { +a.text-info:hover, +a.text-info:focus { color: #e6e6e6; } .text-warning { color: #ffffff; } -a.text-warning:hover { +a.text-warning:hover, +a.text-warning:focus { color: #e6e6e6; } .text-danger { color: #ffffff; } -a.text-danger:hover { +a.text-danger:hover, +a.text-danger:focus { color: #e6e6e6; } .bg-primary { color: #fff; background-color: #7a8288; } -a.bg-primary:hover { +a.bg-primary:hover, +a.bg-primary:focus { background-color: #62686d; } .bg-success { background-color: #62c462; } -a.bg-success:hover { +a.bg-success:hover, +a.bg-success:focus { background-color: #42b142; } .bg-info { background-color: #5bc0de; } -a.bg-info:hover { +a.bg-info:hover, +a.bg-info:focus { background-color: #31b0d5; } .bg-warning { background-color: #f89406; } -a.bg-warning:hover { +a.bg-warning:hover, +a.bg-warning:focus { background-color: #c67605; } .bg-danger { background-color: #ee5f5b; } -a.bg-danger:hover { +a.bg-danger:hover, +a.bg-danger:focus { background-color: #e9322d; } .page-header { @@ -1045,9 +1057,17 @@ textarea.form-control { background-color: #3a3f44; border-color: #3a3f44; } -.btn-default:hover, .btn-default:focus, -.btn-default.focus, +.btn-default.focus { + color: #ffffff; + background-color: #232628; + border-color: #000000; +} +.btn-default:hover { + color: #ffffff; + background-color: #232628; + border-color: #1e2023; +} .btn-default:active, .btn-default.active, .open > .dropdown-toggle.btn-default { @@ -1055,6 +1075,19 @@ textarea.form-control { background-color: #232628; border-color: #1e2023; } +.btn-default:active:hover, +.btn-default.active:hover, +.open > .dropdown-toggle.btn-default:hover, +.btn-default:active:focus, +.btn-default.active:focus, +.open > .dropdown-toggle.btn-default:focus, +.btn-default:active.focus, +.btn-default.active.focus, +.open > .dropdown-toggle.btn-default.focus { + color: #ffffff; + background-color: #121415; + border-color: #000000; +} .btn-default:active, .btn-default.active, .open > .dropdown-toggle.btn-default { @@ -1090,9 +1123,17 @@ fieldset[disabled] .btn-default.active { background-color: #7a8288; border-color: #7a8288; } -.btn-primary:hover, .btn-primary:focus, -.btn-primary.focus, +.btn-primary.focus { + color: #ffffff; + background-color: #62686d; + border-color: #3e4245; +} +.btn-primary:hover { + color: #ffffff; + background-color: #62686d; + border-color: #5d6368; +} .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary { @@ -1100,6 +1141,19 @@ fieldset[disabled] .btn-default.active { background-color: #62686d; border-color: #5d6368; } +.btn-primary:active:hover, +.btn-primary.active:hover, +.open > .dropdown-toggle.btn-primary:hover, +.btn-primary:active:focus, +.btn-primary.active:focus, +.open > .dropdown-toggle.btn-primary:focus, +.btn-primary:active.focus, +.btn-primary.active.focus, +.open > .dropdown-toggle.btn-primary.focus { + color: #ffffff; + background-color: #51565a; + border-color: #3e4245; +} .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary {