From ba94cc447a0d0d6a0e4f445539e61715befd6978 Mon Sep 17 00:00:00 2001 From: Jessika Mika Caldera Date: Wed, 25 Feb 2015 11:15:33 -0500 Subject: [PATCH 1/3] Sherman Button Fixes For all theme options. --- css/sherman-black.css | 150 +++++++++++++++--------------- css/sherman-grey.css | 150 +++++++++++++++--------------- css/sherman-red.css | 150 +++++++++++++++--------------- sass/sherman-variables-black.scss | 4 +- sass/sherman-variables-grey.scss | 4 +- sass/sherman-variables-red.scss | 4 +- 6 files changed, 231 insertions(+), 231 deletions(-) diff --git a/css/sherman-black.css b/css/sherman-black.css index b62fcb3..43e98d6 100644 --- a/css/sherman-black.css +++ b/css/sherman-black.css @@ -4911,10 +4911,10 @@ a.label:hover, a.label:focus { } .label-default { - background-color: #676767; + background-color: #ffffff; } .label-default[href]:hover, .label-default[href]:focus { - background-color: #4e4e4e; + background-color: #e6e6e6; } .label-primary { @@ -4932,10 +4932,10 @@ a.label:hover, a.label:focus { } .label-info { - background-color: #d7d7d7; + background-color: #5b9fde; } .label-info[href]:hover, .label-info[href]:focus { - background-color: #bebebe; + background-color: #3186d5; } .label-warning { @@ -5221,7 +5221,7 @@ a.thumbnail.active { } .progress-bar-info { - background-color: #d7d7d7; + background-color: #5b9fde; } .progress-striped .progress-bar-info { 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); @@ -8661,35 +8661,35 @@ body { } } #footers #mega-footer .btn.btn-default { - background: #676767; - background: -moz-linear-gradient(top, #747474 0%, #676767 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #747474), color-stop(100%, #676767)); - background: -webkit-linear-gradient(top, #747474 0%, #676767 100%); - background: -o-linear-gradient(top, #747474 0%, #676767 100%); - background: -ms-linear-gradient(top, #747474 0%, #676767 100%); - background: linear-gradient(to bottom, #747474 0%, #676767 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='ligten(#676767, 5%)', endColorstr='#676767',GradientType=0 ); + background: #ffffff; + background: -moz-linear-gradient(top, white 0%, #ffffff 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, white), color-stop(100%, #ffffff)); + background: -webkit-linear-gradient(top, white 0%, #ffffff 100%); + background: -o-linear-gradient(top, white 0%, #ffffff 100%); + background: -ms-linear-gradient(top, white 0%, #ffffff 100%); + background: linear-gradient(to bottom, white 0%, #ffffff 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='ligten(#ffffff, 5%)', endColorstr='#ffffff',GradientType=0 ); filter: none; - border-color: #5f5f5f; + border-color: #f7f7f7; opacity: 0.9; } #footers #mega-footer .btn.btn-default:hover { opacity: 1; - background-color: #1a1a1a; - border-color: #414141; + background-color: #b3b3b3; + border-color: #d9d9d9; } #footers #mega-footer .btn.btn-default:focus { - outline-color: #676767; + outline-color: #ffffff; opacity: 1; } #footers #mega-footer .btn.btn-default.active { - -moz-box-shadow: inset 0 0 3px #676767; - -webkit-box-shadow: inset 0 0 3px #676767; - box-shadow: inset 0 0 3px #676767; + -moz-box-shadow: inset 0 0 3px #ffffff; + -webkit-box-shadow: inset 0 0 3px #ffffff; + box-shadow: inset 0 0 3px #ffffff; } #footers #mega-footer .btn.btn-default.dropdown-toggle { - background-color: #414141; - border-color: #535353; + background-color: #d9d9d9; + border-color: #ebebeb; } #footers #mega-footer .btn.btn-primary { background: #0b2347; @@ -8754,36 +8754,36 @@ body { border-color: #3ca230; } #footers #mega-footer .btn.btn-info { - background: #d7d7d7; - background: -moz-linear-gradient(top, #e4e4e4 0%, #d7d7d7 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #e4e4e4), color-stop(100%, #d7d7d7)); - background: -webkit-linear-gradient(top, #e4e4e4 0%, #d7d7d7 100%); - background: -o-linear-gradient(top, #e4e4e4 0%, #d7d7d7 100%); - background: -ms-linear-gradient(top, #e4e4e4 0%, #d7d7d7 100%); - background: linear-gradient(to bottom, #e4e4e4 0%, #d7d7d7 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='ligten(#d7d7d7, 5%)', endColorstr='#d7d7d7',GradientType=0 ); + background: #5b9fde; + background: -moz-linear-gradient(top, #70abe2 0%, #5b9fde 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #70abe2), color-stop(100%, #5b9fde)); + background: -webkit-linear-gradient(top, #70abe2 0%, #5b9fde 100%); + background: -o-linear-gradient(top, #70abe2 0%, #5b9fde 100%); + background: -ms-linear-gradient(top, #70abe2 0%, #5b9fde 100%); + background: linear-gradient(to bottom, #70abe2 0%, #5b9fde 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='ligten(#5b9fde, 5%)', endColorstr='#5b9fde',GradientType=0 ); filter: none; - border-color: #cfcfcf; + border-color: #4e98db; opacity: 0.9; - color: #676767; + color: #ffffff; } #footers #mega-footer .btn.btn-info:hover { opacity: 1; - background-color: #8b8b8b; - border-color: #b1b1b1; + background-color: #1b5285; + border-color: #2879c5; } #footers #mega-footer .btn.btn-info:focus { - outline-color: #d7d7d7; + outline-color: #5b9fde; opacity: 1; } #footers #mega-footer .btn.btn-info.active { - -moz-box-shadow: inset 0 0 3px #d7d7d7; - -webkit-box-shadow: inset 0 0 3px #d7d7d7; - box-shadow: inset 0 0 3px #d7d7d7; + -moz-box-shadow: inset 0 0 3px #5b9fde; + -webkit-box-shadow: inset 0 0 3px #5b9fde; + box-shadow: inset 0 0 3px #5b9fde; } #footers #mega-footer .btn.btn-info.dropdown-toggle { - background-color: #b1b1b1; - border-color: #c3c3c3; + background-color: #2879c5; + border-color: #398bd7; } #footers #mega-footer .btn.btn-warning { background: #e4c632; @@ -8797,7 +8797,7 @@ body { filter: none; border-color: #e2c224; opacity: 0.9; - color: #676767; + color: #ffffff; } #footers #mega-footer .btn.btn-warning:hover { opacity: 1; @@ -8958,36 +8958,36 @@ table .external .glyphicon-new-window { font-weight: 400; } .btn.btn-default { - background: #676767; - background: -moz-linear-gradient(top, #747474 0%, #676767 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #747474), color-stop(100%, #676767)); - background: -webkit-linear-gradient(top, #747474 0%, #676767 100%); - background: -o-linear-gradient(top, #747474 0%, #676767 100%); - background: -ms-linear-gradient(top, #747474 0%, #676767 100%); - background: linear-gradient(to bottom, #747474 0%, #676767 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='ligten(#676767, 5%)', endColorstr='#676767',GradientType=0 ); + background: #ffffff; + background: -moz-linear-gradient(top, white 0%, #ffffff 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, white), color-stop(100%, #ffffff)); + background: -webkit-linear-gradient(top, white 0%, #ffffff 100%); + background: -o-linear-gradient(top, white 0%, #ffffff 100%); + background: -ms-linear-gradient(top, white 0%, #ffffff 100%); + background: linear-gradient(to bottom, white 0%, #ffffff 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='ligten(#ffffff, 5%)', endColorstr='#ffffff',GradientType=0 ); filter: none; - border-color: #5f5f5f; + border-color: #f7f7f7; opacity: 0.9; border-color: #c6c6c6; } .btn.btn-default:hover { opacity: 1; - background-color: #1a1a1a; - border-color: #414141; + background-color: #b3b3b3; + border-color: #d9d9d9; } .btn.btn-default:focus { - outline-color: #676767; + outline-color: #ffffff; opacity: 1; } .btn.btn-default.active { - -moz-box-shadow: inset 0 0 3px #676767; - -webkit-box-shadow: inset 0 0 3px #676767; - box-shadow: inset 0 0 3px #676767; + -moz-box-shadow: inset 0 0 3px #ffffff; + -webkit-box-shadow: inset 0 0 3px #ffffff; + box-shadow: inset 0 0 3px #ffffff; } .btn.btn-default.dropdown-toggle { - background-color: #414141; - border-color: #535353; + background-color: #d9d9d9; + border-color: #ebebeb; } .btn.btn-primary { background: #0b2347; @@ -9052,36 +9052,36 @@ table .external .glyphicon-new-window { border-color: #3ca230; } .btn.btn-info { - background: #d7d7d7; - background: -moz-linear-gradient(top, #e4e4e4 0%, #d7d7d7 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #e4e4e4), color-stop(100%, #d7d7d7)); - background: -webkit-linear-gradient(top, #e4e4e4 0%, #d7d7d7 100%); - background: -o-linear-gradient(top, #e4e4e4 0%, #d7d7d7 100%); - background: -ms-linear-gradient(top, #e4e4e4 0%, #d7d7d7 100%); - background: linear-gradient(to bottom, #e4e4e4 0%, #d7d7d7 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='ligten(#d7d7d7, 5%)', endColorstr='#d7d7d7',GradientType=0 ); + background: #5b9fde; + background: -moz-linear-gradient(top, #70abe2 0%, #5b9fde 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #70abe2), color-stop(100%, #5b9fde)); + background: -webkit-linear-gradient(top, #70abe2 0%, #5b9fde 100%); + background: -o-linear-gradient(top, #70abe2 0%, #5b9fde 100%); + background: -ms-linear-gradient(top, #70abe2 0%, #5b9fde 100%); + background: linear-gradient(to bottom, #70abe2 0%, #5b9fde 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='ligten(#5b9fde, 5%)', endColorstr='#5b9fde',GradientType=0 ); filter: none; - border-color: #cfcfcf; + border-color: #4e98db; opacity: 0.9; color: #fff; } .btn.btn-info:hover { opacity: 1; - background-color: #8b8b8b; - border-color: #b1b1b1; + background-color: #1b5285; + border-color: #2879c5; } .btn.btn-info:focus { - outline-color: #d7d7d7; + outline-color: #5b9fde; opacity: 1; } .btn.btn-info.active { - -moz-box-shadow: inset 0 0 3px #d7d7d7; - -webkit-box-shadow: inset 0 0 3px #d7d7d7; - box-shadow: inset 0 0 3px #d7d7d7; + -moz-box-shadow: inset 0 0 3px #5b9fde; + -webkit-box-shadow: inset 0 0 3px #5b9fde; + box-shadow: inset 0 0 3px #5b9fde; } .btn.btn-info.dropdown-toggle { - background-color: #b1b1b1; - border-color: #c3c3c3; + background-color: #2879c5; + border-color: #398bd7; } .btn.btn-info.active, .btn.btn-info.dropdown-toggle { color: #fff !important; diff --git a/css/sherman-grey.css b/css/sherman-grey.css index 1df9176..5d5f798 100644 --- a/css/sherman-grey.css +++ b/css/sherman-grey.css @@ -4920,10 +4920,10 @@ a.label:hover, a.label:focus { } .label-default { - background-color: #676767; + background-color: #ffffff; } .label-default[href]:hover, .label-default[href]:focus { - background-color: #4e4e4e; + background-color: #e6e6e6; } .label-primary { @@ -4941,10 +4941,10 @@ a.label:hover, a.label:focus { } .label-info { - background-color: #d7d7d7; + background-color: #5b9fde; } .label-info[href]:hover, .label-info[href]:focus { - background-color: #bebebe; + background-color: #3186d5; } .label-warning { @@ -5230,7 +5230,7 @@ a.thumbnail.active { } .progress-bar-info { - background-color: #d7d7d7; + background-color: #5b9fde; } .progress-striped .progress-bar-info { 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); @@ -8670,35 +8670,35 @@ body { } } #footers #mega-footer .btn.btn-default { - background: #676767; - background: -moz-linear-gradient(top, #747474 0%, #676767 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #747474), color-stop(100%, #676767)); - background: -webkit-linear-gradient(top, #747474 0%, #676767 100%); - background: -o-linear-gradient(top, #747474 0%, #676767 100%); - background: -ms-linear-gradient(top, #747474 0%, #676767 100%); - background: linear-gradient(to bottom, #747474 0%, #676767 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='ligten(#676767, 5%)', endColorstr='#676767',GradientType=0 ); + background: #ffffff; + background: -moz-linear-gradient(top, white 0%, #ffffff 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, white), color-stop(100%, #ffffff)); + background: -webkit-linear-gradient(top, white 0%, #ffffff 100%); + background: -o-linear-gradient(top, white 0%, #ffffff 100%); + background: -ms-linear-gradient(top, white 0%, #ffffff 100%); + background: linear-gradient(to bottom, white 0%, #ffffff 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='ligten(#ffffff, 5%)', endColorstr='#ffffff',GradientType=0 ); filter: none; - border-color: #5f5f5f; + border-color: #f7f7f7; opacity: 0.9; } #footers #mega-footer .btn.btn-default:hover { opacity: 1; - background-color: #1a1a1a; - border-color: #414141; + background-color: #b3b3b3; + border-color: #d9d9d9; } #footers #mega-footer .btn.btn-default:focus { - outline-color: #676767; + outline-color: #ffffff; opacity: 1; } #footers #mega-footer .btn.btn-default.active { - -moz-box-shadow: inset 0 0 3px #676767; - -webkit-box-shadow: inset 0 0 3px #676767; - box-shadow: inset 0 0 3px #676767; + -moz-box-shadow: inset 0 0 3px #ffffff; + -webkit-box-shadow: inset 0 0 3px #ffffff; + box-shadow: inset 0 0 3px #ffffff; } #footers #mega-footer .btn.btn-default.dropdown-toggle { - background-color: #414141; - border-color: #535353; + background-color: #d9d9d9; + border-color: #ebebeb; } #footers #mega-footer .btn.btn-primary { background: #0b2347; @@ -8763,36 +8763,36 @@ body { border-color: #3ca230; } #footers #mega-footer .btn.btn-info { - background: #d7d7d7; - background: -moz-linear-gradient(top, #e4e4e4 0%, #d7d7d7 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #e4e4e4), color-stop(100%, #d7d7d7)); - background: -webkit-linear-gradient(top, #e4e4e4 0%, #d7d7d7 100%); - background: -o-linear-gradient(top, #e4e4e4 0%, #d7d7d7 100%); - background: -ms-linear-gradient(top, #e4e4e4 0%, #d7d7d7 100%); - background: linear-gradient(to bottom, #e4e4e4 0%, #d7d7d7 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='ligten(#d7d7d7, 5%)', endColorstr='#d7d7d7',GradientType=0 ); + background: #5b9fde; + background: -moz-linear-gradient(top, #70abe2 0%, #5b9fde 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #70abe2), color-stop(100%, #5b9fde)); + background: -webkit-linear-gradient(top, #70abe2 0%, #5b9fde 100%); + background: -o-linear-gradient(top, #70abe2 0%, #5b9fde 100%); + background: -ms-linear-gradient(top, #70abe2 0%, #5b9fde 100%); + background: linear-gradient(to bottom, #70abe2 0%, #5b9fde 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='ligten(#5b9fde, 5%)', endColorstr='#5b9fde',GradientType=0 ); filter: none; - border-color: #cfcfcf; + border-color: #4e98db; opacity: 0.9; - color: #676767; + color: #ffffff; } #footers #mega-footer .btn.btn-info:hover { opacity: 1; - background-color: #8b8b8b; - border-color: #b1b1b1; + background-color: #1b5285; + border-color: #2879c5; } #footers #mega-footer .btn.btn-info:focus { - outline-color: #d7d7d7; + outline-color: #5b9fde; opacity: 1; } #footers #mega-footer .btn.btn-info.active { - -moz-box-shadow: inset 0 0 3px #d7d7d7; - -webkit-box-shadow: inset 0 0 3px #d7d7d7; - box-shadow: inset 0 0 3px #d7d7d7; + -moz-box-shadow: inset 0 0 3px #5b9fde; + -webkit-box-shadow: inset 0 0 3px #5b9fde; + box-shadow: inset 0 0 3px #5b9fde; } #footers #mega-footer .btn.btn-info.dropdown-toggle { - background-color: #b1b1b1; - border-color: #c3c3c3; + background-color: #2879c5; + border-color: #398bd7; } #footers #mega-footer .btn.btn-warning { background: #e4c632; @@ -8806,7 +8806,7 @@ body { filter: none; border-color: #e2c224; opacity: 0.9; - color: #676767; + color: #ffffff; } #footers #mega-footer .btn.btn-warning:hover { opacity: 1; @@ -8967,36 +8967,36 @@ table .external .glyphicon-new-window { font-weight: 400; } .btn.btn-default { - background: #676767; - background: -moz-linear-gradient(top, #747474 0%, #676767 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #747474), color-stop(100%, #676767)); - background: -webkit-linear-gradient(top, #747474 0%, #676767 100%); - background: -o-linear-gradient(top, #747474 0%, #676767 100%); - background: -ms-linear-gradient(top, #747474 0%, #676767 100%); - background: linear-gradient(to bottom, #747474 0%, #676767 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='ligten(#676767, 5%)', endColorstr='#676767',GradientType=0 ); + background: #ffffff; + background: -moz-linear-gradient(top, white 0%, #ffffff 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, white), color-stop(100%, #ffffff)); + background: -webkit-linear-gradient(top, white 0%, #ffffff 100%); + background: -o-linear-gradient(top, white 0%, #ffffff 100%); + background: -ms-linear-gradient(top, white 0%, #ffffff 100%); + background: linear-gradient(to bottom, white 0%, #ffffff 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='ligten(#ffffff, 5%)', endColorstr='#ffffff',GradientType=0 ); filter: none; - border-color: #5f5f5f; + border-color: #f7f7f7; opacity: 0.9; border-color: #c6c6c6; } .btn.btn-default:hover { opacity: 1; - background-color: #1a1a1a; - border-color: #414141; + background-color: #b3b3b3; + border-color: #d9d9d9; } .btn.btn-default:focus { - outline-color: #676767; + outline-color: #ffffff; opacity: 1; } .btn.btn-default.active { - -moz-box-shadow: inset 0 0 3px #676767; - -webkit-box-shadow: inset 0 0 3px #676767; - box-shadow: inset 0 0 3px #676767; + -moz-box-shadow: inset 0 0 3px #ffffff; + -webkit-box-shadow: inset 0 0 3px #ffffff; + box-shadow: inset 0 0 3px #ffffff; } .btn.btn-default.dropdown-toggle { - background-color: #414141; - border-color: #535353; + background-color: #d9d9d9; + border-color: #ebebeb; } .btn.btn-primary { background: #0b2347; @@ -9061,36 +9061,36 @@ table .external .glyphicon-new-window { border-color: #3ca230; } .btn.btn-info { - background: #d7d7d7; - background: -moz-linear-gradient(top, #e4e4e4 0%, #d7d7d7 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #e4e4e4), color-stop(100%, #d7d7d7)); - background: -webkit-linear-gradient(top, #e4e4e4 0%, #d7d7d7 100%); - background: -o-linear-gradient(top, #e4e4e4 0%, #d7d7d7 100%); - background: -ms-linear-gradient(top, #e4e4e4 0%, #d7d7d7 100%); - background: linear-gradient(to bottom, #e4e4e4 0%, #d7d7d7 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='ligten(#d7d7d7, 5%)', endColorstr='#d7d7d7',GradientType=0 ); + background: #5b9fde; + background: -moz-linear-gradient(top, #70abe2 0%, #5b9fde 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #70abe2), color-stop(100%, #5b9fde)); + background: -webkit-linear-gradient(top, #70abe2 0%, #5b9fde 100%); + background: -o-linear-gradient(top, #70abe2 0%, #5b9fde 100%); + background: -ms-linear-gradient(top, #70abe2 0%, #5b9fde 100%); + background: linear-gradient(to bottom, #70abe2 0%, #5b9fde 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='ligten(#5b9fde, 5%)', endColorstr='#5b9fde',GradientType=0 ); filter: none; - border-color: #cfcfcf; + border-color: #4e98db; opacity: 0.9; color: #fff; } .btn.btn-info:hover { opacity: 1; - background-color: #8b8b8b; - border-color: #b1b1b1; + background-color: #1b5285; + border-color: #2879c5; } .btn.btn-info:focus { - outline-color: #d7d7d7; + outline-color: #5b9fde; opacity: 1; } .btn.btn-info.active { - -moz-box-shadow: inset 0 0 3px #d7d7d7; - -webkit-box-shadow: inset 0 0 3px #d7d7d7; - box-shadow: inset 0 0 3px #d7d7d7; + -moz-box-shadow: inset 0 0 3px #5b9fde; + -webkit-box-shadow: inset 0 0 3px #5b9fde; + box-shadow: inset 0 0 3px #5b9fde; } .btn.btn-info.dropdown-toggle { - background-color: #b1b1b1; - border-color: #c3c3c3; + background-color: #2879c5; + border-color: #398bd7; } .btn.btn-info.active, .btn.btn-info.dropdown-toggle { color: #fff !important; diff --git a/css/sherman-red.css b/css/sherman-red.css index a1715b6..33e9196 100644 --- a/css/sherman-red.css +++ b/css/sherman-red.css @@ -4911,10 +4911,10 @@ a.label:hover, a.label:focus { } .label-default { - background-color: #676767; + background-color: #ffffff; } .label-default[href]:hover, .label-default[href]:focus { - background-color: #4e4e4e; + background-color: #e6e6e6; } .label-primary { @@ -4932,10 +4932,10 @@ a.label:hover, a.label:focus { } .label-info { - background-color: #d7d7d7; + background-color: #5b9fde; } .label-info[href]:hover, .label-info[href]:focus { - background-color: #bebebe; + background-color: #3186d5; } .label-warning { @@ -5221,7 +5221,7 @@ a.thumbnail.active { } .progress-bar-info { - background-color: #d7d7d7; + background-color: #5b9fde; } .progress-striped .progress-bar-info { 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); @@ -8661,35 +8661,35 @@ body { } } #footers #mega-footer .btn.btn-default { - background: #676767; - background: -moz-linear-gradient(top, #747474 0%, #676767 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #747474), color-stop(100%, #676767)); - background: -webkit-linear-gradient(top, #747474 0%, #676767 100%); - background: -o-linear-gradient(top, #747474 0%, #676767 100%); - background: -ms-linear-gradient(top, #747474 0%, #676767 100%); - background: linear-gradient(to bottom, #747474 0%, #676767 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='ligten(#676767, 5%)', endColorstr='#676767',GradientType=0 ); + background: #ffffff; + background: -moz-linear-gradient(top, white 0%, #ffffff 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, white), color-stop(100%, #ffffff)); + background: -webkit-linear-gradient(top, white 0%, #ffffff 100%); + background: -o-linear-gradient(top, white 0%, #ffffff 100%); + background: -ms-linear-gradient(top, white 0%, #ffffff 100%); + background: linear-gradient(to bottom, white 0%, #ffffff 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='ligten(#ffffff, 5%)', endColorstr='#ffffff',GradientType=0 ); filter: none; - border-color: #5f5f5f; + border-color: #f7f7f7; opacity: 0.9; } #footers #mega-footer .btn.btn-default:hover { opacity: 1; - background-color: #1a1a1a; - border-color: #414141; + background-color: #b3b3b3; + border-color: #d9d9d9; } #footers #mega-footer .btn.btn-default:focus { - outline-color: #676767; + outline-color: #ffffff; opacity: 1; } #footers #mega-footer .btn.btn-default.active { - -moz-box-shadow: inset 0 0 3px #676767; - -webkit-box-shadow: inset 0 0 3px #676767; - box-shadow: inset 0 0 3px #676767; + -moz-box-shadow: inset 0 0 3px #ffffff; + -webkit-box-shadow: inset 0 0 3px #ffffff; + box-shadow: inset 0 0 3px #ffffff; } #footers #mega-footer .btn.btn-default.dropdown-toggle { - background-color: #414141; - border-color: #535353; + background-color: #d9d9d9; + border-color: #ebebeb; } #footers #mega-footer .btn.btn-primary { background: #0b2347; @@ -8754,36 +8754,36 @@ body { border-color: #3ca230; } #footers #mega-footer .btn.btn-info { - background: #d7d7d7; - background: -moz-linear-gradient(top, #e4e4e4 0%, #d7d7d7 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #e4e4e4), color-stop(100%, #d7d7d7)); - background: -webkit-linear-gradient(top, #e4e4e4 0%, #d7d7d7 100%); - background: -o-linear-gradient(top, #e4e4e4 0%, #d7d7d7 100%); - background: -ms-linear-gradient(top, #e4e4e4 0%, #d7d7d7 100%); - background: linear-gradient(to bottom, #e4e4e4 0%, #d7d7d7 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='ligten(#d7d7d7, 5%)', endColorstr='#d7d7d7',GradientType=0 ); + background: #5b9fde; + background: -moz-linear-gradient(top, #70abe2 0%, #5b9fde 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #70abe2), color-stop(100%, #5b9fde)); + background: -webkit-linear-gradient(top, #70abe2 0%, #5b9fde 100%); + background: -o-linear-gradient(top, #70abe2 0%, #5b9fde 100%); + background: -ms-linear-gradient(top, #70abe2 0%, #5b9fde 100%); + background: linear-gradient(to bottom, #70abe2 0%, #5b9fde 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='ligten(#5b9fde, 5%)', endColorstr='#5b9fde',GradientType=0 ); filter: none; - border-color: #cfcfcf; + border-color: #4e98db; opacity: 0.9; - color: #676767; + color: #ffffff; } #footers #mega-footer .btn.btn-info:hover { opacity: 1; - background-color: #8b8b8b; - border-color: #b1b1b1; + background-color: #1b5285; + border-color: #2879c5; } #footers #mega-footer .btn.btn-info:focus { - outline-color: #d7d7d7; + outline-color: #5b9fde; opacity: 1; } #footers #mega-footer .btn.btn-info.active { - -moz-box-shadow: inset 0 0 3px #d7d7d7; - -webkit-box-shadow: inset 0 0 3px #d7d7d7; - box-shadow: inset 0 0 3px #d7d7d7; + -moz-box-shadow: inset 0 0 3px #5b9fde; + -webkit-box-shadow: inset 0 0 3px #5b9fde; + box-shadow: inset 0 0 3px #5b9fde; } #footers #mega-footer .btn.btn-info.dropdown-toggle { - background-color: #b1b1b1; - border-color: #c3c3c3; + background-color: #2879c5; + border-color: #398bd7; } #footers #mega-footer .btn.btn-warning { background: #e4c632; @@ -8797,7 +8797,7 @@ body { filter: none; border-color: #e2c224; opacity: 0.9; - color: #676767; + color: #ffffff; } #footers #mega-footer .btn.btn-warning:hover { opacity: 1; @@ -8958,36 +8958,36 @@ table .external .glyphicon-new-window { font-weight: 400; } .btn.btn-default { - background: #676767; - background: -moz-linear-gradient(top, #747474 0%, #676767 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #747474), color-stop(100%, #676767)); - background: -webkit-linear-gradient(top, #747474 0%, #676767 100%); - background: -o-linear-gradient(top, #747474 0%, #676767 100%); - background: -ms-linear-gradient(top, #747474 0%, #676767 100%); - background: linear-gradient(to bottom, #747474 0%, #676767 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='ligten(#676767, 5%)', endColorstr='#676767',GradientType=0 ); + background: #ffffff; + background: -moz-linear-gradient(top, white 0%, #ffffff 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, white), color-stop(100%, #ffffff)); + background: -webkit-linear-gradient(top, white 0%, #ffffff 100%); + background: -o-linear-gradient(top, white 0%, #ffffff 100%); + background: -ms-linear-gradient(top, white 0%, #ffffff 100%); + background: linear-gradient(to bottom, white 0%, #ffffff 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='ligten(#ffffff, 5%)', endColorstr='#ffffff',GradientType=0 ); filter: none; - border-color: #5f5f5f; + border-color: #f7f7f7; opacity: 0.9; border-color: #c6c6c6; } .btn.btn-default:hover { opacity: 1; - background-color: #1a1a1a; - border-color: #414141; + background-color: #b3b3b3; + border-color: #d9d9d9; } .btn.btn-default:focus { - outline-color: #676767; + outline-color: #ffffff; opacity: 1; } .btn.btn-default.active { - -moz-box-shadow: inset 0 0 3px #676767; - -webkit-box-shadow: inset 0 0 3px #676767; - box-shadow: inset 0 0 3px #676767; + -moz-box-shadow: inset 0 0 3px #ffffff; + -webkit-box-shadow: inset 0 0 3px #ffffff; + box-shadow: inset 0 0 3px #ffffff; } .btn.btn-default.dropdown-toggle { - background-color: #414141; - border-color: #535353; + background-color: #d9d9d9; + border-color: #ebebeb; } .btn.btn-primary { background: #0b2347; @@ -9052,36 +9052,36 @@ table .external .glyphicon-new-window { border-color: #3ca230; } .btn.btn-info { - background: #d7d7d7; - background: -moz-linear-gradient(top, #e4e4e4 0%, #d7d7d7 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #e4e4e4), color-stop(100%, #d7d7d7)); - background: -webkit-linear-gradient(top, #e4e4e4 0%, #d7d7d7 100%); - background: -o-linear-gradient(top, #e4e4e4 0%, #d7d7d7 100%); - background: -ms-linear-gradient(top, #e4e4e4 0%, #d7d7d7 100%); - background: linear-gradient(to bottom, #e4e4e4 0%, #d7d7d7 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='ligten(#d7d7d7, 5%)', endColorstr='#d7d7d7',GradientType=0 ); + background: #5b9fde; + background: -moz-linear-gradient(top, #70abe2 0%, #5b9fde 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #70abe2), color-stop(100%, #5b9fde)); + background: -webkit-linear-gradient(top, #70abe2 0%, #5b9fde 100%); + background: -o-linear-gradient(top, #70abe2 0%, #5b9fde 100%); + background: -ms-linear-gradient(top, #70abe2 0%, #5b9fde 100%); + background: linear-gradient(to bottom, #70abe2 0%, #5b9fde 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='ligten(#5b9fde, 5%)', endColorstr='#5b9fde',GradientType=0 ); filter: none; - border-color: #cfcfcf; + border-color: #4e98db; opacity: 0.9; color: #fff; } .btn.btn-info:hover { opacity: 1; - background-color: #8b8b8b; - border-color: #b1b1b1; + background-color: #1b5285; + border-color: #2879c5; } .btn.btn-info:focus { - outline-color: #d7d7d7; + outline-color: #5b9fde; opacity: 1; } .btn.btn-info.active { - -moz-box-shadow: inset 0 0 3px #d7d7d7; - -webkit-box-shadow: inset 0 0 3px #d7d7d7; - box-shadow: inset 0 0 3px #d7d7d7; + -moz-box-shadow: inset 0 0 3px #5b9fde; + -webkit-box-shadow: inset 0 0 3px #5b9fde; + box-shadow: inset 0 0 3px #5b9fde; } .btn.btn-info.dropdown-toggle { - background-color: #b1b1b1; - border-color: #c3c3c3; + background-color: #2879c5; + border-color: #398bd7; } .btn.btn-info.active, .btn.btn-info.dropdown-toggle { color: #fff !important; diff --git a/sass/sherman-variables-black.scss b/sass/sherman-variables-black.scss index c68d276..9e8a1d3 100644 --- a/sass/sherman-variables-black.scss +++ b/sass/sherman-variables-black.scss @@ -98,10 +98,10 @@ $footers-link-hover: rgba(255,255,255,1); $footers-border-color: #414141; /* Primary Colors (Bootstrap) */ -$brand-default: #676767 !default; +$brand-default: #ffffff !default; $brand-primary: #0b2347 !default; $brand-success: #48c239 !default; -$brand-info: #d7d7d7 !default; +$brand-info: #5b9fde !default; $brand-warning: #e4c632 !default; $brand-danger: #a01413 !default; diff --git a/sass/sherman-variables-grey.scss b/sass/sherman-variables-grey.scss index 43916ac..b9800ec 100644 --- a/sass/sherman-variables-grey.scss +++ b/sass/sherman-variables-grey.scss @@ -97,10 +97,10 @@ $footers-link-hover: rgba(255,255,255,1); $footers-border-color: #fff; /* Primary Colors (Bootstrap) */ -$brand-default: #676767 !default; +$brand-default: #ffffff !default; $brand-primary: #0b2347 !default; $brand-success: #48c239 !default; -$brand-info: #d7d7d7 !default; +$brand-info: #5b9fde !default; $brand-warning: #e4c632 !default; $brand-danger: #a01413 !default; diff --git a/sass/sherman-variables-red.scss b/sass/sherman-variables-red.scss index 49deb0c..b110ce3 100644 --- a/sass/sherman-variables-red.scss +++ b/sass/sherman-variables-red.scss @@ -99,10 +99,10 @@ $footers-border-color: #BC3E3E; /* Primary Colors (Bootstrap) */ -$brand-default: #676767 !default; +$brand-default: #ffffff !default; $brand-primary: #0b2347 !default; $brand-success: #48c239 !default; -$brand-info: #d7d7d7 !default; +$brand-info: #5b9fde !default; $brand-warning: #e4c632 !default; $brand-danger: #a01413 !default; From 063cd0ad23e3badb72946131cdf8662d5276ff15 Mon Sep 17 00:00:00 2001 From: Jessika Mika Caldera Date: Wed, 25 Feb 2015 11:25:33 -0500 Subject: [PATCH 2/3] Sherman Color Changes All Themes. --- css/sherman-black.css | 12 ++++++------ css/sherman-grey.css | 12 ++++++------ css/sherman-red.css | 12 ++++++------ sass/sherman-variables-black.scss | 4 ++-- sass/sherman-variables-grey.scss | 4 ++-- sass/sherman-variables-red.scss | 4 ++-- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/css/sherman-black.css b/css/sherman-black.css index 43e98d6..7fd604d 100644 --- a/css/sherman-black.css +++ b/css/sherman-black.css @@ -3378,7 +3378,7 @@ select[multiple].input-lg, outline-offset: -2px; } .btn:hover, .btn:focus { - color: #fff; + color: #333; text-decoration: none; } .btn:active, .btn.active { @@ -3397,12 +3397,12 @@ select[multiple].input-lg, } .btn-default { - color: #fff; + color: #333; background-color: #193563; - border-color: #0a1426; + border-color: #1a1a1a; } .btn-default:hover, .btn-default:focus, .btn-default:active, .btn-default.active, .open > .btn-default.dropdown-toggle { - color: #fff; + color: #333; background-color: #0f1f3a; border-color: black; } @@ -3411,11 +3411,11 @@ select[multiple].input-lg, } .btn-default.disabled, .btn-default.disabled:hover, .btn-default.disabled:focus, .btn-default.disabled:active, .btn-default.disabled.active, .btn-default[disabled], .btn-default[disabled]:hover, .btn-default[disabled]:focus, .btn-default[disabled]:active, .btn-default[disabled].active, fieldset[disabled] .btn-default, fieldset[disabled] .btn-default:hover, fieldset[disabled] .btn-default:focus, fieldset[disabled] .btn-default:active, fieldset[disabled] .btn-default.active { background-color: #193563; - border-color: #0a1426; + border-color: #1a1a1a; } .btn-default .badge { color: #193563; - background-color: #fff; + background-color: #333; } .btn-primary { diff --git a/css/sherman-grey.css b/css/sherman-grey.css index 5d5f798..cf5ed20 100644 --- a/css/sherman-grey.css +++ b/css/sherman-grey.css @@ -3387,7 +3387,7 @@ select[multiple].input-lg, outline-offset: -2px; } .btn:hover, .btn:focus { - color: #fff; + color: #333; text-decoration: none; } .btn:active, .btn.active { @@ -3406,12 +3406,12 @@ select[multiple].input-lg, } .btn-default { - color: #fff; + color: #333; background-color: #193563; - border-color: #0a1426; + border-color: #1a1a1a; } .btn-default:hover, .btn-default:focus, .btn-default:active, .btn-default.active, .open > .btn-default.dropdown-toggle { - color: #fff; + color: #333; background-color: #0f1f3a; border-color: black; } @@ -3420,11 +3420,11 @@ select[multiple].input-lg, } .btn-default.disabled, .btn-default.disabled:hover, .btn-default.disabled:focus, .btn-default.disabled:active, .btn-default.disabled.active, .btn-default[disabled], .btn-default[disabled]:hover, .btn-default[disabled]:focus, .btn-default[disabled]:active, .btn-default[disabled].active, fieldset[disabled] .btn-default, fieldset[disabled] .btn-default:hover, fieldset[disabled] .btn-default:focus, fieldset[disabled] .btn-default:active, fieldset[disabled] .btn-default.active { background-color: #193563; - border-color: #0a1426; + border-color: #1a1a1a; } .btn-default .badge { color: #193563; - background-color: #fff; + background-color: #333; } .btn-primary { diff --git a/css/sherman-red.css b/css/sherman-red.css index 33e9196..37d8f27 100644 --- a/css/sherman-red.css +++ b/css/sherman-red.css @@ -3378,7 +3378,7 @@ select[multiple].input-lg, outline-offset: -2px; } .btn:hover, .btn:focus { - color: #fff; + color: #333; text-decoration: none; } .btn:active, .btn.active { @@ -3397,12 +3397,12 @@ select[multiple].input-lg, } .btn-default { - color: #fff; + color: #333; background-color: #193563; - border-color: #0a1426; + border-color: #1a1a1a; } .btn-default:hover, .btn-default:focus, .btn-default:active, .btn-default.active, .open > .btn-default.dropdown-toggle { - color: #fff; + color: #333; background-color: #0f1f3a; border-color: black; } @@ -3411,11 +3411,11 @@ select[multiple].input-lg, } .btn-default.disabled, .btn-default.disabled:hover, .btn-default.disabled:focus, .btn-default.disabled:active, .btn-default.disabled.active, .btn-default[disabled], .btn-default[disabled]:hover, .btn-default[disabled]:focus, .btn-default[disabled]:active, .btn-default[disabled].active, fieldset[disabled] .btn-default, fieldset[disabled] .btn-default:hover, fieldset[disabled] .btn-default:focus, fieldset[disabled] .btn-default:active, fieldset[disabled] .btn-default.active { background-color: #193563; - border-color: #0a1426; + border-color: #1a1a1a; } .btn-default .badge { color: #193563; - background-color: #fff; + background-color: #333; } .btn-primary { diff --git a/sass/sherman-variables-black.scss b/sass/sherman-variables-black.scss index 9e8a1d3..94a3cd4 100644 --- a/sass/sherman-variables-black.scss +++ b/sass/sherman-variables-black.scss @@ -108,9 +108,9 @@ $brand-danger: #a01413 !default; /* Buttons, define text, background and border color. */ $btn-font-weight: normal !default; -$btn-default-color: #fff; +$btn-default-color: #333; $btn-default-bg: #193563; -$btn-default-border: darken($btn-default-bg, 15%); +$btn-default-border: darken($btn-default-color, 10%); $btn-font-weight: normal !default; $btn-info-color: #6b6869; diff --git a/sass/sherman-variables-grey.scss b/sass/sherman-variables-grey.scss index b9800ec..ea3573a 100644 --- a/sass/sherman-variables-grey.scss +++ b/sass/sherman-variables-grey.scss @@ -106,9 +106,9 @@ $brand-danger: #a01413 !default; /* Buttons, define text, background and border color. */ $btn-font-weight: normal !default; -$btn-default-color: #fff; +$btn-default-color: #333; $btn-default-bg: #193563; -$btn-default-border: darken($btn-default-bg, 15%); +$btn-default-border: darken($btn-default-color, 10%); $btn-font-weight: normal !default; $btn-info-color: #6b6869; diff --git a/sass/sherman-variables-red.scss b/sass/sherman-variables-red.scss index b110ce3..b6e6384 100644 --- a/sass/sherman-variables-red.scss +++ b/sass/sherman-variables-red.scss @@ -108,9 +108,9 @@ $brand-danger: #a01413 !default; /* Buttons, define text, background and border color. */ $btn-font-weight: normal !default; -$btn-default-color: #fff; +$btn-default-color: #333; $btn-default-bg: #193563; -$btn-default-border: darken($btn-default-bg, 15%); +$btn-default-border: darken($btn-default-color, 10%); $btn-font-weight: normal !default; $btn-info-color: #6b6869; From 4f3364595576a687ea8b607319825e59954050ad Mon Sep 17 00:00:00 2001 From: Jessika Mika Caldera Date: Wed, 25 Feb 2015 11:37:01 -0500 Subject: [PATCH 3/3] Sherman Color Changes to all themes. --- css/sherman-black.css | 4 ++-- css/sherman-grey.css | 4 ++-- css/sherman-red.css | 4 ++-- sass/sherman-variables-black.scss | 3 --- sass/sherman-variables-blue.scss | 3 --- sass/sherman-variables-grey.scss | 3 --- sass/sherman-variables-red.scss | 3 --- 7 files changed, 6 insertions(+), 18 deletions(-) diff --git a/css/sherman-black.css b/css/sherman-black.css index 7fd604d..48f1736 100644 --- a/css/sherman-black.css +++ b/css/sherman-black.css @@ -4911,10 +4911,10 @@ a.label:hover, a.label:focus { } .label-default { - background-color: #ffffff; + background-color: #777777; } .label-default[href]:hover, .label-default[href]:focus { - background-color: #e6e6e6; + background-color: #5e5e5e; } .label-primary { diff --git a/css/sherman-grey.css b/css/sherman-grey.css index cf5ed20..3718e8d 100644 --- a/css/sherman-grey.css +++ b/css/sherman-grey.css @@ -4920,10 +4920,10 @@ a.label:hover, a.label:focus { } .label-default { - background-color: #ffffff; + background-color: #777777; } .label-default[href]:hover, .label-default[href]:focus { - background-color: #e6e6e6; + background-color: #5e5e5e; } .label-primary { diff --git a/css/sherman-red.css b/css/sherman-red.css index 37d8f27..9d4dc5b 100644 --- a/css/sherman-red.css +++ b/css/sherman-red.css @@ -4911,10 +4911,10 @@ a.label:hover, a.label:focus { } .label-default { - background-color: #ffffff; + background-color: #777777; } .label-default[href]:hover, .label-default[href]:focus { - background-color: #e6e6e6; + background-color: #5e5e5e; } .label-primary { diff --git a/sass/sherman-variables-black.scss b/sass/sherman-variables-black.scss index 94a3cd4..cd9ab8d 100644 --- a/sass/sherman-variables-black.scss +++ b/sass/sherman-variables-black.scss @@ -122,9 +122,6 @@ $btn-warning-color: #313131; $btn-warning-bg: #fbdf56; $btn-warning-border: darken($btn-warning-bg, 15%); -//** Default label background color -$label-default-bg: $brand-default !default; - /* Sherman Only Variables */ $sh-masthead-start: #2f2f2f; $sh-masthead-end: #292929; diff --git a/sass/sherman-variables-blue.scss b/sass/sherman-variables-blue.scss index ce73066..1b06991 100644 --- a/sass/sherman-variables-blue.scss +++ b/sass/sherman-variables-blue.scss @@ -121,9 +121,6 @@ $btn-warning-color: #313131; $btn-warning-bg: #fbdf56; $btn-warning-border: darken($btn-warning-bg, 15%); -//** Default label background color -// $label-default-bg: $brand-default !default; - /* Sherman Only Variables */ $sh-masthead-start: #142548; $sh-masthead-end: #071839; diff --git a/sass/sherman-variables-grey.scss b/sass/sherman-variables-grey.scss index ea3573a..a29f9cc 100644 --- a/sass/sherman-variables-grey.scss +++ b/sass/sherman-variables-grey.scss @@ -120,9 +120,6 @@ $btn-warning-color: #313131; $btn-warning-bg: #fbdf56; $btn-warning-border: darken($btn-warning-bg, 15%); -//** Default label background color -$label-default-bg: $brand-default !default; - /* Sherman Only Variables */ $sh-masthead-start: #e3e3e3; $sh-masthead-end: #d4d4d4; diff --git a/sass/sherman-variables-red.scss b/sass/sherman-variables-red.scss index b6e6384..9c4da46 100644 --- a/sass/sherman-variables-red.scss +++ b/sass/sherman-variables-red.scss @@ -122,9 +122,6 @@ $btn-warning-color: #313131; $btn-warning-bg: #fbdf56; $btn-warning-border: darken($btn-warning-bg, 15%); -// Default label background color -$label-default-bg: $brand-default !default; - /* Sherman Only Variables */ $sh-masthead-start: #ab140d; $sh-masthead-end: #9b0000;