From b2cc63ad929ddeb845d7733ba16638da67332db5 Mon Sep 17 00:00:00 2001 From: Thomas Park Date: Sat, 11 Feb 2012 21:21:57 -0500 Subject: Lightened warning button caret --- cerulean/bootstrap.css | 5 +++++ cerulean/bootstrap.min.css | 1 + cerulean/bootswatch.less | 7 +++++++ simplex/bootstrap.css | 11 ++++++++--- simplex/bootstrap.min.css | 7 ++++--- simplex/bootswatch.less | 7 +++++++ spacelab/bootstrap.css | 27 ++++++++++++++++----------- spacelab/bootstrap.min.css | 5 +++-- spacelab/bootswatch.less | 7 +++++++ spacelab/variables.less | 2 +- united/bootstrap.css | 5 +++++ united/bootstrap.min.css | 1 + united/bootswatch.less | 7 +++++++ 13 files changed, 72 insertions(+), 20 deletions(-) diff --git a/cerulean/bootstrap.css b/cerulean/bootstrap.css index 2fddfadc..0f6fda5f 100644 --- a/cerulean/bootstrap.css +++ b/cerulean/bootstrap.css @@ -3453,6 +3453,11 @@ h6 { -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); } +.btn-warning .caret { + border-top-color: #ffffff; + opacity: 0.75; + filter: alpha(opacity=75); +} .btn-primary { background-color: #43a1da; background-image: -moz-linear-gradient(top, #4ba6db, #369bd7); diff --git a/cerulean/bootstrap.min.css b/cerulean/bootstrap.min.css index 18b5a248..96f827d1 100644 --- a/cerulean/bootstrap.min.css +++ b/cerulean/bootstrap.min.css @@ -619,6 +619,7 @@ h1,h2,h3,h4,h5,h6{color:#317eac;} .control-group.success input,.control-group.success select,.control-group.success textarea{color:#59822c;border-color:#59822c;}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#3f5c1f;-webkit-box-shadow:0 0 6px #8dc450;-moz-box-shadow:0 0 6px #8dc450;box-shadow:0 0 6px #8dc450;} .control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#59822c;background-color:#ccddbb;border-color:#59822c;} .btn{background-color:#ffffff;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(5%, #ffffff), to(#ffffff));background-image:-webkit-linear-gradient(#ffffff, #ffffff 5%, #ffffff);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 5%, #ffffff);background-image:-ms-linear-gradient(#ffffff, #ffffff 5%, #ffffff);background-image:-o-linear-gradient(#ffffff, #ffffff 5%, #ffffff);background-image:linear-gradient(#ffffff, #ffffff 5%, #ffffff);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#ffffff', GradientType=0);-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);} +.btn-warning .caret{border-top-color:#ffffff;opacity:0.75;filter:alpha(opacity=75);} .btn-primary{background-color:#43a1da;background-image:-moz-linear-gradient(top, #4ba6db, #369bd7);background-image:-ms-linear-gradient(top, #4ba6db, #369bd7);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#4ba6db), to(#369bd7));background-image:-webkit-linear-gradient(top, #4ba6db, #369bd7);background-image:-o-linear-gradient(top, #4ba6db, #369bd7);background-image:linear-gradient(top, #4ba6db, #369bd7);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4ba6db', endColorstr='#369bd7', GradientType=0);border-color:#369bd7 #369bd7 #2071a1;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#369bd7;} .btn-primary:active,.btn-primary.active{background-color:#2480b6 \9;} .btn-warning{background-color:#ec5c00;background-image:-moz-linear-gradient(top, #f76000, #dd5600);background-image:-ms-linear-gradient(top, #f76000, #dd5600);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f76000), to(#dd5600));background-image:-webkit-linear-gradient(top, #f76000, #dd5600);background-image:-o-linear-gradient(top, #f76000, #dd5600);background-image:linear-gradient(top, #f76000, #dd5600);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f76000', endColorstr='#dd5600', GradientType=0);border-color:#dd5600 #dd5600 #913800;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#dd5600;} diff --git a/cerulean/bootswatch.less b/cerulean/bootswatch.less index 7a89f1fb..9dca9bab 100755 --- a/cerulean/bootswatch.less +++ b/cerulean/bootswatch.less @@ -57,6 +57,13 @@ h1,h2,h3,h4,h5,h6 { .box-shadow(@shadow); } +.btn-warning { + .caret { + border-top-color: @white; + .opacity(75); + } +} + // Set the backgrounds // ------------------------- .btn-primary { diff --git a/simplex/bootstrap.css b/simplex/bootstrap.css index 72baed6b..7415dd98 100644 --- a/simplex/bootstrap.css +++ b/simplex/bootstrap.css @@ -3059,13 +3059,13 @@ a.thumbnail:hover { background-color: #b94a48; } .label-warning { - background-color: #ff6600; + background-color: #ffa366; } .label-success { - background-color: #468847; + background-color: #84c569; } .label-info { - background-color: #3a87ad; + background-color: #67abcc; } @-webkit-keyframes progress-bar-stripes { from { @@ -3396,6 +3396,11 @@ h6 { background-repeat: no-repeat; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); } +.btn-warning .caret { + border-top-color: #ffffff; + opacity: 0.75; + filter: alpha(opacity=75); +} .btn-primary { background-color: #4376de; background-image: -moz-linear-gradient(top, #4c7de0, #366ddc); diff --git a/simplex/bootstrap.min.css b/simplex/bootstrap.min.css index 78f41554..bff6f4e4 100644 --- a/simplex/bootstrap.min.css +++ b/simplex/bootstrap.min.css @@ -567,9 +567,9 @@ a.thumbnail:hover{border-color:#366ddc;-webkit-box-shadow:0 1px 4px rgba(0, 105, .thumbnail .caption{padding:9px;} .label{padding:1px 3px 2px;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;background-color:#999999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} .label-important{background-color:#b94a48;} -.label-warning{background-color:#ff6600;} -.label-success{background-color:#468847;} -.label-info{background-color:#3a87ad;} +.label-warning{background-color:#ffa366;} +.label-success{background-color:#84c569;} +.label-info{background-color:#67abcc;} @-webkit-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@-moz-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}.progress{overflow:hidden;height:18px;margin-bottom:18px;background-color:#f7f7f7;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} .progress .bar{width:0%;height:18px;color:#ffffff;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;} .progress-striped .bar{background-color:#62c462;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);background-image:-ms-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:-o-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: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);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;} @@ -610,6 +610,7 @@ h1,h2,h3,h4,h5,h6{color:#000000;} .subnav .nav>li>a{border-left:0px solid white !important;border-right:0px solid white !important;color:#333333;} .search-query{border:1px solid #CCC;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;background-color:#ffffff;} .btn{-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);} +.btn-warning .caret{border-top-color:#ffffff;opacity:0.75;filter:alpha(opacity=75);} .btn-primary{background-color:#4376de;background-image:-moz-linear-gradient(top, #4c7de0, #366ddc);background-image:-ms-linear-gradient(top, #4c7de0, #366ddc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#4c7de0), to(#366ddc));background-image:-webkit-linear-gradient(top, #4c7de0, #366ddc);background-image:-o-linear-gradient(top, #4c7de0, #366ddc);background-image:linear-gradient(top, #4c7de0, #366ddc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4c7de0', endColorstr='#366ddc', GradientType=0);border-color:#366ddc #366ddc #1d4ba8;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#366ddc;} .btn-primary:active,.btn-primary.active{background-color:#2155be \9;} .btn-warning{background-color:#ff6f0f;background-image:-moz-linear-gradient(top, #ff751a, #ff6600);background-image:-ms-linear-gradient(top, #ff751a, #ff6600);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ff751a), to(#ff6600));background-image:-webkit-linear-gradient(top, #ff751a, #ff6600);background-image:-o-linear-gradient(top, #ff751a, #ff6600);background-image:linear-gradient(top, #ff751a, #ff6600);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff751a', endColorstr='#ff6600', GradientType=0);border-color:#ff6600 #ff6600 #b34700;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#ff6600;} diff --git a/simplex/bootswatch.less b/simplex/bootswatch.less index c882bd65..747d3bb6 100755 --- a/simplex/bootswatch.less +++ b/simplex/bootswatch.less @@ -60,6 +60,13 @@ h1, h2, h3, h4, h5, h6 { #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); } +.btn-warning { + .caret { + border-top-color: @white; + .opacity(75); + } +} + .btn-primary { .buttonBackground(lighten(@primaryButtonBackground, 5%), @primaryButtonBackground); } diff --git a/spacelab/bootstrap.css b/spacelab/bootstrap.css index 138669cd..9ed93ed9 100644 --- a/spacelab/bootstrap.css +++ b/spacelab/bootstrap.css @@ -3451,6 +3451,11 @@ a.thumbnail:hover { .btn:active, .btn.active { background-color: #d3d3d3 \9; } +.btn-warning .caret { + border-top-color: #ffffff; + opacity: 0.75; + filter: alpha(opacity=75); +} .btn-primary { background-color: #707070; background-image: -moz-linear-gradient(top, #909090, #3f3f3f); @@ -3476,16 +3481,16 @@ a.thumbnail:hover { background-color: #262626 \9; } .btn-warning { - background-color: #ffda2e; - background-image: -moz-linear-gradient(top, #ffdf4d, #ffd200); - background-image: -ms-linear-gradient(top, #ffdf4d, #ffd200); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffdf4d), to(#ffd200)); - background-image: -webkit-linear-gradient(top, #ffdf4d, #ffd200); - background-image: -o-linear-gradient(top, #ffdf4d, #ffd200); - background-image: linear-gradient(top, #ffdf4d, #ffd200); + background-color: #fbd627; + background-image: -moz-linear-gradient(top, #ffde42, #f4ca00); + background-image: -ms-linear-gradient(top, #ffde42, #f4ca00); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffde42), to(#f4ca00)); + background-image: -webkit-linear-gradient(top, #ffde42, #f4ca00); + background-image: -o-linear-gradient(top, #ffde42, #f4ca00); + background-image: linear-gradient(top, #ffde42, #f4ca00); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdf4d', endColorstr='#ffd200', GradientType=0); - border-color: #ffd200 #ffd200 #b39300; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffde42', endColorstr='#f4ca00', GradientType=0); + border-color: #f4ca00 #f4ca00 #a88b00; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } @@ -3494,10 +3499,10 @@ a.thumbnail:hover { .btn-warning.active, .btn-warning.disabled, .btn-warning[disabled] { - background-color: #ffd200; + background-color: #f4ca00; } .btn-warning:active, .btn-warning.active { - background-color: #cca800 \9; + background-color: #c1a000 \9; } .btn-danger { background-color: #e15454; diff --git a/spacelab/bootstrap.min.css b/spacelab/bootstrap.min.css index ac183814..6a34ec6f 100644 --- a/spacelab/bootstrap.min.css +++ b/spacelab/bootstrap.min.css @@ -618,10 +618,11 @@ a.thumbnail:hover{border-color:#4183c4;-webkit-box-shadow:0 1px 4px rgba(0, 105, .navbar-search .search-query:focus,.navbar-search .search-query:hover:focus,.navbar-search .search-query.focused,.navbar-search .search-query:hover.focused{-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.5);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.5);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.5);color:#333333;} .btn{background-color:#f1f1f1;background-image:-moz-linear-gradient(top, #f4f4f4, #ececec);background-image:-ms-linear-gradient(top, #f4f4f4, #ececec);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f4f4f4), to(#ececec));background-image:-webkit-linear-gradient(top, #f4f4f4, #ececec);background-image:-o-linear-gradient(top, #f4f4f4, #ececec);background-image:linear-gradient(top, #f4f4f4, #ececec);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f4f4f4', endColorstr='#ececec', GradientType=0);border-color:#ececec #ececec #c6c6c6;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{background-color:#ececec;} .btn:active,.btn.active{background-color:#d3d3d3 \9;} +.btn-warning .caret{border-top-color:#ffffff;opacity:0.75;filter:alpha(opacity=75);} .btn-primary{background-color:#707070;background-image:-moz-linear-gradient(top, #909090, #3f3f3f);background-image:-ms-linear-gradient(top, #909090, #3f3f3f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#909090), to(#3f3f3f));background-image:-webkit-linear-gradient(top, #909090, #3f3f3f);background-image:-o-linear-gradient(top, #909090, #3f3f3f);background-image:linear-gradient(top, #909090, #3f3f3f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#909090', endColorstr='#3f3f3f', GradientType=0);border-color:#3f3f3f #3f3f3f #191919;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#3f3f3f;} .btn-primary:active,.btn-primary.active{background-color:#262626 \9;} -.btn-warning{background-color:#ffda2e;background-image:-moz-linear-gradient(top, #ffdf4d, #ffd200);background-image:-ms-linear-gradient(top, #ffdf4d, #ffd200);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffdf4d), to(#ffd200));background-image:-webkit-linear-gradient(top, #ffdf4d, #ffd200);background-image:-o-linear-gradient(top, #ffdf4d, #ffd200);background-image:linear-gradient(top, #ffdf4d, #ffd200);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdf4d', endColorstr='#ffd200', GradientType=0);border-color:#ffd200 #ffd200 #b39300;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#ffd200;} -.btn-warning:active,.btn-warning.active{background-color:#cca800 \9;} +.btn-warning{background-color:#fbd627;background-image:-moz-linear-gradient(top, #ffde42, #f4ca00);background-image:-ms-linear-gradient(top, #ffde42, #f4ca00);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffde42), to(#f4ca00));background-image:-webkit-linear-gradient(top, #ffde42, #f4ca00);background-image:-o-linear-gradient(top, #ffde42, #f4ca00);background-image:linear-gradient(top, #ffde42, #f4ca00);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffde42', endColorstr='#f4ca00', GradientType=0);border-color:#f4ca00 #f4ca00 #a88b00;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#f4ca00;} +.btn-warning:active,.btn-warning.active{background-color:#c1a000 \9;} .btn-danger{background-color:#e15454;background-image:-moz-linear-gradient(top, #e56e6e, #da2d2d);background-image:-ms-linear-gradient(top, #e56e6e, #da2d2d);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#e56e6e), to(#da2d2d));background-image:-webkit-linear-gradient(top, #e56e6e, #da2d2d);background-image:-o-linear-gradient(top, #e56e6e, #da2d2d);background-image:linear-gradient(top, #e56e6e, #da2d2d);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#e56e6e', endColorstr='#da2d2d', GradientType=0);border-color:#da2d2d #da2d2d #9f1c1c;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{background-color:#da2d2d;} .btn-danger:active,.btn-danger.active{background-color:#b42020 \9;} .btn-success{background-color:#79cb5d;background-image:-moz-linear-gradient(top, #8add6d, #60b044);background-image:-ms-linear-gradient(top, #8add6d, #60b044);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#8add6d), to(#60b044));background-image:-webkit-linear-gradient(top, #8add6d, #60b044);background-image:-o-linear-gradient(top, #8add6d, #60b044);background-image:linear-gradient(top, #8add6d, #60b044);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#8add6d', endColorstr='#60b044', GradientType=0);border-color:#60b044 #60b044 #42792f;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{background-color:#60b044;} diff --git a/spacelab/bootswatch.less b/spacelab/bootswatch.less index a07f5722..7193a0f7 100755 --- a/spacelab/bootswatch.less +++ b/spacelab/bootswatch.less @@ -98,6 +98,13 @@ .buttonBackground(#F4F4F4, #ECECEC); } +.btn-warning { + .caret { + border-top-color: @white; + .opacity(75); + } +} + .btn-primary { .buttonBackground(#909090, #3F3F3F); } diff --git a/spacelab/variables.less b/spacelab/variables.less index 81fd29a0..f6242d03 100755 --- a/spacelab/variables.less +++ b/spacelab/variables.less @@ -26,7 +26,7 @@ @blueDark: #405A6A; @green: #84DE81; @red: #E5322C; -@yellow: #FFD200; +@yellow: #F4CA00; @orange: #FF7D00; @pink: #F44B8C; @purple: #405A6A; diff --git a/united/bootstrap.css b/united/bootstrap.css index 598a0afa..0d6df933 100644 --- a/united/bootstrap.css +++ b/united/bootstrap.css @@ -3411,6 +3411,11 @@ a.thumbnail:hover { .btn-warning:active, .btn-warning.active { background-color: #e7a413 \9; } +.btn-warning .caret { + border-top-color: #ffffff; + opacity: 0.75; + filter: alpha(opacity=75); +} .alert { text-shadow: none !important; } diff --git a/united/bootstrap.min.css b/united/bootstrap.min.css index fd5db85e..4201b4f5 100644 --- a/united/bootstrap.min.css +++ b/united/bootstrap.min.css @@ -612,6 +612,7 @@ a.thumbnail:hover{border-color:#dd4814;-webkit-box-shadow:0 1px 4px rgba(0, 105, .btn-primary:active,.btn-primary.active{background-color:#ae3910 \9;} .btn-warning{background-color:#f3c768;background-image:-moz-linear-gradient(top, #f5d185, #efb73e);background-image:-ms-linear-gradient(top, #f5d185, #efb73e);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5d185), to(#efb73e));background-image:-webkit-linear-gradient(top, #f5d185, #efb73e);background-image:-o-linear-gradient(top, #f5d185, #efb73e);background-image:linear-gradient(top, #f5d185, #efb73e);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5d185', endColorstr='#efb73e', GradientType=0);border-color:#efb73e #efb73e #cf9311;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#efb73e;} .btn-warning:active,.btn-warning.active{background-color:#e7a413 \9;} +.btn-warning .caret{border-top-color:#ffffff;opacity:0.75;filter:alpha(opacity=75);} .alert{text-shadow:none !important;} .pull-right{float:right;} .pull-left{float:left;} diff --git a/united/bootswatch.less b/united/bootswatch.less index 1a56d842..d5251211 100755 --- a/united/bootswatch.less +++ b/united/bootswatch.less @@ -44,8 +44,15 @@ // Made warning button yellow since orange is taken .btn-warning { .buttonBackground(lighten(@yellow, 15%), @yellow); + + .caret { + border-top-color: @white; + .opacity(75); + } } + + // ALERTS // ----------------------------------------------------- -- cgit v1.2.3