From 9e8f14073acee424b5e7359f4db28fd48913b28a Mon Sep 17 00:00:00 2001 From: Thomas Park Date: Thu, 27 Sep 2012 15:35:16 -0400 Subject: spruce: fix pagination, form validation colors --- spruce/bootstrap.css | 420 +++++++++++++---------------------------------- spruce/bootstrap.min.css | 69 ++++---- spruce/bootswatch.less | 91 +++++----- spruce/variables.less | 26 +-- 4 files changed, 194 insertions(+), 412 deletions(-) diff --git a/spruce/bootstrap.css b/spruce/bootstrap.css index 2c64f5f4..98f47bd3 100644 --- a/spruce/bootstrap.css +++ b/spruce/bootstrap.css @@ -2281,7 +2281,7 @@ table [class*=span], padding: 5px 0; margin: 2px 0 0; list-style: none; - background-color: #ffffff; + background-color: #f5f3dc; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.2); *border-right-width: 2px; @@ -2323,30 +2323,30 @@ table [class*=span], .dropdown-submenu:hover > a { text-decoration: none; color: #ffffff; - background-color: rgba(0, 0, 0, 0.1); - background-color: rgba(0, 0, 0, 0.1); - background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.1)); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(0, 0, 0, 0.1)), to(rgba(0, 0, 0, 0.1))); - background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.1)); - background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.1)); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.1)); + background-color: #748c73; + background-color: #70866e; + background-image: -moz-linear-gradient(top, #748c73, #697e68); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#748c73), to(#697e68)); + background-image: -webkit-linear-gradient(top, #748c73, #697e68); + background-image: -o-linear-gradient(top, #748c73, #697e68); + background-image: linear-gradient(to bottom, #748c73, #697e68); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1a000000', endColorstr='#1a000000', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff748c73', endColorstr='#ff697e68', GradientType=0); } .dropdown-menu .active > a, .dropdown-menu .active > a:hover { color: #ffffff; text-decoration: none; outline: 0; - background-color: rgba(0, 0, 0, 0.1); - background-color: rgba(0, 0, 0, 0.1); - background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.1)); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(rgba(0, 0, 0, 0.1)), to(rgba(0, 0, 0, 0.1))); - background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.1)); - background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.1)); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.1)); + background-color: #748c73; + background-color: #70866e; + background-image: -moz-linear-gradient(top, #748c73, #697e68); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#748c73), to(#697e68)); + background-image: -webkit-linear-gradient(top, #748c73, #697e68); + background-image: -o-linear-gradient(top, #748c73, #697e68); + background-image: linear-gradient(to bottom, #748c73, #697e68); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1a000000', endColorstr='#1a000000', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff748c73', endColorstr='#ff697e68', GradientType=0); } .dropdown-menu .disabled > a, .dropdown-menu .disabled > a:hover { @@ -2403,7 +2403,7 @@ table [class*=span], border-color: transparent; border-style: solid; border-width: 5px 0 5px 5px; - border-left-color: #cccccc; + border-left-color: #ded88d; margin-top: 5px; margin-right: -10px; } @@ -2647,17 +2647,17 @@ input[type="button"].btn-block { .btn-primary { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #dce00b; - background-image: -moz-linear-gradient(top, #ebd90b, #c5eb0b); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ebd90b), to(#c5eb0b)); - background-image: -webkit-linear-gradient(top, #ebd90b, #c5eb0b); - background-image: -o-linear-gradient(top, #ebd90b, #c5eb0b); - background-image: linear-gradient(to bottom, #ebd90b, #c5eb0b); + background-color: #025b5d; + background-image: -moz-linear-gradient(top, #026567, #014d4e); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#026567), to(#014d4e)); + background-image: -webkit-linear-gradient(top, #026567, #014d4e); + background-image: -o-linear-gradient(top, #026567, #014d4e); + background-image: linear-gradient(to bottom, #026567, #014d4e); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebd90b', endColorstr='#ffc5eb0b', GradientType=0); - border-color: #c5eb0b #c5eb0b #88a208; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff026567', endColorstr='#ff014d4e', GradientType=0); + border-color: #014d4e #014d4e #000303; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #c5eb0b; + *background-color: #014d4e; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2668,12 +2668,12 @@ input[type="button"].btn-block { .btn-primary.disabled, .btn-primary[disabled] { color: #ffffff; - background-color: #c5eb0b; - *background-color: #b1d30a; + background-color: #014d4e; + *background-color: #013435; } .btn-primary:active, .btn-primary.active { - background-color: #9cba09 \9; + background-color: #011b1c \9; } .btn-warning { color: #ffffff; @@ -2709,17 +2709,17 @@ input[type="button"].btn-block { .btn-danger { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #da4f49; - background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); - background-image: linear-gradient(to bottom, #ee5f5b, #bd362f); + background-color: #d44f3e; + background-image: -moz-linear-gradient(top, #d65747, #d14432); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#d65747), to(#d14432)); + background-image: -webkit-linear-gradient(top, #d65747, #d14432); + background-image: -o-linear-gradient(top, #d65747, #d14432); + background-image: linear-gradient(to bottom, #d65747, #d14432); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0); - border-color: #bd362f #bd362f #802420; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd65747', endColorstr='#ffd14432', GradientType=0); + border-color: #d14432 #d14432 #952f21; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #bd362f; + *background-color: #d14432; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2730,27 +2730,27 @@ input[type="button"].btn-block { .btn-danger.disabled, .btn-danger[disabled] { color: #ffffff; - background-color: #bd362f; - *background-color: #a9302a; + background-color: #d14432; + *background-color: #bf3c2b; } .btn-danger:active, .btn-danger.active { - background-color: #942a25 \9; + background-color: #aa3526 \9; } .btn-success { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #5bb75b; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); - background-image: -webkit-linear-gradient(top, #62c462, #51a351); - background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(to bottom, #62c462, #51a351); + background-color: #01806f; + background-image: -moz-linear-gradient(top, #028a78, #017162); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#028a78), to(#017162)); + background-image: -webkit-linear-gradient(top, #028a78, #017162); + background-image: -o-linear-gradient(top, #028a78, #017162); + background-image: linear-gradient(to bottom, #028a78, #017162); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0); - border-color: #51a351 #51a351 #387038; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff028a78', endColorstr='#ff017162', GradientType=0); + border-color: #017162 #017162 #002620; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #51a351; + *background-color: #017162; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2761,12 +2761,12 @@ input[type="button"].btn-block { .btn-success.disabled, .btn-success[disabled] { color: #ffffff; - background-color: #51a351; - *background-color: #499249; + background-color: #017162; + *background-color: #01584c; } .btn-success:active, .btn-success.active { - background-color: #408140 \9; + background-color: #013f36 \9; } .btn-info { color: #ffffff; @@ -2802,17 +2802,17 @@ input[type="button"].btn-block { .btn-inverse { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #414141; - background-image: -moz-linear-gradient(top, #555555, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); - background-image: -webkit-linear-gradient(top, #555555, #222222); - background-image: -o-linear-gradient(top, #555555, #222222); - background-image: linear-gradient(to bottom, #555555, #222222); + background-color: #e1d00b; + background-image: -moz-linear-gradient(top, #ebd90b, #d3c30a); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ebd90b), to(#d3c30a)); + background-image: -webkit-linear-gradient(top, #ebd90b, #d3c30a); + background-image: -o-linear-gradient(top, #ebd90b, #d3c30a); + background-image: linear-gradient(to bottom, #ebd90b, #d3c30a); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff555555', endColorstr='#ff222222', GradientType=0); - border-color: #222222 #222222 #000000; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebd90b', endColorstr='#ffd3c30a', GradientType=0); + border-color: #d3c30a #d3c30a #8a7f06; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #222222; + *background-color: #d3c30a; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2823,12 +2823,12 @@ input[type="button"].btn-block { .btn-inverse.disabled, .btn-inverse[disabled] { color: #ffffff; - background-color: #222222; - *background-color: #151515; + background-color: #d3c30a; + *background-color: #baac09; } .btn-inverse:active, .btn-inverse.active { - background-color: #080808 \9; + background-color: #a29608 \9; } button.btn, input[type="submit"].btn { @@ -3014,22 +3014,22 @@ input[type="submit"].btn.btn-mini { background-color: #e6e6e6; } .btn-group.open .btn-primary.dropdown-toggle { - background-color: #c5eb0b; + background-color: #014d4e; } .btn-group.open .btn-warning.dropdown-toggle { background-color: #ee7026; } .btn-group.open .btn-danger.dropdown-toggle { - background-color: #bd362f; + background-color: #d14432; } .btn-group.open .btn-success.dropdown-toggle { - background-color: #51a351; + background-color: #017162; } .btn-group.open .btn-info.dropdown-toggle { background-color: #2f96b4; } .btn-group.open .btn-inverse.dropdown-toggle { - background-color: #222222; + background-color: #d3c30a; } .btn .caret { margin-top: 8px; @@ -3770,7 +3770,7 @@ input[type="submit"].btn.btn-mini { display: inline-block; border-left: 6px solid transparent; border-right: 6px solid transparent; - border-bottom: 6px solid #ffffff; + border-bottom: 6px solid #f5f3dc; position: absolute; top: -6px; left: 10px; @@ -3783,7 +3783,7 @@ input[type="submit"].btn.btn-mini { top: auto; } .navbar-fixed-bottom .nav > li > .dropdown-menu:after { - border-top: 6px solid #ffffff; + border-top: 6px solid #f5f3dc; border-bottom: 0; bottom: -6px; top: auto; @@ -4979,18 +4979,6 @@ blockquote small { background-color: rgba(255, 255, 255, 0.4); color: #ffffff; } -.navbar .nav > .open > a { - color: #ebd90b; -} -.navbar .nav > .open > .dropdown-menu { - background-color: #f5f3dc; - color: #013435; - border-color: transparent; -} -.navbar .nav > .open > .dropdown-menu a:hover { - background-color: #748c73; - color: #f5f3dc; -} .navbar .btn-navbar { margin-top: 14px; } @@ -5160,7 +5148,7 @@ div.subnav.subnav-fixed { .breadcrumb .active { color: #f5f3dc; } -.pagination > ul { +.pagination ul { background-color: #748c73; background-image: none; border-color: transparent; @@ -5168,20 +5156,20 @@ div.subnav.subnav-fixed { -moz-box-shadow: none; box-shadow: none; } -.pagination a { +.pagination ul > li > a { color: #ebd90b; border-color: transparent; } -.pagination a:hover { +.pagination ul > li > a:hover { color: #ebd90b; background-color: rgba(0, 0, 0, 0.1); } -.pagination .active a { +.pagination ul > .active > a { color: #f5f3dc; background-color: rgba(0, 0, 0, 0.1); } -.pagination .disabled a, -.pagination .disabled a:hover { +.pagination ul > .disabled > a, +.pagination ul > .disabled > a:hover { color: #01584c; } .pager a { @@ -5197,236 +5185,17 @@ div.subnav.subnav-fixed { color: #013435; } .btn { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #014344; - background-image: -moz-linear-gradient(top, #014d4e, #013435); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#014d4e), to(#013435)); - background-image: -webkit-linear-gradient(top, #014d4e, #013435); - background-image: -o-linear-gradient(top, #014d4e, #013435); - background-image: linear-gradient(to bottom, #014d4e, #013435); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff014d4e', endColorstr='#ff013435', GradientType=0); - border-color: #013435 #013435 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #013435; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); font-family: 'Josefin Slab', serif; font-weight: 700; - color: #ffffff; text-shadow: none; border-color: transparent; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; } -.btn:hover, -.btn:active, -.btn.active, -.btn.disabled, -.btn[disabled] { - color: #ffffff; - background-color: #013435; - *background-color: #011b1c; -} -.btn:active, -.btn.active { - background-color: #000303 \9; -} -.btn:hover { - color: #eeeeee; -} .btn-large { font-size: 18px; } -.btn-primary { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #01806f; - background-image: -moz-linear-gradient(top, #028a78, #017162); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#028a78), to(#017162)); - background-image: -webkit-linear-gradient(top, #028a78, #017162); - background-image: -o-linear-gradient(top, #028a78, #017162); - background-image: linear-gradient(to bottom, #028a78, #017162); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff028a78', endColorstr='#ff017162', GradientType=0); - border-color: #017162 #017162 #002620; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #017162; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -} -.btn-primary:hover, -.btn-primary:active, -.btn-primary.active, -.btn-primary.disabled, -.btn-primary[disabled] { - color: #ffffff; - background-color: #017162; - *background-color: #01584c; -} -.btn-primary:active, -.btn-primary.active { - background-color: #013f36 \9; -} -.btn-warning { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #ec6a1e; - background-image: -moz-linear-gradient(top, #ee7026, #e86112); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee7026), to(#e86112)); - background-image: -webkit-linear-gradient(top, #ee7026, #e86112); - background-image: -o-linear-gradient(top, #ee7026, #e86112); - background-image: linear-gradient(to bottom, #ee7026, #e86112); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee7026', endColorstr='#ffe86112', GradientType=0); - border-color: #e86112 #e86112 #a1440d; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #e86112; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -} -.btn-warning:hover, -.btn-warning:active, -.btn-warning.active, -.btn-warning.disabled, -.btn-warning[disabled] { - color: #ffffff; - background-color: #e86112; - *background-color: #d15710; -} -.btn-warning:active, -.btn-warning.active { - background-color: #b94e0e \9; -} -.btn-danger { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #d44f3e; - background-image: -moz-linear-gradient(top, #d65747, #d14432); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#d65747), to(#d14432)); - background-image: -webkit-linear-gradient(top, #d65747, #d14432); - background-image: -o-linear-gradient(top, #d65747, #d14432); - background-image: linear-gradient(to bottom, #d65747, #d14432); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd65747', endColorstr='#ffd14432', GradientType=0); - border-color: #d14432 #d14432 #952f21; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #d14432; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -} -.btn-danger:hover, -.btn-danger:active, -.btn-danger.active, -.btn-danger.disabled, -.btn-danger[disabled] { - color: #ffffff; - background-color: #d14432; - *background-color: #bf3c2b; -} -.btn-danger:active, -.btn-danger.active { - background-color: #aa3526 \9; -} -.btn-success { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #5bb75b; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); - background-image: -webkit-linear-gradient(top, #62c462, #51a351); - background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(to bottom, #62c462, #51a351); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0); - border-color: #51a351 #51a351 #387038; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #51a351; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -} -.btn-success:hover, -.btn-success:active, -.btn-success.active, -.btn-success.disabled, -.btn-success[disabled] { - color: #ffffff; - background-color: #51a351; - *background-color: #499249; -} -.btn-success:active, -.btn-success.active { - background-color: #408140 \9; -} -.btn-info { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #49afcd; - background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); - background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); - background-image: linear-gradient(to bottom, #5bc0de, #2f96b4); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0); - border-color: #2f96b4 #2f96b4 #1f6377; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #2f96b4; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -} -.btn-info:hover, -.btn-info:active, -.btn-info.active, -.btn-info.disabled, -.btn-info[disabled] { - color: #ffffff; - background-color: #2f96b4; - *background-color: #2a85a0; -} -.btn-info:active, -.btn-info.active { - background-color: #24748c \9; -} -.btn-inverse { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #e1d00b; - background-image: -moz-linear-gradient(top, #ebd90b, #d3c30a); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ebd90b), to(#d3c30a)); - background-image: -webkit-linear-gradient(top, #ebd90b, #d3c30a); - background-image: -o-linear-gradient(top, #ebd90b, #d3c30a); - background-image: linear-gradient(to bottom, #ebd90b, #d3c30a); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebd90b', endColorstr='#ffd3c30a', GradientType=0); - border-color: #d3c30a #d3c30a #8a7f06; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #d3c30a; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -} -.btn-inverse:hover, -.btn-inverse:active, -.btn-inverse.active, -.btn-inverse.disabled, -.btn-inverse[disabled] { - color: #ffffff; - background-color: #d3c30a; - *background-color: #baac09; -} -.btn-inverse:active, -.btn-inverse.active { - background-color: #a29608 \9; -} .btn-group .dropdown-toggle { -webkit-box-shadow: none; -moz-box-shadow: none; @@ -5496,6 +5265,39 @@ legend { -moz-border-radius: 4px; border-radius: 4px; } +.control-group.error label, +.control-group.error .help-block, +.control-group.error .help-inline { + color: #edb6af; +} +.control-group.error input, +.control-group.error select, +.control-group.error textarea { + border: 2px solid #edb6af; + color: #013435; +} +.control-group.success label, +.control-group.success .help-block, +.control-group.success .help-inline { + color: #6bf555; +} +.control-group.success input, +.control-group.success select, +.control-group.success textarea { + border: 2px solid #6bf555; + color: #013435; +} +.control-group.warning label, +.control-group.warning .help-block, +.control-group.warning .help-inline { + color: #f7be9c; +} +.control-group.warning input, +.control-group.warning select, +.control-group.warning textarea { + border: 2px solid #f7be9c; + color: #013435; +} .alert { text-shadow: none; border: none; diff --git a/spruce/bootstrap.min.css b/spruce/bootstrap.min.css index f3b6bcc8..58c45069 100644 --- a/spruce/bootstrap.min.css +++ b/spruce/bootstrap.min.css @@ -457,11 +457,11 @@ table [class*=span],.row-fluid table [class*=span]{display:table-cell;float:none .dropdown-toggle:active,.open .dropdown-toggle{outline:0;} .caret{display:inline-block;width:0;height:0;vertical-align:top;border-top:4px solid #000000;border-right:4px solid transparent;border-left:4px solid transparent;content:"";} .dropdown .caret{margin-top:8px;margin-left:2px;} -.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;background-color:#ffffff;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;}.dropdown-menu.pull-right{right:0;left:auto;} +.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;background-color:#f5f3dc;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;}.dropdown-menu.pull-right{right:0;left:auto;} .dropdown-menu .divider{*width:100%;height:1px;margin:9.5px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:transparent;border-bottom:1px solid #90a38f;} .dropdown-menu a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:21px;color:#333333;white-space:nowrap;} -.dropdown-menu li>a:hover,.dropdown-menu li>a:focus,.dropdown-submenu:hover>a{text-decoration:none;color:#ffffff;background-color:rgba(0, 0, 0, 0.1);background-color:rgba(0, 0, 0, 0.1);background-image:-moz-linear-gradient(top, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.1));background-image:-webkit-gradient(linear, 0 0, 0 100%, from(rgba(0, 0, 0, 0.1)), to(rgba(0, 0, 0, 0.1)));background-image:-webkit-linear-gradient(top, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.1));background-image:-o-linear-gradient(top, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.1));background-image:linear-gradient(to bottom, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.1));background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1a000000', endColorstr='#1a000000', GradientType=0);} -.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;outline:0;background-color:rgba(0, 0, 0, 0.1);background-color:rgba(0, 0, 0, 0.1);background-image:-moz-linear-gradient(top, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.1));background-image:-webkit-gradient(linear, 0 0, 0 100%, from(rgba(0, 0, 0, 0.1)), to(rgba(0, 0, 0, 0.1)));background-image:-webkit-linear-gradient(top, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.1));background-image:-o-linear-gradient(top, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.1));background-image:linear-gradient(to bottom, rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.1));background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1a000000', endColorstr='#1a000000', GradientType=0);} +.dropdown-menu li>a:hover,.dropdown-menu li>a:focus,.dropdown-submenu:hover>a{text-decoration:none;color:#ffffff;background-color:#748c73;background-color:#70866e;background-image:-moz-linear-gradient(top, #748c73, #697e68);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#748c73), to(#697e68));background-image:-webkit-linear-gradient(top, #748c73, #697e68);background-image:-o-linear-gradient(top, #748c73, #697e68);background-image:linear-gradient(to bottom, #748c73, #697e68);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff748c73', endColorstr='#ff697e68', GradientType=0);} +.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;outline:0;background-color:#748c73;background-color:#70866e;background-image:-moz-linear-gradient(top, #748c73, #697e68);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#748c73), to(#697e68));background-image:-webkit-linear-gradient(top, #748c73, #697e68);background-image:-o-linear-gradient(top, #748c73, #697e68);background-image:linear-gradient(to bottom, #748c73, #697e68);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff748c73', endColorstr='#ff697e68', GradientType=0);} .dropdown-menu .disabled>a,.dropdown-menu .disabled>a:hover{color:#999999;} .dropdown-menu .disabled>a:hover{text-decoration:none;background-color:transparent;cursor:default;} .open{*z-index:1000;}.open >.dropdown-menu{display:block;} @@ -471,7 +471,7 @@ table [class*=span],.row-fluid table [class*=span]{display:table-cell;float:none .dropdown-submenu{position:relative;} .dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;} .dropdown-submenu:hover>.dropdown-menu{display:block;} -.dropdown-submenu>a:after{display:block;content:" ";float:right;width:0;height:0;border-color:transparent;border-style:solid;border-width:5px 0 5px 5px;border-left-color:#cccccc;margin-top:5px;margin-right:-10px;} +.dropdown-submenu>a:after{display:block;content:" ";float:right;width:0;height:0;border-color:transparent;border-style:solid;border-width:5px 0 5px 5px;border-left-color:#ded88d;margin-top:5px;margin-right:-10px;} .dropdown-submenu:hover>a:after{border-left-color:#ffffff;} .dropdown .dropdown-menu .nav-header{padding-left:20px;padding-right:20px;} .typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} @@ -499,18 +499,18 @@ button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-ap input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%;} .btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255, 255, 255, 0.75);} .btn{border-color:#c5c5c5;border-color:rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);} -.btn-primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#dce00b;background-image:-moz-linear-gradient(top, #ebd90b, #c5eb0b);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ebd90b), to(#c5eb0b));background-image:-webkit-linear-gradient(top, #ebd90b, #c5eb0b);background-image:-o-linear-gradient(top, #ebd90b, #c5eb0b);background-image:linear-gradient(to bottom, #ebd90b, #c5eb0b);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebd90b', endColorstr='#ffc5eb0b', GradientType=0);border-color:#c5eb0b #c5eb0b #88a208;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#c5eb0b;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#ffffff;background-color:#c5eb0b;*background-color:#b1d30a;} -.btn-primary:active,.btn-primary.active{background-color:#9cba09 \9;} +.btn-primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#025b5d;background-image:-moz-linear-gradient(top, #026567, #014d4e);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#026567), to(#014d4e));background-image:-webkit-linear-gradient(top, #026567, #014d4e);background-image:-o-linear-gradient(top, #026567, #014d4e);background-image:linear-gradient(to bottom, #026567, #014d4e);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff026567', endColorstr='#ff014d4e', GradientType=0);border-color:#014d4e #014d4e #000303;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#014d4e;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#ffffff;background-color:#014d4e;*background-color:#013435;} +.btn-primary:active,.btn-primary.active{background-color:#011b1c \9;} .btn-warning{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#f18c51;background-image:-moz-linear-gradient(top, #f49f6d, #ee7026);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f49f6d), to(#ee7026));background-image:-webkit-linear-gradient(top, #f49f6d, #ee7026);background-image:-o-linear-gradient(top, #f49f6d, #ee7026);background-image:linear-gradient(to bottom, #f49f6d, #ee7026);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff49f6d', endColorstr='#ffee7026', GradientType=0);border-color:#ee7026 #ee7026 #b94e0e;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#ee7026;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#ffffff;background-color:#ee7026;*background-color:#e86112;} .btn-warning:active,.btn-warning.active{background-color:#d15710 \9;} -.btn-danger{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#da4f49;background-image:-moz-linear-gradient(top, #ee5f5b, #bd362f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));background-image:-webkit-linear-gradient(top, #ee5f5b, #bd362f);background-image:-o-linear-gradient(top, #ee5f5b, #bd362f);background-image:linear-gradient(to bottom, #ee5f5b, #bd362f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);border-color:#bd362f #bd362f #802420;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#bd362f;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#ffffff;background-color:#bd362f;*background-color:#a9302a;} -.btn-danger:active,.btn-danger.active{background-color:#942a25 \9;} -.btn-success{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#5bb75b;background-image:-moz-linear-gradient(top, #62c462, #51a351);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));background-image:-webkit-linear-gradient(top, #62c462, #51a351);background-image:-o-linear-gradient(top, #62c462, #51a351);background-image:linear-gradient(to bottom, #62c462, #51a351);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);border-color:#51a351 #51a351 #387038;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#51a351;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#ffffff;background-color:#51a351;*background-color:#499249;} -.btn-success:active,.btn-success.active{background-color:#408140 \9;} +.btn-danger{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#d44f3e;background-image:-moz-linear-gradient(top, #d65747, #d14432);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#d65747), to(#d14432));background-image:-webkit-linear-gradient(top, #d65747, #d14432);background-image:-o-linear-gradient(top, #d65747, #d14432);background-image:linear-gradient(to bottom, #d65747, #d14432);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd65747', endColorstr='#ffd14432', GradientType=0);border-color:#d14432 #d14432 #952f21;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#d14432;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#ffffff;background-color:#d14432;*background-color:#bf3c2b;} +.btn-danger:active,.btn-danger.active{background-color:#aa3526 \9;} +.btn-success{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#01806f;background-image:-moz-linear-gradient(top, #028a78, #017162);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#028a78), to(#017162));background-image:-webkit-linear-gradient(top, #028a78, #017162);background-image:-o-linear-gradient(top, #028a78, #017162);background-image:linear-gradient(to bottom, #028a78, #017162);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff028a78', endColorstr='#ff017162', GradientType=0);border-color:#017162 #017162 #002620;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#017162;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#ffffff;background-color:#017162;*background-color:#01584c;} +.btn-success:active,.btn-success.active{background-color:#013f36 \9;} .btn-info{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#49afcd;background-image:-moz-linear-gradient(top, #5bc0de, #2f96b4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));background-image:-webkit-linear-gradient(top, #5bc0de, #2f96b4);background-image:-o-linear-gradient(top, #5bc0de, #2f96b4);background-image:linear-gradient(to bottom, #5bc0de, #2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#2f96b4;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{color:#ffffff;background-color:#2f96b4;*background-color:#2a85a0;} .btn-info:active,.btn-info.active{background-color:#24748c \9;} -.btn-inverse{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#414141;background-image:-moz-linear-gradient(top, #555555, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222));background-image:-webkit-linear-gradient(top, #555555, #222222);background-image:-o-linear-gradient(top, #555555, #222222);background-image:linear-gradient(to bottom, #555555, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff555555', endColorstr='#ff222222', GradientType=0);border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#222222;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#ffffff;background-color:#222222;*background-color:#151515;} -.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9;} +.btn-inverse{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#e1d00b;background-image:-moz-linear-gradient(top, #ebd90b, #d3c30a);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ebd90b), to(#d3c30a));background-image:-webkit-linear-gradient(top, #ebd90b, #d3c30a);background-image:-o-linear-gradient(top, #ebd90b, #d3c30a);background-image:linear-gradient(to bottom, #ebd90b, #d3c30a);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebd90b', endColorstr='#ffd3c30a', GradientType=0);border-color:#d3c30a #d3c30a #8a7f06;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#d3c30a;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#ffffff;background-color:#d3c30a;*background-color:#baac09;} +.btn-inverse:active,.btn-inverse.active{background-color:#a29608 \9;} button.btn,input[type="submit"].btn{*padding-top:3px;*padding-bottom:3px;}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0;} button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px;} button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px;} @@ -541,12 +541,12 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .btn-group>.btn-large+.dropdown-toggle{padding-left:12px;padding-right:12px;*padding-top:7px;*padding-bottom:7px;} .btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);} .btn-group.open .btn.dropdown-toggle{background-color:#e6e6e6;} -.btn-group.open .btn-primary.dropdown-toggle{background-color:#c5eb0b;} +.btn-group.open .btn-primary.dropdown-toggle{background-color:#014d4e;} .btn-group.open .btn-warning.dropdown-toggle{background-color:#ee7026;} -.btn-group.open .btn-danger.dropdown-toggle{background-color:#bd362f;} -.btn-group.open .btn-success.dropdown-toggle{background-color:#51a351;} +.btn-group.open .btn-danger.dropdown-toggle{background-color:#d14432;} +.btn-group.open .btn-success.dropdown-toggle{background-color:#017162;} .btn-group.open .btn-info.dropdown-toggle{background-color:#2f96b4;} -.btn-group.open .btn-inverse.dropdown-toggle{background-color:#222222;} +.btn-group.open .btn-inverse.dropdown-toggle{background-color:#d3c30a;} .btn .caret{margin-top:8px;margin-left:0;} .btn-mini .caret,.btn-small .caret,.btn-large .caret{margin-top:6px;} .btn-large .caret{border-left-width:5px;border-right-width:5px;border-top-width:5px;} @@ -671,9 +671,9 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .navbar .btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);-moz-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);} .btn-navbar .icon-bar+.icon-bar{margin-top:3px;} .navbar .nav>li>.dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;} -.navbar .nav>li>.dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #ffffff;position:absolute;top:-6px;left:10px;} +.navbar .nav>li>.dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #f5f3dc;position:absolute;top:-6px;left:10px;} .navbar-fixed-bottom .nav>li>.dropdown-menu:before{border-top:7px solid #ccc;border-top-color:rgba(0, 0, 0, 0.2);border-bottom:0;bottom:-7px;top:auto;} -.navbar-fixed-bottom .nav>li>.dropdown-menu:after{border-top:6px solid #ffffff;border-bottom:0;bottom:-6px;top:auto;} +.navbar-fixed-bottom .nav>li>.dropdown-menu:after{border-top:6px solid #f5f3dc;border-bottom:0;bottom:-6px;top:auto;} .navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.open.active>.dropdown-toggle{background-color:#013435;color:#ebd90b;} .navbar .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#f5f3dc;border-bottom-color:#f5f3dc;} .navbar .nav li.dropdown.open>.dropdown-toggle .caret,.navbar .nav li.dropdown.active>.dropdown-toggle .caret,.navbar .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#ebd90b;border-bottom-color:#ebd90b;} @@ -845,9 +845,6 @@ blockquote small{color:#013435;} .navbar .divider-vertical{border-color:rgba(0, 0, 0, 0.2);} .navbar .navbar-search{margin-top:12px;} .navbar .navbar-search .search-query{border-color:transparent;background-color:rgba(255, 255, 255, 0.4);color:#ffffff;} -.navbar .nav>.open>a{color:#ebd90b;} -.navbar .nav>.open>.dropdown-menu{background-color:#f5f3dc;color:#013435;border-color:transparent;} -.navbar .nav>.open>.dropdown-menu a:hover{background-color:#748c73;color:#f5f3dc;} .navbar .btn-navbar{margin-top:14px;} .navbar .navbar-form,.navbar .navbar-search{border-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} @media (max-width:979px){.navbar .nav-collapse .nav li>a{color:#f5f3dc;}.navbar .nav-collapse .nav li>a:hover{color:#ebd90b;background-color:#01584c;} .navbar-inverse .nav-collapse .nav li>a:hover{background-color:rgba(0, 0, 0, 0.06) !important;}}div.subnav{background-color:#015b4e;background-image:none;border-color:transparent;-webkit-box-shadow:0 1px 5px rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 5px rgba(0, 0, 0, 0.1);box-shadow:0 1px 5px rgba(0, 0, 0, 0.1);font-size:18px;}div.subnav .nav>li>a{padding:13px 12px 9px;border-color:transparent;background-color:transparent;font-family:'Josefin Slab',serif;font-weight:700;color:#f5f3dc;} @@ -874,28 +871,14 @@ div.subnav.subnav-fixed{top:50px;} .breadcrumb li a:hover{color:#ebd90b;} .breadcrumb li .divider{color:#f5f3dc;} .breadcrumb .active{color:#f5f3dc;} -.pagination >ul{background-color:#748c73;background-image:none;border-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.pagination a{color:#ebd90b;border-color:transparent;}.pagination a:hover{color:#ebd90b;background-color:rgba(0, 0, 0, 0.1);} -.pagination .active a{color:#f5f3dc;background-color:rgba(0, 0, 0, 0.1);} -.pagination .disabled a,.pagination .disabled a:hover{color:#01584c;} +.pagination ul{background-color:#748c73;background-image:none;border-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +.pagination ul>li>a{color:#ebd90b;border-color:transparent;}.pagination ul>li>a:hover{color:#ebd90b;background-color:rgba(0, 0, 0, 0.1);} +.pagination ul>.active>a{color:#f5f3dc;background-color:rgba(0, 0, 0, 0.1);} +.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover{color:#01584c;} .pager a{border:none;background-color:#748C73;}.pager a:hover{background-color:#687D67;} .pager .disabled a,.pager .disabled a:hover{background-color:#748C73;color:#013435;} -.btn{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#014344;background-image:-moz-linear-gradient(top, #014d4e, #013435);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#014d4e), to(#013435));background-image:-webkit-linear-gradient(top, #014d4e, #013435);background-image:-o-linear-gradient(top, #014d4e, #013435);background-image:linear-gradient(to bottom, #014d4e, #013435);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff014d4e', endColorstr='#ff013435', GradientType=0);border-color:#013435 #013435 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#013435;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);font-family:'Josefin Slab',serif;font-weight:700;color:#ffffff;text-shadow:none;border-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#ffffff;background-color:#013435;*background-color:#011b1c;} -.btn:active,.btn.active{background-color:#000303 \9;} -.btn:hover{color:#eeeeee;} +.btn{font-family:'Josefin Slab',serif;font-weight:700;text-shadow:none;border-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .btn-large{font-size:18px;} -.btn-primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#01806f;background-image:-moz-linear-gradient(top, #028a78, #017162);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#028a78), to(#017162));background-image:-webkit-linear-gradient(top, #028a78, #017162);background-image:-o-linear-gradient(top, #028a78, #017162);background-image:linear-gradient(to bottom, #028a78, #017162);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff028a78', endColorstr='#ff017162', GradientType=0);border-color:#017162 #017162 #002620;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#017162;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#ffffff;background-color:#017162;*background-color:#01584c;} -.btn-primary:active,.btn-primary.active{background-color:#013f36 \9;} -.btn-warning{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#ec6a1e;background-image:-moz-linear-gradient(top, #ee7026, #e86112);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee7026), to(#e86112));background-image:-webkit-linear-gradient(top, #ee7026, #e86112);background-image:-o-linear-gradient(top, #ee7026, #e86112);background-image:linear-gradient(to bottom, #ee7026, #e86112);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee7026', endColorstr='#ffe86112', GradientType=0);border-color:#e86112 #e86112 #a1440d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#e86112;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#ffffff;background-color:#e86112;*background-color:#d15710;} -.btn-warning:active,.btn-warning.active{background-color:#b94e0e \9;} -.btn-danger{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#d44f3e;background-image:-moz-linear-gradient(top, #d65747, #d14432);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#d65747), to(#d14432));background-image:-webkit-linear-gradient(top, #d65747, #d14432);background-image:-o-linear-gradient(top, #d65747, #d14432);background-image:linear-gradient(to bottom, #d65747, #d14432);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd65747', endColorstr='#ffd14432', GradientType=0);border-color:#d14432 #d14432 #952f21;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#d14432;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#ffffff;background-color:#d14432;*background-color:#bf3c2b;} -.btn-danger:active,.btn-danger.active{background-color:#aa3526 \9;} -.btn-success{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#5bb75b;background-image:-moz-linear-gradient(top, #62c462, #51a351);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));background-image:-webkit-linear-gradient(top, #62c462, #51a351);background-image:-o-linear-gradient(top, #62c462, #51a351);background-image:linear-gradient(to bottom, #62c462, #51a351);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);border-color:#51a351 #51a351 #387038;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#51a351;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#ffffff;background-color:#51a351;*background-color:#499249;} -.btn-success:active,.btn-success.active{background-color:#408140 \9;} -.btn-info{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#49afcd;background-image:-moz-linear-gradient(top, #5bc0de, #2f96b4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));background-image:-webkit-linear-gradient(top, #5bc0de, #2f96b4);background-image:-o-linear-gradient(top, #5bc0de, #2f96b4);background-image:linear-gradient(to bottom, #5bc0de, #2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#2f96b4;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{color:#ffffff;background-color:#2f96b4;*background-color:#2a85a0;} -.btn-info:active,.btn-info.active{background-color:#24748c \9;} -.btn-inverse{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#e1d00b;background-image:-moz-linear-gradient(top, #ebd90b, #d3c30a);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ebd90b), to(#d3c30a));background-image:-webkit-linear-gradient(top, #ebd90b, #d3c30a);background-image:-o-linear-gradient(top, #ebd90b, #d3c30a);background-image:linear-gradient(to bottom, #ebd90b, #d3c30a);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebd90b', endColorstr='#ffd3c30a', GradientType=0);border-color:#d3c30a #d3c30a #8a7f06;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#d3c30a;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#ffffff;background-color:#d3c30a;*background-color:#baac09;} -.btn-inverse:active,.btn-inverse.active{background-color:#a29608 \9;} .btn-group .dropdown-toggle{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .table,.table.table-bordered,.table.table-striped{-webkit-border-radius:0 0 8px 8px;-moz-border-radius:0 0 8px 8px;border-radius:0 0 8px 8px;} .table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child,.table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} @@ -910,6 +893,12 @@ input,textarea,select{color:#013435;} .uneditable-input{color:#555555;} legend{border-bottom:2px solid #ffffff;} .form-actions{border-top:none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.control-group.error label,.control-group.error .help-block,.control-group.error .help-inline{color:#edb6af;} +.control-group.error input,.control-group.error select,.control-group.error textarea{border:2px solid #edb6af;color:#013435;} +.control-group.success label,.control-group.success .help-block,.control-group.success .help-inline{color:#6bf555;} +.control-group.success input,.control-group.success select,.control-group.success textarea{border:2px solid #6bf555;color:#013435;} +.control-group.warning label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#f7be9c;} +.control-group.warning input,.control-group.warning select,.control-group.warning textarea{border:2px solid #f7be9c;color:#013435;} .alert{text-shadow:none;border:none;} .alert-heading{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;color:inherit;} .badge,.label{background-color:#01584c;text-shadow:none;}.badge-success,.label-success{background-color:#24c00b;} diff --git a/spruce/bootswatch.less b/spruce/bootswatch.less index d22df0e6..f0451bc9 100755 --- a/spruce/bootswatch.less +++ b/spruce/bootswatch.less @@ -127,21 +127,6 @@ blockquote { color: @white; } - .nav > .open > a { - color: @yellow; - } - - .nav > .open > .dropdown-menu { - background-color: @headingsColor; - color: @textColor; - border-color: transparent; - } - - .nav > .open > .dropdown-menu a:hover { - background-color: darken(#90A38F, 10%); - color: @headingsColor; - } - .btn-navbar { margin-top: 14px; } @@ -358,14 +343,14 @@ div.subnav { .pagination { - & > ul { + ul { background-color: darken(#90A38F, 10%); background-image: none; border-color: transparent; .box-shadow(none); } - a { + ul > li > a { color: @yellow; border-color: transparent; @@ -375,13 +360,13 @@ div.subnav { } } - .active a { + ul > .active > a { color: @headingsColor; background-color: rgba(0, 0, 0, 0.1); } - .disabled a, - .disabled a:hover { + ul > .disabled > a, + ul > .disabled > a:hover { color: @blue; } } @@ -408,47 +393,17 @@ div.subnav { // -------------------------------------------------- .btn { - .buttonBackground(lighten(@blueDark, 5%), @blueDark); font-family: @headingsFontFamily; font-weight: @headingsFontWeight; - color: @white; text-shadow: none; border-color: transparent; .box-shadow(none); - - &:hover { - color: @grayLighter; - } } .btn-large { font-size: 18px; } -.btn-primary { - .buttonBackground(lighten(@blue, 10%), lighten(@blue, 5%)); -} - -.btn-warning { - .buttonBackground(@orange, darken(@orange, 5%)); -} - -.btn-danger { - .buttonBackground(lighten(@red, 5%), @red); -} - -.btn-success { - .buttonBackground(#62c462, #51a351); -} - -.btn-info { - .buttonBackground(#5bc0de, #2f96b4); -} - -.btn-inverse { - .buttonBackground(@yellow, darken(@yellow, 5%)); -} - .btn-group .dropdown-toggle { .box-shadow(none); } @@ -522,6 +477,42 @@ legend { .border-radius(4px); } +.control-group.error { + + label, .help-block, .help-inline { + color: lighten(@red, 30%); + } + + input, select, textarea { + border: 2px solid lighten(@red, 30%); + color: @textColor; + } +} + +.control-group.success { + + label, .help-block, .help-inline { + color: lighten(#24C00B, 25%); + } + + input, select, textarea { + border: 2px solid lighten(#24C00B, 25%); + color: @textColor; + } +} + +.control-group.warning { + + label, .help-block, .help-inline { + color: lighten(@orange, 25%); + } + + input, select, textarea { + border: 2px solid lighten(@orange, 25%); + color: @textColor; + } +} + // ALERTS, LABELS, BADGES // -------------------------------------------------- diff --git a/spruce/variables.less b/spruce/variables.less index e7fce804..b781f138 100755 --- a/spruce/variables.less +++ b/spruce/variables.less @@ -74,23 +74,23 @@ @btnBackgroundHighlight: darken(@white, 10%); @btnBorder: darken(@white, 20%); -@btnPrimaryBackground: @linkColor; -@btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 15%); +@btnPrimaryBackground: lighten(@blueDark, 10%); +@btnPrimaryBackgroundHighlight: lighten(@blueDark, 5%); @btnInfoBackground: #5bc0de; @btnInfoBackgroundHighlight: #2f96b4; -@btnSuccessBackground: #62c462; -@btnSuccessBackgroundHighlight: #51a351; +@btnSuccessBackground: lighten(@blue, 10%); +@btnSuccessBackgroundHighlight: lighten(@blue, 5%); @btnWarningBackground: lighten(@orange, 15%); @btnWarningBackgroundHighlight: @orange; -@btnDangerBackground: #ee5f5b; -@btnDangerBackgroundHighlight: #bd362f; +@btnDangerBackground: lighten(@red, 5%); +@btnDangerBackgroundHighlight: @red; -@btnInverseBackground: @gray; -@btnInverseBackgroundHighlight: @grayDarker; +@btnInverseBackground: @yellow; +@btnInverseBackgroundHighlight: darken(@yellow, 5%); // Forms @@ -103,7 +103,7 @@ // Dropdowns // ------------------------- -@dropdownBackground: @white; +@dropdownBackground: @headingsColor; @dropdownBorder: rgba(0,0,0,.2); @dropdownDividerTop: transparent; @dropdownDividerBottom: @bodyBackground; @@ -111,7 +111,7 @@ @dropdownLinkColor: @grayDark; @dropdownLinkColorHover: @white; -@dropdownLinkBackgroundHover: rgba(0, 0, 0, 0.1); +@dropdownLinkBackgroundHover: darken(@bodyBackground, 10%); @dropdownLinkColorActive: @dropdownLinkColorHover; @dropdownLinkBackgroundActive: @dropdownLinkBackgroundHover; @@ -151,7 +151,7 @@ // Wells // ------------------------- -@wellBackground: darken(#90A38F, 10%); +@wellBackground: darken(@bodyBackground, 10%); // Navbar @@ -194,14 +194,14 @@ // Pagination // ------------------------- -@paginationBackground: darken(#90A38F, 10%); +@paginationBackground: darken(@bodyBackground, 10%); @paginationBorder: transparent; @paginationActiveBackground: #A2CDB5; // Hero unit // ------------------------- -@heroUnitBackground: darken(#90A38F, 10%); +@heroUnitBackground: darken(@bodyBackground, 10%); @heroUnitHeadingColor: @headingsColor; @heroUnitLeadColor: inherit; -- cgit v1.2.3