From fdaba1165d3a63f7bce101556c72681e2f255bb4 Mon Sep 17 00:00:00 2001 From: Thomas Park Date: Fri, 23 Nov 2012 19:19:07 -0500 Subject: [PATCH] spruce: overhaul to light theme with new fonts, navbars, etc --- spruce/bootstrap.css | 877 ++++++++++++++++++++------------------- spruce/bootstrap.min.css | 364 ++++++++-------- spruce/bootswatch.less | 418 +++++++++++-------- spruce/variables.less | 88 ++-- 4 files changed, 914 insertions(+), 833 deletions(-) diff --git a/spruce/bootstrap.css b/spruce/bootstrap.css index 3d0eaaa..c1ac4ea 100644 --- a/spruce/bootstrap.css +++ b/spruce/bootstrap.css @@ -1,4 +1,4 @@ -@import url('https://fonts.googleapis.com/css?family=Josefin+Slab:400,700'); +@import url(http://fonts.googleapis.com/css?family=Crete+Round); /*! * Bootstrap v2.2.1 * @@ -145,18 +145,18 @@ textarea { } body { margin: 0; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 14px; + font-family: Georgia, "Times New Roman", Times, serif; + font-size: 15px; line-height: 21px; - color: #013435; - background-color: #90a38f; + color: #555555; + background-color: #ffffff; } a { - color: #ebd90b; + color: #028d79; text-decoration: none; } a:hover { - color: #ebd90b; + color: #028d79; text-decoration: underline; } .img-rounded { @@ -489,7 +489,7 @@ p { } .lead { margin-bottom: 21px; - font-size: 21px; + font-size: 22.5px; font-weight: 200; line-height: 31.5px; } @@ -539,10 +539,10 @@ h4, h5, h6 { margin: 10.5px 0; - font-family: 'Josefin Slab', serif; - font-weight: 700; + font-family: 'Crete Round', serif; + font-weight: normal; line-height: 21px; - color: #f5f3dc; + color: #333333; text-rendering: optimizelegibility; } h1 small, @@ -561,34 +561,34 @@ h3 { line-height: 42px; } h1 { - font-size: 38.5px; + font-size: 41.25px; } h2 { - font-size: 31.5px; + font-size: 33.75px; } h3 { - font-size: 24.5px; + font-size: 26.25px; } h4 { - font-size: 17.5px; + font-size: 18.75px; } h5 { - font-size: 14px; + font-size: 15px; } h6 { - font-size: 11.9px; + font-size: 12.75px; } h1 small { - font-size: 24.5px; + font-size: 26.25px; } h2 small { - font-size: 17.5px; + font-size: 18.75px; } h3 small { - font-size: 14px; + font-size: 15px; } h4 small { - font-size: 14px; + font-size: 15px; } .page-header { padding-bottom: 9.5px; @@ -654,7 +654,7 @@ dd { hr { margin: 21px 0; border: 0; - border-top: 1px solid #ebd90b; + border-top: 1px solid #028d79; border-bottom: 1px solid #ffffff; } abbr[title], @@ -718,7 +718,7 @@ code, pre { padding: 0 3px 2px; font-family: Menlo, Monaco, Consolas, "Courier New", monospace; - font-size: 12px; + font-size: 13px; color: #333333; -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -734,7 +734,7 @@ pre { display: block; padding: 10px; margin: 0 0 10.5px; - font-size: 13px; + font-size: 14px; line-height: 21px; word-break: break-all; word-wrap: break-word; @@ -773,7 +773,7 @@ legend { width: 100%; padding: 0; margin-bottom: 21px; - font-size: 21px; + font-size: 22.5px; line-height: 42px; color: #333333; border: 0; @@ -788,7 +788,7 @@ input, button, select, textarea { - font-size: 14px; + font-size: 15px; font-weight: normal; line-height: 21px; } @@ -796,7 +796,7 @@ input, button, select, textarea { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: Georgia, "Times New Roman", Times, serif; } label { display: block; @@ -823,7 +823,7 @@ input[type="color"], height: 21px; padding: 4px 6px; margin-bottom: 10.5px; - font-size: 14px; + font-size: 15px; line-height: 21px; color: #555555; -webkit-border-radius: 4px; @@ -1144,7 +1144,7 @@ input[type="checkbox"][readonly] { .control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on { color: #ffffff; - background-color: #ee7026; + background-color: #f26522; border-color: #ffffff; } .control-group.error > label, @@ -1282,7 +1282,7 @@ select:focus:required:invalid:focus { } .help-block, .help-inline { - color: #027e80; + color: #7b7b7b; } .help-block { display: block; @@ -1311,7 +1311,7 @@ select:focus:required:invalid:focus { .input-prepend .uneditable-input, .input-append .dropdown-menu, .input-prepend .dropdown-menu { - font-size: 14px; + font-size: 15px; } .input-append input, .input-prepend input, @@ -1342,7 +1342,7 @@ select:focus:required:invalid:focus { height: 21px; min-width: 16px; padding: 4px 5px; - font-size: 14px; + font-size: 15px; font-weight: normal; line-height: 21px; text-align: center; @@ -1579,7 +1579,7 @@ legend + .control-group { } table { max-width: 100%; - background-color: #c3c7ae; + background-color: #f7f7f7; border-collapse: collapse; border-spacing: 0; } @@ -1593,7 +1593,7 @@ table { line-height: 21px; text-align: left; vertical-align: top; - border-top: 1px solid #f5f3dc; + border-top: 1px solid #333333; } .table th { font-weight: bold; @@ -1610,14 +1610,14 @@ table { border-top: 0; } .table tbody + tbody { - border-top: 2px solid #f5f3dc; + border-top: 2px solid #333333; } .table-condensed th, .table-condensed td { padding: 4px 5px; } .table-bordered { - border: 1px solid #f5f3dc; + border: 1px solid #333333; border-collapse: separate; *border-collapse: collapse; border-left: 0; @@ -1627,7 +1627,7 @@ table { } .table-bordered th, .table-bordered td { - border-left: 1px solid #f5f3dc; + border-left: 1px solid #333333; } .table-bordered caption + thead tr:first-child th, .table-bordered caption + tbody tr:first-child th, @@ -1687,11 +1687,11 @@ table { } .table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) th { - background-color: #b8bd9f; + background-color: #eaeaea; } .table-hover tbody tr:hover td, .table-hover tbody tr:hover th { - background-color: #adb290; + background-color: #dddddd; } table td[class*="span"], table th[class*="span"], @@ -1780,7 +1780,7 @@ table th[class*="span"], background-color: #d14432; } .table tbody tr.warning td { - background-color: #ee7026; + background-color: #f26522; } .table tbody tr.info td { background-color: #185af9; @@ -1792,7 +1792,7 @@ table th[class*="span"], background-color: #bf3c2b; } .table-hover tbody tr.warning:hover td { - background-color: #e86112; + background-color: #ed560e; } .table-hover tbody tr.info:hover td { background-color: #064bf1; @@ -2284,9 +2284,9 @@ table th[class*="span"], padding: 5px 0; margin: 2px 0 0; list-style: none; - background-color: #f5f3dc; + background-color: #002425; border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.2); + border: 1px solid transparent; *border-right-width: 2px; *border-bottom-width: 2px; -webkit-border-radius: 6px; @@ -2310,7 +2310,7 @@ table th[class*="span"], *margin: -5px 0 5px; overflow: hidden; background-color: transparent; - border-bottom: 1px solid #90a38f; + border-bottom: 1px solid #000000; } .dropdown-menu li > a { display: block; @@ -2318,7 +2318,7 @@ table th[class*="span"], clear: both; font-weight: normal; line-height: 21px; - color: #333333; + color: #ffffff; white-space: nowrap; } .dropdown-menu li > a:hover, @@ -2326,28 +2326,28 @@ table th[class*="span"], .dropdown-submenu:hover > a { text-decoration: none; color: #ffffff; - 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-color: #015145; + background-image: -moz-linear-gradient(top, #015b4e, #014238); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#015b4e), to(#014238)); + background-image: -webkit-linear-gradient(top, #015b4e, #014238); + background-image: -o-linear-gradient(top, #015b4e, #014238); + background-image: linear-gradient(to bottom, #015b4e, #014238); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff748c73', endColorstr='#ff697e68', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff015b4e', endColorstr='#ff014238', GradientType=0); } .dropdown-menu .active > a, .dropdown-menu .active > a:hover { color: #ffffff; text-decoration: none; outline: 0; - 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-color: #015145; + background-image: -moz-linear-gradient(top, #015b4e, #014238); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#015b4e), to(#014238)); + background-image: -webkit-linear-gradient(top, #015b4e, #014238); + background-image: -o-linear-gradient(top, #015b4e, #014238); + background-image: linear-gradient(to bottom, #015b4e, #014238); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff748c73', endColorstr='#ff697e68', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff015b4e', endColorstr='#ff014238', GradientType=0); } .dropdown-menu .disabled > a, .dropdown-menu .disabled > a:hover { @@ -2414,7 +2414,7 @@ table th[class*="span"], border-color: transparent; border-style: solid; border-width: 5px 0 5px 5px; - border-left-color: #ded88d; + border-left-color: #000000; margin-top: 5px; margin-right: -10px; } @@ -2445,8 +2445,8 @@ table th[class*="span"], min-height: 20px; padding: 19px; margin-bottom: 20px; - background-color: #748c73; - border: 1px solid #647863; + background-color: #dddddd; + border: 1px solid #cbcbcb; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -2524,7 +2524,7 @@ button.close { *zoom: 1; padding: 4px 12px; margin-bottom: 0; - font-size: 14px; + font-size: 15px; line-height: 21px; *line-height: 21px; text-align: center; @@ -2546,9 +2546,9 @@ button.close { /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - border: 1px solid #cccccc; + border: 1px solid #d9d9d9; *border: 0; - border-bottom-color: #b3b3b3; + border-bottom-color: #bfbfbf; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -2614,7 +2614,7 @@ button.close { } .btn-large { padding: 11px 19px; - font-size: 17.5px; + font-size: 18.75px; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; @@ -2625,7 +2625,7 @@ button.close { } .btn-small { padding: 2px 10px; - font-size: 11.9px; + font-size: 12.75px; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; @@ -2636,7 +2636,7 @@ button.close { } .btn-mini { padding: 1px 6px; - font-size: 10.5px; + font-size: 11.25px; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; @@ -2673,17 +2673,17 @@ input[type="button"].btn-block { .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-color: #016a5b; + background-image: -moz-linear-gradient(top, #017464, #015b4e); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#017464), to(#015b4e)); + background-image: -webkit-linear-gradient(top, #017464, #015b4e); + background-image: -o-linear-gradient(top, #017464, #015b4e); + background-image: linear-gradient(to bottom, #017464, #015b4e); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff026567', endColorstr='#ff014d4e', GradientType=0); - border-color: #014d4e #014d4e #000303; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff017464', endColorstr='#ff015b4e', GradientType=0); + border-color: #015b4e #015b4e #000f0d; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #014d4e; + *background-color: #015b4e; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2694,27 +2694,27 @@ input[type="button"].btn-block { .btn-primary.disabled, .btn-primary[disabled] { color: #ffffff; - background-color: #014d4e; - *background-color: #013435; + background-color: #015b4e; + *background-color: #014238; } .btn-primary:active, .btn-primary.active { - background-color: #011b1c \9; + background-color: #002923 \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-color: #f36f30; + background-image: -moz-linear-gradient(top, #f3763a, #f26522); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f3763a), to(#f26522)); + background-image: -webkit-linear-gradient(top, #f3763a, #f26522); + background-image: -o-linear-gradient(top, #f3763a, #f26522); + background-image: linear-gradient(to bottom, #f3763a, #f26522); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff49f6d', endColorstr='#ffee7026', GradientType=0); - border-color: #ee7026 #ee7026 #b94e0e; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff3763a', endColorstr='#fff26522', GradientType=0); + border-color: #f26522 #f26522 #bc440b; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #ee7026; + *background-color: #f26522; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2725,12 +2725,12 @@ input[type="button"].btn-block { .btn-warning.disabled, .btn-warning[disabled] { color: #ffffff; - background-color: #ee7026; - *background-color: #e86112; + background-color: #f26522; + *background-color: #ed560e; } .btn-warning:active, .btn-warning.active { - background-color: #d15710 \9; + background-color: #d44d0d \9; } .btn-danger { color: #ffffff; @@ -2766,17 +2766,17 @@ input[type="button"].btn-block { .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-color: #0065b4; + background-image: -moz-linear-gradient(top, #006bbe, #005ca4); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#006bbe), to(#005ca4)); + background-image: -webkit-linear-gradient(top, #006bbe, #005ca4); + background-image: -o-linear-gradient(top, #006bbe, #005ca4); + background-image: linear-gradient(to bottom, #006bbe, #005ca4); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff028a78', endColorstr='#ff017162', GradientType=0); - border-color: #017162 #017162 #002620; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff006bbe', endColorstr='#ff005ca4', GradientType=0); + border-color: #005ca4 #005ca4 #003158; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #017162; + *background-color: #005ca4; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2787,24 +2787,24 @@ input[type="button"].btn-block { .btn-success.disabled, .btn-success[disabled] { color: #ffffff; - background-color: #017162; - *background-color: #01584c; + background-color: #005ca4; + *background-color: #004e8b; } .btn-success:active, .btn-success.active { - background-color: #013f36 \9; + background-color: #004071 \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-color: #32a0c0; + background-image: -moz-linear-gradient(top, #34a7c8, #2f96b4); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#34a7c8), to(#2f96b4)); + background-image: -webkit-linear-gradient(top, #34a7c8, #2f96b4); + background-image: -o-linear-gradient(top, #34a7c8, #2f96b4); + background-image: linear-gradient(to bottom, #34a7c8, #2f96b4); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff34a7c8', 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; @@ -2828,17 +2828,17 @@ input[type="button"].btn-block { .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-color: #505050; + background-image: -moz-linear-gradient(top, #555555, #484848); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#484848)); + background-image: -webkit-linear-gradient(top, #555555, #484848); + background-image: -o-linear-gradient(top, #555555, #484848); + background-image: linear-gradient(to bottom, #555555, #484848); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebd90b', endColorstr='#ffd3c30a', GradientType=0); - border-color: #d3c30a #d3c30a #8a7f06; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff555555', endColorstr='#ff484848', GradientType=0); + border-color: #484848 #484848 #222222; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #d3c30a; + *background-color: #484848; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2849,12 +2849,12 @@ input[type="button"].btn-block { .btn-inverse.disabled, .btn-inverse[disabled] { color: #ffffff; - background-color: #d3c30a; - *background-color: #baac09; + background-color: #484848; + *background-color: #3c3c3c; } .btn-inverse:active, .btn-inverse.active { - background-color: #a29608 \9; + background-color: #2f2f2f \9; } button.btn, input[type="submit"].btn { @@ -2893,13 +2893,13 @@ input[type="submit"].btn.btn-mini { .btn-link { border-color: transparent; cursor: pointer; - color: #ebd90b; + color: #028d79; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } .btn-link:hover { - color: #ebd90b; + color: #028d79; text-decoration: underline; background-color: transparent; } @@ -2946,7 +2946,7 @@ input[type="submit"].btn.btn-mini { } .btn-group > .btn, .btn-group > .dropdown-menu { - font-size: 14px; + font-size: 15px; } .btn-group > .btn-mini { font-size: 11px; @@ -3038,22 +3038,22 @@ input[type="submit"].btn.btn-mini { background-color: #e6e6e6; } .btn-group.open .btn-primary.dropdown-toggle { - background-color: #014d4e; + background-color: #015b4e; } .btn-group.open .btn-warning.dropdown-toggle { - background-color: #ee7026; + background-color: #f26522; } .btn-group.open .btn-danger.dropdown-toggle { background-color: #d14432; } .btn-group.open .btn-success.dropdown-toggle { - background-color: #017162; + background-color: #005ca4; } .btn-group.open .btn-info.dropdown-toggle { background-color: #2f96b4; } .btn-group.open .btn-inverse.dropdown-toggle { - background-color: #d3c30a; + background-color: #484848; } .btn .caret { margin-top: 8px; @@ -3124,8 +3124,8 @@ input[type="submit"].btn.btn-mini { padding: 8px 35px 8px 14px; margin-bottom: 21px; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - background-color: #ee7026; - border: 1px solid #ed4318; + background-color: #f26522; + border: 1px solid #f13614; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -3213,7 +3213,7 @@ input[type="submit"].btn.btn-mini { .nav-list > .active > a:hover { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #ebd90b; + background-color: #028d79; } .nav-list [class^="icon-"], .nav-list [class*=" icon-"] { @@ -3276,7 +3276,7 @@ input[type="submit"].btn.btn-mini { .nav-tabs > .active > a, .nav-tabs > .active > a:hover { color: #555555; - background-color: #90a38f; + background-color: #ffffff; border: 1px solid #ddd; border-bottom-color: transparent; cursor: default; @@ -3293,7 +3293,7 @@ input[type="submit"].btn.btn-mini { .nav-pills > .active > a, .nav-pills > .active > a:hover { color: #ffffff; - background-color: #ebd90b; + background-color: #028d79; } .nav-stacked > li { float: none; @@ -3347,13 +3347,13 @@ input[type="submit"].btn.btn-mini { border-radius: 6px; } .nav .dropdown-toggle .caret { - border-top-color: #ebd90b; - border-bottom-color: #ebd90b; + border-top-color: #028d79; + border-bottom-color: #028d79; margin-top: 6px; } .nav .dropdown-toggle:hover .caret { - border-top-color: #ebd90b; - border-bottom-color: #ebd90b; + border-top-color: #028d79; + border-bottom-color: #028d79; } /* move down carets for tabs */ .nav-tabs .dropdown-toggle .caret { @@ -3500,7 +3500,7 @@ input[type="submit"].btn.btn-mini { *z-index: 2; } .navbar-inner { - min-height: 50px; + min-height: 55px; padding-left: 20px; padding-right: 20px; background-color: #013435; @@ -3539,11 +3539,11 @@ input[type="submit"].btn.btn-mini { .navbar .brand { float: left; display: block; - padding: 14.5px 20px 14.5px; + padding: 17px 20px 17px; margin-left: -20px; font-size: 20px; font-weight: 200; - color: #f5f3dc; + color: #ffffff; text-shadow: 0 1px 0 #013435; } .navbar .brand:hover { @@ -3551,23 +3551,23 @@ input[type="submit"].btn.btn-mini { } .navbar-text { margin-bottom: 0; - line-height: 50px; + line-height: 55px; } .navbar-link { - color: #f5f3dc; + color: #ffffff; } .navbar-link:hover { - color: #ebd90b; + color: #ffffff; } .navbar .divider-vertical { - height: 50px; + height: 55px; margin: 0 9px; border-left: 1px solid #013435; border-right: 1px solid #013435; } .navbar .btn, .navbar .btn-group { - margin-top: 10px; + margin-top: 12.5px; } .navbar .btn-group .btn, .navbar .input-prepend .btn, @@ -3591,7 +3591,7 @@ input[type="submit"].btn.btn-mini { .navbar-form select, .navbar-form .radio, .navbar-form .checkbox { - margin-top: 10px; + margin-top: 12.5px; } .navbar-form input, .navbar-form select, @@ -3616,7 +3616,7 @@ input[type="submit"].btn.btn-mini { .navbar-search { position: relative; float: left; - margin-top: 10px; + margin-top: 12.5px; margin-bottom: 0; } .navbar-search .search-query { @@ -3700,8 +3700,8 @@ input[type="submit"].btn.btn-mini { } .navbar .nav > li > a { float: none; - padding: 14.5px 15px 14.5px; - color: #f5f3dc; + padding: 17px 15px 17px; + color: #ffffff; text-decoration: none; text-shadow: 0 1px 0 #013435; } @@ -3710,16 +3710,16 @@ input[type="submit"].btn.btn-mini { } .navbar .nav > li > a:focus, .navbar .nav > li > a:hover { - background-color: transparent; - color: #ebd90b; + background-color: #002425; + color: #ffffff; text-decoration: none; } .navbar .nav > .active > a, .navbar .nav > .active > a:hover, .navbar .nav > .active > a:focus { - color: #ebd90b; + color: #ffffff; text-decoration: none; - background-color: #013435; + background-color: #002425; -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); @@ -3784,7 +3784,7 @@ input[type="submit"].btn.btn-mini { border-left: 7px solid transparent; border-right: 7px solid transparent; border-bottom: 7px solid #ccc; - border-bottom-color: rgba(0, 0, 0, 0.2); + border-bottom-color: transparent; position: absolute; top: -7px; left: 9px; @@ -3794,20 +3794,20 @@ input[type="submit"].btn.btn-mini { display: inline-block; border-left: 6px solid transparent; border-right: 6px solid transparent; - border-bottom: 6px solid #f5f3dc; + border-bottom: 6px solid #002425; 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-top-color: transparent; border-bottom: 0; bottom: -7px; top: auto; } .navbar-fixed-bottom .nav > li > .dropdown-menu:after { - border-top: 6px solid #f5f3dc; + border-top: 6px solid #002425; border-bottom: 0; bottom: -6px; top: auto; @@ -3815,18 +3815,18 @@ input[type="submit"].btn.btn-mini { .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; + background-color: #002425; + color: #ffffff; } .navbar .nav li.dropdown > .dropdown-toggle .caret { - border-top-color: #f5f3dc; - border-bottom-color: #f5f3dc; + border-top-color: #ffffff; + border-bottom-color: #ffffff; } .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; + border-top-color: #ffffff; + border-bottom-color: #ffffff; } .navbar .pull-right > li > .dropdown-menu, .navbar .nav > li > .dropdown-menu.pull-right { @@ -3854,69 +3854,69 @@ input[type="submit"].btn.btn-mini { border-radius: 6px 0 6px 6px; } .navbar-inverse { - color: #999999; + color: #555555; } .navbar-inverse .navbar-inner { - background-color: #7d937b; - background-image: -moz-linear-gradient(top, #829881, #748c73); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#829881), to(#748c73)); - background-image: -webkit-linear-gradient(top, #829881, #748c73); - background-image: -o-linear-gradient(top, #829881, #748c73); - background-image: linear-gradient(to bottom, #829881, #748c73); + background-color: #e5e5e5; + background-image: -moz-linear-gradient(top, #eaeaea, #dddddd); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#eaeaea), to(#dddddd)); + background-image: -webkit-linear-gradient(top, #eaeaea, #dddddd); + background-image: -o-linear-gradient(top, #eaeaea, #dddddd); + background-image: linear-gradient(to bottom, #eaeaea, #dddddd); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff829881', endColorstr='#ff748c73', GradientType=0); - border-color: #697e68; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffeaeaea', endColorstr='#ffdddddd', GradientType=0); + border-color: #d0d0d0; } .navbar-inverse .brand, .navbar-inverse .nav > li > a { - color: #f5f3dc; + color: #333333; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } .navbar-inverse .brand:hover, .navbar-inverse .nav > li > a:hover { - color: #ebd90b; + color: #333333; } .navbar-inverse .nav > li > a:focus, .navbar-inverse .nav > li > a:hover { - background-color: transparent; - color: #ebd90b; + background-color: #cbcbcb; + color: #333333; } .navbar-inverse .nav .active > a, .navbar-inverse .nav .active > a:hover, .navbar-inverse .nav .active > a:focus { - color: #ebd90b; - background-color: #748c73; + color: #333333; + background-color: #cbcbcb; } .navbar-inverse .navbar-link { - color: #f5f3dc; + color: #333333; } .navbar-inverse .navbar-link:hover { - color: #ebd90b; + color: #333333; } .navbar-inverse .divider-vertical { - border-left-color: #748c73; - border-right-color: #829881; + border-left-color: #dddddd; + border-right-color: #eaeaea; } .navbar-inverse .nav li.dropdown.open > .dropdown-toggle, .navbar-inverse .nav li.dropdown.active > .dropdown-toggle, .navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle { - background-color: #748c73; - color: #ebd90b; + background-color: #cbcbcb; + color: #333333; } .navbar-inverse .nav li.dropdown > .dropdown-toggle .caret { - border-top-color: #f5f3dc; - border-bottom-color: #f5f3dc; + border-top-color: #333333; + border-bottom-color: #333333; } .navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret, .navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret, .navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret { - border-top-color: #ebd90b; - border-bottom-color: #ebd90b; + border-top-color: #333333; + border-bottom-color: #333333; } .navbar-inverse .navbar-search .search-query { color: #ffffff; - background-color: #bac5b9; - border-color: #748c73; + background-color: #ffffff; + border-color: #dddddd; -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15); @@ -3949,17 +3949,17 @@ input[type="submit"].btn.btn-mini { .navbar-inverse .btn-navbar { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - 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-color: #d8d8d8; + background-image: -moz-linear-gradient(top, #dddddd, #d0d0d0); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#dddddd), to(#d0d0d0)); + background-image: -webkit-linear-gradient(top, #dddddd, #d0d0d0); + background-image: -o-linear-gradient(top, #dddddd, #d0d0d0); + background-image: linear-gradient(to bottom, #dddddd, #d0d0d0); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff748c73', endColorstr='#ff697e68', GradientType=0); - border-color: #697e68 #697e68 #465445; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdddddd', endColorstr='#ffd0d0d0', GradientType=0); + border-color: #d0d0d0 #d0d0d0 #aaaaaa; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #697e68; + *background-color: #d0d0d0; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -3970,12 +3970,12 @@ input[type="submit"].btn.btn-mini { .navbar-inverse .btn-navbar.disabled, .navbar-inverse .btn-navbar[disabled] { color: #ffffff; - background-color: #697e68; - *background-color: #5d705c; + background-color: #d0d0d0; + *background-color: #c3c3c3; } .navbar-inverse .btn-navbar:active, .navbar-inverse .btn-navbar.active { - background-color: #516251 \9; + background-color: #b7b7b7 \9; } .breadcrumb { padding: 8px 15px; @@ -4028,7 +4028,7 @@ input[type="submit"].btn.btn-mini { padding: 4px 12px; line-height: 21px; text-decoration: none; - background-color: #748c73; + background-color: #e6e6e6; border: 1px solid transparent; border-left-width: 0; } @@ -4077,7 +4077,7 @@ input[type="submit"].btn.btn-mini { .pagination-large ul > li > a, .pagination-large ul > li > span { padding: 11px 19px; - font-size: 17.5px; + font-size: 18.75px; } .pagination-large ul > li:first-child > a, .pagination-large ul > li:first-child > span { @@ -4122,12 +4122,12 @@ input[type="submit"].btn.btn-mini { .pagination-small ul > li > a, .pagination-small ul > li > span { padding: 2px 10px; - font-size: 11.9px; + font-size: 12.75px; } .pagination-mini ul > li > a, .pagination-mini ul > li > span { padding: 1px 6px; - font-size: 10.5px; + font-size: 11.25px; } .pager { margin: 21px 0; @@ -4390,8 +4390,8 @@ input[type="submit"].btn.btn-mini { font-size: 14px; font-weight: normal; line-height: 18px; - background-color: #f7f7f7; - border-bottom: 1px solid #ebebeb; + background-color: #015b4e; + border-bottom: 1px solid #014238; -webkit-border-radius: 5px 5px 0 0; -moz-border-radius: 5px 5px 0 0; border-radius: 5px 5px 0 0; @@ -4508,7 +4508,7 @@ input[type="submit"].btn.btn-mini { transition: all 0.2s ease-in-out; } a.thumbnail:hover { - border-color: #ebd90b; + border-color: #028d79; -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); @@ -4556,7 +4556,7 @@ a.thumbnail:hover { .badge { display: inline-block; padding: 2px 4px; - font-size: 11.844px; + font-size: 12.69px; font-weight: bold; line-height: 14px; color: #ffffff; @@ -4593,11 +4593,11 @@ a.badge:hover { } .label-warning, .badge-warning { - background-color: #ee7026; + background-color: #f26522; } .label-warning[href], .badge-warning[href] { - background-color: #d15710; + background-color: #d44d0d; } .label-success, .badge-success { @@ -4804,18 +4804,18 @@ a.badge:hover { } .progress-warning .bar, .progress .bar-warning { - 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-color: #f5834d; + background-image: -moz-linear-gradient(top, #f6976a, #f26522); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f6976a), to(#f26522)); + background-image: -webkit-linear-gradient(top, #f6976a, #f26522); + background-image: -o-linear-gradient(top, #f6976a, #f26522); + background-image: linear-gradient(to bottom, #f6976a, #f26522); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff49f6d', endColorstr='#ffee7026', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff6976a', endColorstr='#fff26522', GradientType=0); } .progress-warning.progress-striped .bar, .progress-striped .bar-warning { - background-color: #f49f6d; + background-color: #f6976a; 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); @@ -4955,7 +4955,7 @@ a.badge:hover { font-weight: 200; line-height: 31.5px; color: inherit; - background-color: #748c73; + background-color: #dddddd; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; @@ -4964,7 +4964,7 @@ a.badge:hover { margin-bottom: 0; font-size: 60px; line-height: 1; - color: #f5f3dc; + color: #333333; letter-spacing: -1px; } .hero-unit li { @@ -4988,23 +4988,6 @@ a.badge:hover { .affix { position: fixed; } -h1 { - font-size: 54px; - line-height: 1.2em; - color: #ebd90b; -} -h2 { - font-size: 48px; -} -h3 { - font-size: 36px; -} -h4 { - font-size: 24px; -} -h5 { - font-size: 20px; -} h1 > small, h2 > small, h3 > small, @@ -5012,16 +4995,14 @@ h4 > small, h5 > small, h6 > small, .muted { - color: #f5f3dc; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + color: #333333; + font-family: Georgia, "Times New Roman", Times, serif; } -code, -pre { - color: #026567; - background-color: #f5f3dc; +.jumbotron h1 { + font-weight: normal !important; } .page-header { - border-bottom: 2px solid #f5f3dc; + border-bottom: none; padding-bottom: 5px; } .page-header h1 { @@ -5029,13 +5010,13 @@ pre { } hr { border-top: none; - border-bottom: 2px solid #f5f3dc; + border-bottom: 2px solid #333333; } blockquote { - border-left: 2px solid #f5f3dc; + border-left: 2px solid #333333; } blockquote.pull-right { - border-right: 2px solid #f5f3dc; + border-right: 2px solid #333333; } blockquote small { color: #013435; @@ -5047,20 +5028,20 @@ blockquote small { box-shadow: none; } .navbar .brand { - padding: 18px 20px 12px; + padding: 18px 20px 16px; font-size: 26px; - font-family: 'Josefin Slab', serif; - font-weight: 700; + font-family: 'Crete Round', serif; + font-weight: normal; +} +.navbar .brand:hover { + background-color: #002425; } .navbar .nav > li > a { - padding: 20px 20px 10px; + padding: 20px 20px 14px; font-size: 20px; - font-family: 'Josefin Slab', serif; - font-weight: 700; -} -.navbar .nav .active > a, -.navbar .nav .active > a:hover { - color: #ebd90b; + font-family: 'Crete Round', serif; + font-weight: normal; + text-shadow: none; } .navbar .nav > .active > a, .navbar .nav > .active > a:hover, @@ -5072,128 +5053,127 @@ blockquote small { .navbar .navbar-text { margin: 19px 20px 0; font-size: 20px; - font-family: 'Josefin Slab', serif; - font-weight: 700; + font-family: 'Crete Round', serif; + font-weight: normal; line-height: inherit; } .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 .btn-navbar { margin-top: 14px; } .navbar .navbar-form, .navbar .navbar-search { border-color: transparent; + margin-top: 12px; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; + line-height: normal; +} +.navbar .navbar-search .search-query { + border-color: transparent; + background-color: rgba(255, 255, 255, 0.4); + line-height: normal; + color: #ffffff; +} +.navbar .dropdown-menu li > a { + font-family: 'Crete Round', serif; + font-weight: normal; +} +.navbar .nav > li > .dropdown-menu::before, +.navbar .nav > li > .dropdown-menu::after { + border-bottom: none; +} +.navbar-inverse .dropdown-menu { + background-color: #cbcbcb; +} +.navbar-inverse .dropdown-menu li > a { + color: #333333; +} +.navbar-inverse .dropdown-menu li > a:hover { + background-color: #dddddd; +} +.navbar-inverse .dropdown-menu .divider { + border-bottom: 1px solid rgba(0, 0, 0, 0.2); +} +.navbar-inverse .dropdown-menu .nav-header { + color: #333333; } @media (max-width: 979px) { .navbar .nav-collapse .nav li > a { - color: #f5f3dc; + color: #ffffff; } .navbar .nav-collapse .nav li > a:hover { - color: #ebd90b; - background-color: #01584c; + background-color: #002425; } .navbar-inverse .nav-collapse .nav li > a:hover { background-color: rgba(0, 0, 0, 0.06) !important; } + .nav-collapse .navbar-form, + .nav-collapse .navbar-search { + border: none !important; + -webkit-box-shadow: none !important; + -moz-box-shadow: none !important; + box-shadow: none !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; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } div.subnav .nav > li > a { - padding: 13px 12px 9px; + padding: 12px 12px 10px; border-color: transparent; background-color: transparent; - font-family: 'Josefin Slab', serif; - font-weight: 700; - color: #f5f3dc; -} -div.subnav .nav > li + li > a { - border-color: transparent; + font-family: 'Crete Round', serif; + font-weight: normal; + color: #ffffff; } -div.subnav .nav > li.active > a, div.subnav .nav > li > a:hover, -div.subnav .nav > li.active > a:hover, +div.subnav .nav > .active > a, +div.subnav .nav > .active > a:hover, div.subnav .dropdown.open .dropdown-toggle, div.subnav .dropdown.open.active .dropdown-toggle:hover { + background-color: #002425; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; - background-color: transparent; border-color: transparent; - color: #ebd90b; -} -div.subnav .dropdown.open > .dropdown-menu { - background-color: #f5f3dc; - color: #013435; - border-color: transparent; -} -div.subnav .dropdown.open > .dropdown-menu a:hover { - background-color: #748c73; - color: #f5f3dc; + color: #ffffff; } div.subnav.subnav-fixed { - top: 50px; + top: 55px; } -.nav .disabled > a { - color: #ccc; +.nav .nav-header { + color: #333333; } +.nav .disabled > a, .nav .disabled > a:hover { - background-color: #748C73; -} -.nav-list li > a, -.nav-list .nav-header { - text-shadow: none; -} -.nav-list li > a:hover { - background-color: transparent; -} -.nav-list li.active > a, -.nav-list li.active > a:hover { - background-color: #A2CDB5; - text-shadow: none; -} -.nav-list .divider { - background-color: transparent; - border-bottom: 1px solid #f5f3dc; + background-color: #028d79; + color: #ffffff; } .nav-tabs { border-color: transparent; } -.nav-tabs > li > a, -.nav-pills > li > a { - background-color: #748C73; +.nav-tabs > li > a { + background-color: #015b4e; + color: #ffffff; } -.nav-tabs > li > a:hover, -.nav-pills > li > a:hover { - background-color: #748C73; +.nav-tabs > li > a:hover { + background-color: #013435; border-color: transparent; } -.nav-tabs > .active > a, -.nav-tabs > .active > a:hover, -.nav-pills .active > a, -.nav-pills .active > a:hover { - background-color: #A2CDB5; +.nav-tabs .active > a, +.nav-tabs .active > a:hover { + background-color: #013435; border-color: transparent; - color: #01584c; + color: #ffffff; } .nav-tabs.nav-stacked > li > a { border-color: transparent; @@ -5202,28 +5182,26 @@ div.subnav.subnav-fixed { border-color: transparent; } .nav-tabs .open .dropdown-toggle, -.nav-pills .open .dropdown-toggle { - background-color: #748C73; - border-color: transparent; - color: #ebd90b; +.nav-tabs .active.open .dropdown-toggle { + background-color: #013435; } -.nav-tabs .active.open .dropdown-toggle, -.nav-pills .active.open .dropdown-toggle { - background-color: #A2CDB5; +.nav-pills > li > a { + background-color: #015b4e; + color: #ffffff; } -.nav-tabs .dropdown-menu, -.nav-pills .dropdown-menu { - background-color: #f5f3dc; - color: #013435; +.nav-pills > li > a:hover { + background-color: #013435; border-color: transparent; } -.nav-tabs .dropdown-menu a:hover, -.nav-pills .dropdown-menu a:hover { - background-color: #A2CDB5; - color: #f5f3dc; +.nav-pills .active > a, +.nav-pills .active > a:hover { + background-color: #013435; + border-color: transparent; + color: #ffffff; } -.nav .nav-header { - color: #01584c; +.nav-pills .open .dropdown-toggle, +.nav-pills .active.open .dropdown-toggle { + background-color: #013435; } .tabbable .nav-tabs, .tabbable .nav-tabs > li > a, @@ -5232,79 +5210,107 @@ div.subnav.subnav-fixed { .tabbable .nav-tabs > li.active > a:hover { border-color: transparent; } +.nav-list .nav-header, +.nav-list li > a { + text-shadow: none; +} +.nav-list li > a:hover { + background-color: #015b4e; + color: #ffffff; +} +.nav-list li.active > a, +.nav-list li.active > a:hover { + background-color: #013435; + text-shadow: none; +} +.nav-list .divider { + background-color: transparent; + border-bottom: 1px solid #333333; +} .breadcrumb { - background-color: #748c73; + background-color: #015b4e; background-image: none; - border-color: transparent; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; + border-color: transparent; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .breadcrumb li { - color: #ebd90b; + color: #ffffff; text-shadow: none; } .breadcrumb li a { - color: #ebd90b; + color: #ffffff; + text-decoration: underline; } .breadcrumb li a:hover { - color: #ebd90b; + color: #ffffff; } .breadcrumb li .divider { - color: #f5f3dc; + color: #ffffff; } .breadcrumb .active { - color: #f5f3dc; + color: #ffffff; } .pagination ul { - background-color: #748c73; + background-color: #015b4e; background-image: none; - border-color: transparent; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; + border-color: transparent; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .pagination ul > li > a, .pagination ul > li > span { - color: #ebd90b; + background-color: #015b4e; border-color: transparent; + color: #ffffff; } .pagination ul > li > a:hover, .pagination ul > li > span:hover { - color: #ebd90b; - background-color: rgba(0, 0, 0, 0.1); + background-color: #013435; + color: #ffffff; } .pagination ul > .active > a, .pagination ul > .active > span { - color: #f5f3dc; - background-color: rgba(0, 0, 0, 0.1); + background-color: #013435; + color: #ffffff; } .pagination ul > .disabled > a, .pagination ul > .disabled > a:hover, .pagination ul > .disabled > span, .pagination ul > .disabled > span:hover { - color: #01584c; + background-color: #028d79; + color: #ffffff; } -.pager a { +.pager li > a, +.pager li > span { border: none; - background-color: #748C73; + background-color: #015b4e; + color: #ffffff; } -.pager a:hover { - background-color: #687D67; +.pager li > a:hover, +.pager li > span:hover { + background-color: #013435; } .pager .disabled a, .pager .disabled a:hover { - background-color: #748C73; - color: #013435; + background-color: #028d79; + color: #ffffff; } .btn { - font-family: 'Josefin Slab', serif; - font-weight: 700; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + font-family: 'Crete Round', serif; + font-weight: normal; text-shadow: none; - border-color: transparent; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; } .btn-large { font-size: 18px; @@ -5317,61 +5323,52 @@ div.subnav.subnav-fixed { .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; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .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 { +.table-bordered tbody:first-child tr:first-child td:last-child, +.table-bordered tbody:last-child tr:last-child td:first-child { -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } -.table-striped tbody:last-child tr:last-child td:first-child { - -webkit-border-radius: 0 0 0 8px; - -moz-border-radius: 0 0 0 8px; - border-radius: 0 0 0 8px; -} -.table-striped tbody:last-child tr:last-child td:last-child { - -webkit-border-radius: 0 0 8px 0; - -moz-border-radius: 0 0 8px 0; - border-radius: 0 0 8px 0; +.table th, +.table-striped tbody tr:nth-child(odd) th { + background-color: #015b4e; + color: #ffffff; } -.table-bordered { - border: none; +.table tbody tr.success td { + background-color: #B5EEAA; } -.table thead tr th:first-child, -.table tbody tr td:first-child { - border-left: none; +.table tbody tr.error td { + background-color: #EEB8B8; } -.table th, -.table-striped tbody tr:nth-child(odd) th { - background-color: #748c73; - color: #f5f3dc; +.table tbody tr.info td { + background-color: #AEE2EE; } legend { - font-family: 'Josefin Slab', serif; - font-weight: 700; - color: #f5f3dc; + border-bottom: none; + font-family: 'Crete Round', serif; + font-weight: normal; + color: #333333; } label, .help-block, input[type="file"] { - color: #f5f3dc; + color: #333333; } input, textarea, select { - color: #013435; + color: #555555; } .uneditable-input { color: #555555; } -legend { - border-bottom: 2px solid #ffffff; -} .form-actions { border-top: none; -webkit-border-radius: 4px; @@ -5381,75 +5378,93 @@ legend { .control-group.error label, .control-group.error .help-block, .control-group.error .help-inline { - color: #edb6af; + color: #d14432; } .control-group.error input, .control-group.error select, .control-group.error textarea { - border: 2px solid #edb6af; - color: #013435; + border: 1px solid #d14432; + color: #555555; } .control-group.success label, .control-group.success .help-block, .control-group.success .help-inline { - color: #6bf555; + color: #015b4e; } .control-group.success input, .control-group.success select, .control-group.success textarea { - border: 2px solid #6bf555; - color: #013435; + border: 1px solid #015b4e; + color: #555555; } .control-group.warning label, .control-group.warning .help-block, .control-group.warning .help-inline { - color: #f7be9c; + color: #f26522; } .control-group.warning input, .control-group.warning select, .control-group.warning textarea { - border: 2px solid #f7be9c; - color: #013435; + border: 1px solid #f26522; + color: #555555; } .alert { text-shadow: none; border: none; } +.alert h1, +.alert h2, +.alert h3, +.alert h4, +.alert h5, +.alert h6 { + font-weight: bold; + color: #ffffff; +} .alert-heading { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: Georgia, "Times New Roman", Times, serif; color: inherit; } .badge, .label { - background-color: #01584c; + background-color: #015b4e; text-shadow: none; } .badge-success, .label-success { - background-color: #24c00b; + background-color: #006bbe; } .badge-warning, .label-warning { - background-color: #ee7026; + background-color: #f3763a; } .badge-important, .label-important { - background-color: #d14432; + background-color: #d65747; } .badge-info, .label-info { - background-color: #185af9; + background-color: #34a7c8; } .badge-inverse, .label-inverse { - background-color: #ebd90b; + background-color: #555555; } .well { border: none; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; } +.hero-unit { + border: none; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} .thumbnail { border: none; -webkit-box-shadow: none; @@ -5461,17 +5476,30 @@ legend { -moz-border-radius: 4px; border-radius: 4px; } +.dropdown-menu .nav-header { + color: #ffffff; + text-shadow: none; +} +.dropdown-menu li > a:hover, +.dropdown-menu li > a:focus, +.dropdown-submenu:hover > a { + background-image: none; +} .progress { - background-color: #748c73; + background-color: #d5d5d5; background-image: none; } +[class^="icon-"], +[class*=" icon-"] { + vertical-align: baseline; +} .modal-header { padding: 12px 15px 6px; background-color: #015b4e; } .modal-body, .modal-footer { - background-color: #f5f3dc; + background-color: #333333; border: none; -webkit-box-shadow: none; -moz-box-shadow: none; @@ -5479,13 +5507,16 @@ legend { } .modal-body label, .modal-footer label { - color: #013435; + color: #555555; } .modal-footer { -webkit-border-radius: 0 0 4px 4px; -moz-border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px; } +.popover-title { + color: #ffffff; +} .pull-right { float: right; } diff --git a/spruce/bootstrap.min.css b/spruce/bootstrap.min.css index 01b3e71..21c902b 100644 --- a/spruce/bootstrap.min.css +++ b/spruce/bootstrap.min.css @@ -1,4 +1,4 @@ -@import url('https://fonts.googleapis.com/css?family=Josefin+Slab:400,700'); +@import url(http://fonts.googleapis.com/css?family=Crete+Round); article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;} audio,canvas,video{display:inline-block;*display:inline;*zoom:1;} audio:not([controls]){display:none;} @@ -21,9 +21,9 @@ textarea{overflow:auto;vertical-align:top;} .clearfix:after{clear:both;} .hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0;} .input-block-level{display:block;width:100%;min-height:31px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;} -body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:21px;color:#013435;background-color:#90a38f;} -a{color:#ebd90b;text-decoration:none;} -a:hover{color:#ebd90b;text-decoration:underline;} +body{margin:0;font-family:Georgia,"Times New Roman",Times,serif;font-size:15px;line-height:21px;color:#555555;background-color:#ffffff;} +a{color:#028d79;text-decoration:none;} +a:hover{color:#028d79;text-decoration:underline;} .img-rounded{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} .img-polaroid{padding:4px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.2);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.1);} .img-circle{-webkit-border-radius:500px;-moz-border-radius:500px;border-radius:500px;} @@ -103,7 +103,7 @@ a:hover{color:#ebd90b;text-decoration:underline;} .container-fluid{padding-right:20px;padding-left:20px;*zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";line-height:0;} .container-fluid:after{clear:both;} p{margin:0 0 10.5px;} -.lead{margin-bottom:21px;font-size:21px;font-weight:200;line-height:31.5px;} +.lead{margin-bottom:21px;font-size:22.5px;font-weight:200;line-height:31.5px;} small{font-size:85%;} strong{font-weight:bold;} em{font-style:italic;} @@ -117,18 +117,18 @@ a.text-error:hover{color:#e6e6e6;} a.text-info:hover{color:#e6e6e6;} .text-success{color:#ffffff;} a.text-success:hover{color:#e6e6e6;} -h1,h2,h3,h4,h5,h6{margin:10.5px 0;font-family:'Josefin Slab',serif;font-weight:700;line-height:21px;color:#f5f3dc;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;line-height:1;color:#999999;} +h1,h2,h3,h4,h5,h6{margin:10.5px 0;font-family:'Crete Round',serif;font-weight:normal;line-height:21px;color:#333333;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;line-height:1;color:#999999;} h1,h2,h3{line-height:42px;} -h1{font-size:38.5px;} -h2{font-size:31.5px;} -h3{font-size:24.5px;} -h4{font-size:17.5px;} -h5{font-size:14px;} -h6{font-size:11.9px;} -h1 small{font-size:24.5px;} -h2 small{font-size:17.5px;} -h3 small{font-size:14px;} -h4 small{font-size:14px;} +h1{font-size:41.25px;} +h2{font-size:33.75px;} +h3{font-size:26.25px;} +h4{font-size:18.75px;} +h5{font-size:15px;} +h6{font-size:12.75px;} +h1 small{font-size:26.25px;} +h2 small{font-size:18.75px;} +h3 small{font-size:15px;} +h4 small{font-size:15px;} .page-header{padding-bottom:9.5px;margin:21px 0 31.5px;border-bottom:1px solid #eeeeee;} ul,ol{padding:0;margin:0 0 10.5px 25px;} ul ul,ul ol,ol ol,ol ul{margin-bottom:0;} @@ -142,7 +142,7 @@ dd{margin-left:10.5px;} .dl-horizontal:after{clear:both;} .dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;} .dl-horizontal dd{margin-left:180px;} -hr{margin:21px 0;border:0;border-top:1px solid #ebd90b;border-bottom:1px solid #ffffff;} +hr{margin:21px 0;border:0;border-top:1px solid #028d79;border-bottom:1px solid #ffffff;} abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999999;} abbr.initialism{font-size:90%;text-transform:uppercase;} blockquote{padding:0 0 0 15px;margin:0 0 21px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:26.25px;} @@ -152,18 +152,18 @@ blockquote.pull-right small:before{content:'';} blockquote.pull-right small:after{content:'\00A0 \2014';} q:before,q:after,blockquote:before,blockquote:after{content:"";} address{display:block;margin-bottom:21px;font-style:normal;line-height:21px;} -code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,Consolas,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,Consolas,"Courier New",monospace;font-size:13px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} code{padding:2px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;} -pre{display:block;padding:10px;margin:0 0 10.5px;font-size:13px;line-height:21px;word-break:break-all;word-wrap:break-word;white-space:pre;white-space:pre-wrap;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}pre.prettyprint{margin-bottom:21px;} +pre{display:block;padding:10px;margin:0 0 10.5px;font-size:14px;line-height:21px;word-break:break-all;word-wrap:break-word;white-space:pre;white-space:pre-wrap;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}pre.prettyprint{margin-bottom:21px;} pre code{padding:0;color:inherit;background-color:transparent;border:0;} .pre-scrollable{max-height:340px;overflow-y:scroll;} form{margin:0 0 21px;} fieldset{padding:0;margin:0;border:0;} -legend{display:block;width:100%;padding:0;margin-bottom:21px;font-size:21px;line-height:42px;color:#333333;border:0;border-bottom:1px solid #e5e5e5;}legend small{font-size:15.75px;color:#999999;} -label,input,button,select,textarea{font-size:14px;font-weight:normal;line-height:21px;} -input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;} +legend{display:block;width:100%;padding:0;margin-bottom:21px;font-size:22.5px;line-height:42px;color:#333333;border:0;border-bottom:1px solid #e5e5e5;}legend small{font-size:15.75px;color:#999999;} +label,input,button,select,textarea{font-size:15px;font-weight:normal;line-height:21px;} +input,button,select,textarea{font-family:Georgia,"Times New Roman",Times,serif;} label{display:block;margin-bottom:5px;} -select,textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{display:inline-block;height:21px;padding:4px 6px;margin-bottom:10.5px;font-size:14px;line-height:21px;color:#555555;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;vertical-align:middle;} +select,textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{display:inline-block;height:21px;padding:4px 6px;margin-bottom:10.5px;font-size:15px;line-height:21px;color:#555555;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;vertical-align:middle;} input,textarea,.uneditable-input{width:206px;} textarea{height:auto;} textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{background-color:#ffffff;border:1px solid #cccccc;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border linear .2s, box-shadow linear .2s;-moz-transition:border linear .2s, box-shadow linear .2s;-o-transition:border linear .2s, box-shadow linear .2s;transition:border linear .2s, box-shadow linear .2s;}textarea:focus,input[type="text"]:focus,input[type="password"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus,.uneditable-input:focus{border-color:rgba(82, 168, 236, 0.8);outline:0;outline:thin dotted \9;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);} @@ -215,7 +215,7 @@ input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio .control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#ffffff;} .control-group.warning .checkbox,.control-group.warning .radio,.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#ffffff;} .control-group.warning input,.control-group.warning select,.control-group.warning textarea{border-color:#ffffff;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#e6e6e6;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ffffff;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ffffff;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ffffff;} -.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#ffffff;background-color:#ee7026;border-color:#ffffff;} +.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#ffffff;background-color:#f26522;border-color:#ffffff;} .control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#ffffff;} .control-group.error .checkbox,.control-group.error .radio,.control-group.error input,.control-group.error select,.control-group.error textarea{color:#ffffff;} .control-group.error input,.control-group.error select,.control-group.error textarea{border-color:#ffffff;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#e6e6e6;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ffffff;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ffffff;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ffffff;} @@ -231,12 +231,12 @@ input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;} .form-actions{padding:20px 20px 21px;margin-top:21px;margin-bottom:21px;background-color:transparent;border-top:1px solid #e5e5e5;*zoom:1;}.form-actions:before,.form-actions:after{display:table;content:"";line-height:0;} .form-actions:after{clear:both;} -.help-block,.help-inline{color:#027e80;} +.help-block,.help-inline{color:#7b7b7b;} .help-block{display:block;margin-bottom:10.5px;} .help-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;padding-left:5px;} -.input-append,.input-prepend{margin-bottom:5px;font-size:0;white-space:nowrap;}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input,.input-append .dropdown-menu,.input-prepend .dropdown-menu{font-size:14px;} +.input-append,.input-prepend{margin-bottom:5px;font-size:0;white-space:nowrap;}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input,.input-append .dropdown-menu,.input-prepend .dropdown-menu{font-size:15px;} .input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input{position:relative;margin-bottom:0;*margin-left:0;vertical-align:top;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;}.input-append input:focus,.input-prepend input:focus,.input-append select:focus,.input-prepend select:focus,.input-append .uneditable-input:focus,.input-prepend .uneditable-input:focus{z-index:2;} -.input-append .add-on,.input-prepend .add-on{display:inline-block;width:auto;height:21px;min-width:16px;padding:4px 5px;font-size:14px;font-weight:normal;line-height:21px;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#eeeeee;border:1px solid #ccc;} +.input-append .add-on,.input-prepend .add-on{display:inline-block;width:auto;height:21px;min-width:16px;padding:4px 5px;font-size:15px;font-weight:normal;line-height:21px;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#eeeeee;border:1px solid #ccc;} .input-append .add-on,.input-prepend .add-on,.input-append .btn,.input-prepend .btn{vertical-align:top;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} .input-append .active,.input-prepend .active{background-color:#03f2d0;border-color:#015b4e;} .input-prepend .add-on,.input-prepend .btn{margin-right:-1px;} @@ -269,14 +269,14 @@ legend+.control-group{margin-top:21px;-webkit-margin-top-collapse:separate;} .form-horizontal .help-block{margin-bottom:0;} .form-horizontal input+.help-block,.form-horizontal select+.help-block,.form-horizontal textarea+.help-block{margin-top:10.5px;} .form-horizontal .form-actions{padding-left:180px;} -table{max-width:100%;background-color:#c3c7ae;border-collapse:collapse;border-spacing:0;} -.table{width:100%;margin-bottom:21px;}.table th,.table td{padding:8px;line-height:21px;text-align:left;vertical-align:top;border-top:1px solid #f5f3dc;} +table{max-width:100%;background-color:#f7f7f7;border-collapse:collapse;border-spacing:0;} +.table{width:100%;margin-bottom:21px;}.table th,.table td{padding:8px;line-height:21px;text-align:left;vertical-align:top;border-top:1px solid #333333;} .table th{font-weight:bold;} .table thead th{vertical-align:bottom;} .table caption+thead tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0;} -.table tbody+tbody{border-top:2px solid #f5f3dc;} +.table tbody+tbody{border-top:2px solid #333333;} .table-condensed th,.table-condensed td{padding:4px 5px;} -.table-bordered{border:1px solid #f5f3dc;border-collapse:separate;*border-collapse:collapse;border-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.table-bordered th,.table-bordered td{border-left:1px solid #f5f3dc;} +.table-bordered{border:1px solid #333333;border-collapse:separate;*border-collapse:collapse;border-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.table-bordered th,.table-bordered td{border-left:1px solid #333333;} .table-bordered caption+thead tr:first-child th,.table-bordered caption+tbody tr:first-child th,.table-bordered caption+tbody tr:first-child td,.table-bordered colgroup+thead tr:first-child th,.table-bordered colgroup+tbody tr:first-child th,.table-bordered colgroup+tbody tr:first-child td,.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0;} .table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px;} .table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px;} @@ -284,8 +284,8 @@ table{max-width:100%;background-color:#c3c7ae;border-collapse:collapse;border-sp .table-bordered thead:last-child tr:last-child th:last-child,.table-bordered tbody:last-child tr:last-child td:last-child,.table-bordered tfoot:last-child tr:last-child td:last-child{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;} .table-bordered caption+thead tr:first-child th:first-child,.table-bordered caption+tbody tr:first-child td:first-child,.table-bordered colgroup+thead tr:first-child th:first-child,.table-bordered colgroup+tbody tr:first-child td:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px;} .table-bordered caption+thead tr:first-child th:last-child,.table-bordered caption+tbody tr:first-child td:last-child,.table-bordered colgroup+thead tr:first-child th:last-child,.table-bordered colgroup+tbody tr:first-child td:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px;} -.table-striped tbody tr:nth-child(odd) td,.table-striped tbody tr:nth-child(odd) th{background-color:#b8bd9f;} -.table-hover tbody tr:hover td,.table-hover tbody tr:hover th{background-color:#adb290;} +.table-striped tbody tr:nth-child(odd) td,.table-striped tbody tr:nth-child(odd) th{background-color:#eaeaea;} +.table-hover tbody tr:hover td,.table-hover tbody tr:hover th{background-color:#dddddd;} table td[class*="span"],table th[class*="span"],.row-fluid table td[class*="span"],.row-fluid table th[class*="span"]{display:table-cell;float:none;margin-left:0;} .table td.span1,.table th.span1{float:none;width:44px;margin-left:0;} .table td.span2,.table th.span2{float:none;width:124px;margin-left:0;} @@ -301,11 +301,11 @@ table td[class*="span"],table th[class*="span"],.row-fluid table td[class*="span .table td.span12,.table th.span12{float:none;width:924px;margin-left:0;} .table tbody tr.success td{background-color:#24c00b;} .table tbody tr.error td{background-color:#d14432;} -.table tbody tr.warning td{background-color:#ee7026;} +.table tbody tr.warning td{background-color:#f26522;} .table tbody tr.info td{background-color:#185af9;} .table-hover tbody tr.success:hover td{background-color:#1fa80a;} .table-hover tbody tr.error:hover td{background-color:#bf3c2b;} -.table-hover tbody tr.warning:hover td{background-color:#e86112;} +.table-hover tbody tr.warning:hover td{background-color:#ed560e;} .table-hover tbody tr.info:hover td{background-color:#064bf1;} [class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat;margin-top:1px;} .icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:url("../img/glyphicons-halflings-white.png");} @@ -454,11 +454,11 @@ table td[class*="span"],table th[class*="span"],.row-fluid table td[class*="span .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:#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 li>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:#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:#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{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:#002425;border:1px solid #ccc;border:1px solid transparent;*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 #000000;} +.dropdown-menu li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:21px;color:#ffffff;white-space:nowrap;} +.dropdown-menu li>a:hover,.dropdown-menu li>a:focus,.dropdown-submenu:hover>a{text-decoration:none;color:#ffffff;background-color:#015145;background-image:-moz-linear-gradient(top, #015b4e, #014238);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#015b4e), to(#014238));background-image:-webkit-linear-gradient(top, #015b4e, #014238);background-image:-o-linear-gradient(top, #015b4e, #014238);background-image:linear-gradient(to bottom, #015b4e, #014238);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff015b4e', endColorstr='#ff014238', GradientType=0);} +.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;outline:0;background-color:#015145;background-image:-moz-linear-gradient(top, #015b4e, #014238);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#015b4e), to(#014238));background-image:-webkit-linear-gradient(top, #015b4e, #014238);background-image:-o-linear-gradient(top, #015b4e, #014238);background-image:linear-gradient(to bottom, #015b4e, #014238);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff015b4e', endColorstr='#ff014238', GradientType=0);} .dropdown-menu .disabled>a,.dropdown-menu .disabled>a:hover{color:#999999;} .dropdown-menu .disabled>a:hover{text-decoration:none;background-color:transparent;background-image:none;cursor:default;} .open{*z-index:1000;}.open >.dropdown-menu{display:block;} @@ -469,61 +469,61 @@ table td[class*="span"],table th[class*="span"],.row-fluid table td[class*="span .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;} .dropup .dropdown-submenu>.dropdown-menu{top:auto;bottom:0;margin-top:0;margin-bottom:-2px;-webkit-border-radius:5px 5px 5px 0;-moz-border-radius:5px 5px 5px 0;border-radius:5px 5px 5px 0;} -.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>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:#000000;margin-top:5px;margin-right:-10px;} .dropdown-submenu:hover>a:after{border-left-color:#ffffff;} .dropdown-submenu.pull-left{float:none;}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px;} .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;} -.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#748c73;border:1px solid #647863;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);} +.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#dddddd;border:1px solid #cbcbcb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);} .well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} .well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} .fade{opacity:0;-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;}.fade.in{opacity:1;} .collapse{position:relative;height:0;overflow:hidden;-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;}.collapse.in{height:auto;} .close{float:right;font-size:20px;font-weight:bold;line-height:21px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.close:hover{color:#000000;text-decoration:none;cursor:pointer;opacity:0.4;filter:alpha(opacity=40);} button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none;} -.btn{display:inline-block;*display:inline;*zoom:1;padding:4px 12px;margin-bottom:0;font-size:14px;line-height:21px;*line-height:21px;text-align:center;vertical-align:middle;cursor:pointer;color:#333333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#f5f5f5;background-image:-moz-linear-gradient(top, #ffffff, #e6e6e6);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(top, #ffffff, #e6e6e6);background-image:-o-linear-gradient(top, #ffffff, #e6e6e6);background-image:linear-gradient(to bottom, #ffffff, #e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#e6e6e6;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border:1px solid #cccccc;*border:0;border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*margin-left:.3em;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333333;background-color:#e6e6e6;*background-color:#d9d9d9;} +.btn{display:inline-block;*display:inline;*zoom:1;padding:4px 12px;margin-bottom:0;font-size:15px;line-height:21px;*line-height:21px;text-align:center;vertical-align:middle;cursor:pointer;color:#333333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#f5f5f5;background-image:-moz-linear-gradient(top, #ffffff, #e6e6e6);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(top, #ffffff, #e6e6e6);background-image:-o-linear-gradient(top, #ffffff, #e6e6e6);background-image:linear-gradient(to bottom, #ffffff, #e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#e6e6e6;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border:1px solid #d9d9d9;*border:0;border-bottom-color:#bfbfbf;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*margin-left:.3em;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333333;background-color:#e6e6e6;*background-color:#d9d9d9;} .btn:active,.btn.active{background-color:#cccccc \9;} .btn:first-child{*margin-left:0;} .btn:hover{color:#333333;text-decoration:none;background-color:#e6e6e6;*background-color:#d9d9d9;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;} .btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} .btn.active,.btn:active{background-color:#e6e6e6;background-color:#d9d9d9 \9;background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);} .btn.disabled,.btn[disabled]{cursor:default;background-color:#e6e6e6;background-image:none;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.btn-large{padding:11px 19px;font-size:17.5px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} +.btn-large{padding:11px 19px;font-size:18.75px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} .btn-large [class^="icon-"],.btn-large [class*=" icon-"]{margin-top:2px;} -.btn-small{padding:2px 10px;font-size:11.9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +.btn-small{padding:2px 10px;font-size:12.75px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} .btn-small [class^="icon-"],.btn-small [class*=" icon-"]{margin-top:0;} -.btn-mini{padding:1px 6px;font-size:10.5px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +.btn-mini{padding:1px 6px;font-size:11.25px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} .btn-block{display:block;width:100%;padding-left:0;padding-right:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;} .btn-block+.btn-block{margin-top:5px;} 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:#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-primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#016a5b;background-image:-moz-linear-gradient(top, #017464, #015b4e);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#017464), to(#015b4e));background-image:-webkit-linear-gradient(top, #017464, #015b4e);background-image:-o-linear-gradient(top, #017464, #015b4e);background-image:linear-gradient(to bottom, #017464, #015b4e);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff017464', endColorstr='#ff015b4e', GradientType=0);border-color:#015b4e #015b4e #000f0d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#015b4e;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:#015b4e;*background-color:#014238;} +.btn-primary:active,.btn-primary.active{background-color:#002923 \9;} +.btn-warning{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#f36f30;background-image:-moz-linear-gradient(top, #f3763a, #f26522);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f3763a), to(#f26522));background-image:-webkit-linear-gradient(top, #f3763a, #f26522);background-image:-o-linear-gradient(top, #f3763a, #f26522);background-image:linear-gradient(to bottom, #f3763a, #f26522);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff3763a', endColorstr='#fff26522', GradientType=0);border-color:#f26522 #f26522 #bc440b;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#f26522;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:#f26522;*background-color:#ed560e;} +.btn-warning:active,.btn-warning.active{background-color:#d44d0d \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-success{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0065b4;background-image:-moz-linear-gradient(top, #006bbe, #005ca4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#006bbe), to(#005ca4));background-image:-webkit-linear-gradient(top, #006bbe, #005ca4);background-image:-o-linear-gradient(top, #006bbe, #005ca4);background-image:linear-gradient(to bottom, #006bbe, #005ca4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff006bbe', endColorstr='#ff005ca4', GradientType=0);border-color:#005ca4 #005ca4 #003158;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#005ca4;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:#005ca4;*background-color:#004e8b;} +.btn-success:active,.btn-success.active{background-color:#004071 \9;} +.btn-info{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#32a0c0;background-image:-moz-linear-gradient(top, #34a7c8, #2f96b4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#34a7c8), to(#2f96b4));background-image:-webkit-linear-gradient(top, #34a7c8, #2f96b4);background-image:-o-linear-gradient(top, #34a7c8, #2f96b4);background-image:linear-gradient(to bottom, #34a7c8, #2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff34a7c8', 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-inverse{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#505050;background-image:-moz-linear-gradient(top, #555555, #484848);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#484848));background-image:-webkit-linear-gradient(top, #555555, #484848);background-image:-o-linear-gradient(top, #555555, #484848);background-image:linear-gradient(to bottom, #555555, #484848);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff555555', endColorstr='#ff484848', GradientType=0);border-color:#484848 #484848 #222222;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#484848;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:#484848;*background-color:#3c3c3c;} +.btn-inverse:active,.btn-inverse.active{background-color:#2f2f2f \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;} button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px;} .btn-link,.btn-link:active,.btn-link[disabled]{background-color:transparent;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.btn-link{border-color:transparent;cursor:pointer;color:#ebd90b;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.btn-link:hover{color:#ebd90b;text-decoration:underline;background-color:transparent;} +.btn-link{border-color:transparent;cursor:pointer;color:#028d79;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.btn-link:hover{color:#028d79;text-decoration:underline;background-color:transparent;} .btn-link[disabled]:hover{color:#333333;text-decoration:none;} .btn-group{position:relative;display:inline-block;*display:inline;*zoom:1;font-size:0;vertical-align:middle;white-space:nowrap;*margin-left:.3em;}.btn-group:first-child{*margin-left:0;} .btn-group+.btn-group{margin-left:5px;} .btn-toolbar{font-size:0;margin-top:10.5px;margin-bottom:10.5px;}.btn-toolbar .btn+.btn,.btn-toolbar .btn-group+.btn,.btn-toolbar .btn+.btn-group{margin-left:5px;} .btn-group>.btn{position:relative;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} .btn-group>.btn+.btn{margin-left:-1px;} -.btn-group>.btn,.btn-group>.dropdown-menu{font-size:14px;} +.btn-group>.btn,.btn-group>.dropdown-menu{font-size:15px;} .btn-group>.btn-mini{font-size:11px;} .btn-group>.btn-small{font-size:12px;} .btn-group>.btn-large{font-size:16px;} @@ -539,12 +539,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,.15), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);} .btn-group.open .btn.dropdown-toggle{background-color:#e6e6e6;} -.btn-group.open .btn-primary.dropdown-toggle{background-color:#014d4e;} -.btn-group.open .btn-warning.dropdown-toggle{background-color:#ee7026;} +.btn-group.open .btn-primary.dropdown-toggle{background-color:#015b4e;} +.btn-group.open .btn-warning.dropdown-toggle{background-color:#f26522;} .btn-group.open .btn-danger.dropdown-toggle{background-color:#d14432;} -.btn-group.open .btn-success.dropdown-toggle{background-color:#017162;} +.btn-group.open .btn-success.dropdown-toggle{background-color:#005ca4;} .btn-group.open .btn-info.dropdown-toggle{background-color:#2f96b4;} -.btn-group.open .btn-inverse.dropdown-toggle{background-color:#d3c30a;} +.btn-group.open .btn-inverse.dropdown-toggle{background-color:#484848;} .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;} @@ -557,7 +557,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .btn-group-vertical .btn:last-child{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;} .btn-group-vertical .btn-large:first-child{-webkit-border-radius:6px 6px 0 0;-moz-border-radius:6px 6px 0 0;border-radius:6px 6px 0 0;} .btn-group-vertical .btn-large:last-child{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;} -.alert{padding:8px 35px 8px 14px;margin-bottom:21px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#ee7026;border:1px solid #ed4318;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#ffffff;} +.alert{padding:8px 35px 8px 14px;margin-bottom:21px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#f26522;border:1px solid #f13614;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#ffffff;} .alert h4{margin:0;} .alert .close{position:relative;top:-2px;right:-21px;line-height:21px;} .alert-success{background-color:#24c00b;border-color:#3aa80a;color:#ffffff;} @@ -575,7 +575,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .nav-list{padding-left:15px;padding-right:15px;margin-bottom:0;} .nav-list>li>a,.nav-list .nav-header{margin-left:-15px;margin-right:-15px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);} .nav-list>li>a{padding:3px 15px;} -.nav-list>.active>a,.nav-list>.active>a:hover{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#ebd90b;} +.nav-list>.active>a,.nav-list>.active>a:hover{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#028d79;} .nav-list [class^="icon-"],.nav-list [class*=" icon-"]{margin-right:2px;} .nav-list .divider{*width:100%;height:1px;margin:9.5px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;} .nav-tabs,.nav-pills{*zoom:1;}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;content:"";line-height:0;} @@ -585,9 +585,9 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .nav-tabs{border-bottom:1px solid #ddd;} .nav-tabs>li{margin-bottom:-1px;} .nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:21px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #dddddd;} -.nav-tabs>.active>a,.nav-tabs>.active>a:hover{color:#555555;background-color:#90a38f;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;} +.nav-tabs>.active>a,.nav-tabs>.active>a:hover{color:#555555;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;} .nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} -.nav-pills>.active>a,.nav-pills>.active>a:hover{color:#ffffff;background-color:#ebd90b;} +.nav-pills>.active>a,.nav-pills>.active>a:hover{color:#ffffff;background-color:#028d79;} .nav-stacked>li{float:none;} .nav-stacked>li>a{margin-right:0;} .nav-tabs.nav-stacked{border-bottom:0;} @@ -599,8 +599,8 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px;} .nav-tabs .dropdown-menu{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;} .nav-pills .dropdown-menu{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} -.nav .dropdown-toggle .caret{border-top-color:#ebd90b;border-bottom-color:#ebd90b;margin-top:6px;} -.nav .dropdown-toggle:hover .caret{border-top-color:#ebd90b;border-bottom-color:#ebd90b;} +.nav .dropdown-toggle .caret{border-top-color:#028d79;border-bottom-color:#028d79;margin-top:6px;} +.nav .dropdown-toggle:hover .caret{border-top-color:#028d79;border-bottom-color:#028d79;} .nav-tabs .dropdown-toggle .caret{margin-top:8px;} .nav .active .dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff;} .nav-tabs .active .dropdown-toggle .caret{border-top-color:#555555;border-bottom-color:#555555;} @@ -631,23 +631,23 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .nav>.disabled>a{color:#999999;} .nav>.disabled>a:hover{text-decoration:none;background-color:transparent;cursor:default;} .navbar{overflow:visible;margin-bottom:21px;color:#999999;*position:relative;*z-index:2;} -.navbar-inner{min-height:50px;padding-left:20px;padding-right:20px;background-color:#013435;background-image:-moz-linear-gradient(top, #013435, #013435);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#013435), to(#013435));background-image:-webkit-linear-gradient(top, #013435, #013435);background-image:-o-linear-gradient(top, #013435, #013435);background-image:linear-gradient(to bottom, #013435, #013435);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff013435', endColorstr='#ff013435', GradientType=0);border:1px solid #011b1c;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 4px rgba(0, 0, 0, 0.065);-moz-box-shadow:0 1px 4px rgba(0, 0, 0, 0.065);box-shadow:0 1px 4px rgba(0, 0, 0, 0.065);*zoom:1;}.navbar-inner:before,.navbar-inner:after{display:table;content:"";line-height:0;} +.navbar-inner{min-height:55px;padding-left:20px;padding-right:20px;background-color:#013435;background-image:-moz-linear-gradient(top, #013435, #013435);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#013435), to(#013435));background-image:-webkit-linear-gradient(top, #013435, #013435);background-image:-o-linear-gradient(top, #013435, #013435);background-image:linear-gradient(to bottom, #013435, #013435);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff013435', endColorstr='#ff013435', GradientType=0);border:1px solid #011b1c;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 4px rgba(0, 0, 0, 0.065);-moz-box-shadow:0 1px 4px rgba(0, 0, 0, 0.065);box-shadow:0 1px 4px rgba(0, 0, 0, 0.065);*zoom:1;}.navbar-inner:before,.navbar-inner:after{display:table;content:"";line-height:0;} .navbar-inner:after{clear:both;} .navbar .container{width:auto;} .nav-collapse.collapse{height:auto;overflow:visible;} -.navbar .brand{float:left;display:block;padding:14.5px 20px 14.5px;margin-left:-20px;font-size:20px;font-weight:200;color:#f5f3dc;text-shadow:0 1px 0 #013435;}.navbar .brand:hover{text-decoration:none;} -.navbar-text{margin-bottom:0;line-height:50px;} -.navbar-link{color:#f5f3dc;}.navbar-link:hover{color:#ebd90b;} -.navbar .divider-vertical{height:50px;margin:0 9px;border-left:1px solid #013435;border-right:1px solid #013435;} -.navbar .btn,.navbar .btn-group{margin-top:10px;} +.navbar .brand{float:left;display:block;padding:17px 20px 17px;margin-left:-20px;font-size:20px;font-weight:200;color:#ffffff;text-shadow:0 1px 0 #013435;}.navbar .brand:hover{text-decoration:none;} +.navbar-text{margin-bottom:0;line-height:55px;} +.navbar-link{color:#ffffff;}.navbar-link:hover{color:#ffffff;} +.navbar .divider-vertical{height:55px;margin:0 9px;border-left:1px solid #013435;border-right:1px solid #013435;} +.navbar .btn,.navbar .btn-group{margin-top:12.5px;} .navbar .btn-group .btn,.navbar .input-prepend .btn,.navbar .input-append .btn{margin-top:0;} .navbar-form{margin-bottom:0;*zoom:1;}.navbar-form:before,.navbar-form:after{display:table;content:"";line-height:0;} .navbar-form:after{clear:both;} -.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:10px;} +.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:12.5px;} .navbar-form input,.navbar-form select,.navbar-form .btn{display:inline-block;margin-bottom:0;} .navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px;} .navbar-form .input-append,.navbar-form .input-prepend{margin-top:6px;white-space:nowrap;}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0;} -.navbar-search{position:relative;float:left;margin-top:10px;margin-bottom:0;}.navbar-search .search-query{margin-bottom:0;padding:4px 14px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;} +.navbar-search{position:relative;float:left;margin-top:12.5px;margin-bottom:0;}.navbar-search .search-query{margin-bottom:0;padding:4px 14px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;} .navbar-static-top{position:static;margin-bottom:0;}.navbar-static-top .navbar-inner{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} .navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0;} .navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{border-width:0 0 1px;} @@ -660,46 +660,46 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;} .navbar .nav.pull-right{float:right;margin-right:0;} .navbar .nav>li{float:left;} -.navbar .nav>li>a{float:none;padding:14.5px 15px 14.5px;color:#f5f3dc;text-decoration:none;text-shadow:0 1px 0 #013435;} +.navbar .nav>li>a{float:none;padding:17px 15px 17px;color:#ffffff;text-decoration:none;text-shadow:0 1px 0 #013435;} .navbar .nav .dropdown-toggle .caret{margin-top:8px;} -.navbar .nav>li>a:focus,.navbar .nav>li>a:hover{background-color:transparent;color:#ebd90b;text-decoration:none;} -.navbar .nav>.active>a,.navbar .nav>.active>a:hover,.navbar .nav>.active>a:focus{color:#ebd90b;text-decoration:none;background-color:#013435;-webkit-box-shadow:inset 0 3px 8px rgba(0, 0, 0, 0.125);-moz-box-shadow:inset 0 3px 8px rgba(0, 0, 0, 0.125);box-shadow:inset 0 3px 8px rgba(0, 0, 0, 0.125);} +.navbar .nav>li>a:focus,.navbar .nav>li>a:hover{background-color:#002425;color:#ffffff;text-decoration:none;} +.navbar .nav>.active>a,.navbar .nav>.active>a:hover,.navbar .nav>.active>a:focus{color:#ffffff;text-decoration:none;background-color:#002425;-webkit-box-shadow:inset 0 3px 8px rgba(0, 0, 0, 0.125);-moz-box-shadow:inset 0 3px 8px rgba(0, 0, 0, 0.125);box-shadow:inset 0 3px 8px rgba(0, 0, 0, 0.125);} .navbar .btn-navbar{display:none;float:right;padding:7px 10px;margin-left:5px;margin-right:5px;color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#011b1c;background-image:-moz-linear-gradient(top, #011b1c, #011b1c);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#011b1c), to(#011b1c));background-image:-webkit-linear-gradient(top, #011b1c, #011b1c);background-image:-o-linear-gradient(top, #011b1c, #011b1c);background-image:linear-gradient(to bottom, #011b1c, #011b1c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff011b1c', endColorstr='#ff011b1c', GradientType=0);border-color:#011b1c #011b1c #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#011b1c;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);}.navbar .btn-navbar:hover,.navbar .btn-navbar:active,.navbar .btn-navbar.active,.navbar .btn-navbar.disabled,.navbar .btn-navbar[disabled]{color:#ffffff;background-color:#011b1c;*background-color:#000303;} .navbar .btn-navbar:active,.navbar .btn-navbar.active{background-color:#000000 \9;} .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 #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 #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;} +.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:transparent;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 #002425;position:absolute;top:-6px;left:10px;} +.navbar-fixed-bottom .nav>li>.dropdown-menu:before{border-top:7px solid #ccc;border-top-color:transparent;border-bottom:0;bottom:-7px;top:auto;} +.navbar-fixed-bottom .nav>li>.dropdown-menu:after{border-top:6px solid #002425;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:#002425;color:#ffffff;} +.navbar .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;} +.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:#ffffff;border-bottom-color:#ffffff;} .navbar .pull-right>li>.dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right{left:auto;right:0;}.navbar .pull-right>li>.dropdown-menu:before,.navbar .nav>li>.dropdown-menu.pull-right:before{left:auto;right:12px;} .navbar .pull-right>li>.dropdown-menu:after,.navbar .nav>li>.dropdown-menu.pull-right:after{left:auto;right:13px;} .navbar .pull-right>li>.dropdown-menu .dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right .dropdown-menu{left:auto;right:100%;margin-left:0;margin-right:-1px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px;} -.navbar-inverse{color:#999999;}.navbar-inverse .navbar-inner{background-color:#7d937b;background-image:-moz-linear-gradient(top, #829881, #748c73);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#829881), to(#748c73));background-image:-webkit-linear-gradient(top, #829881, #748c73);background-image:-o-linear-gradient(top, #829881, #748c73);background-image:linear-gradient(to bottom, #829881, #748c73);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff829881', endColorstr='#ff748c73', GradientType=0);border-color:#697e68;} -.navbar-inverse .brand,.navbar-inverse .nav>li>a{color:#f5f3dc;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.navbar-inverse .brand:hover,.navbar-inverse .nav>li>a:hover{color:#ebd90b;} -.navbar-inverse .nav>li>a:focus,.navbar-inverse .nav>li>a:hover{background-color:transparent;color:#ebd90b;} -.navbar-inverse .nav .active>a,.navbar-inverse .nav .active>a:hover,.navbar-inverse .nav .active>a:focus{color:#ebd90b;background-color:#748c73;} -.navbar-inverse .navbar-link{color:#f5f3dc;}.navbar-inverse .navbar-link:hover{color:#ebd90b;} -.navbar-inverse .divider-vertical{border-left-color:#748c73;border-right-color:#829881;} -.navbar-inverse .nav li.dropdown.open>.dropdown-toggle,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle{background-color:#748c73;color:#ebd90b;} -.navbar-inverse .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#f5f3dc;border-bottom-color:#f5f3dc;} -.navbar-inverse .nav li.dropdown.open>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#ebd90b;border-bottom-color:#ebd90b;} -.navbar-inverse .navbar-search .search-query{color:#ffffff;background-color:#bac5b9;border-color:#748c73;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);-webkit-transition:none;-moz-transition:none;-o-transition:none;transition:none;}.navbar-inverse .navbar-search .search-query:-moz-placeholder{color:#ffffff;} +.navbar-inverse{color:#555555;}.navbar-inverse .navbar-inner{background-color:#e5e5e5;background-image:-moz-linear-gradient(top, #eaeaea, #dddddd);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#eaeaea), to(#dddddd));background-image:-webkit-linear-gradient(top, #eaeaea, #dddddd);background-image:-o-linear-gradient(top, #eaeaea, #dddddd);background-image:linear-gradient(to bottom, #eaeaea, #dddddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffeaeaea', endColorstr='#ffdddddd', GradientType=0);border-color:#d0d0d0;} +.navbar-inverse .brand,.navbar-inverse .nav>li>a{color:#333333;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.navbar-inverse .brand:hover,.navbar-inverse .nav>li>a:hover{color:#333333;} +.navbar-inverse .nav>li>a:focus,.navbar-inverse .nav>li>a:hover{background-color:#cbcbcb;color:#333333;} +.navbar-inverse .nav .active>a,.navbar-inverse .nav .active>a:hover,.navbar-inverse .nav .active>a:focus{color:#333333;background-color:#cbcbcb;} +.navbar-inverse .navbar-link{color:#333333;}.navbar-inverse .navbar-link:hover{color:#333333;} +.navbar-inverse .divider-vertical{border-left-color:#dddddd;border-right-color:#eaeaea;} +.navbar-inverse .nav li.dropdown.open>.dropdown-toggle,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle{background-color:#cbcbcb;color:#333333;} +.navbar-inverse .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#333333;border-bottom-color:#333333;} +.navbar-inverse .nav li.dropdown.open>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#333333;border-bottom-color:#333333;} +.navbar-inverse .navbar-search .search-query{color:#ffffff;background-color:#ffffff;border-color:#dddddd;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);-webkit-transition:none;-moz-transition:none;-o-transition:none;transition:none;}.navbar-inverse .navbar-search .search-query:-moz-placeholder{color:#ffffff;} .navbar-inverse .navbar-search .search-query:-ms-input-placeholder{color:#ffffff;} .navbar-inverse .navbar-search .search-query::-webkit-input-placeholder{color:#ffffff;} .navbar-inverse .navbar-search .search-query:focus,.navbar-inverse .navbar-search .search-query.focused{padding:5px 15px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;} -.navbar-inverse .btn-navbar{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);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);border-color:#697e68 #697e68 #465445;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#697e68;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.navbar-inverse .btn-navbar:hover,.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active,.navbar-inverse .btn-navbar.disabled,.navbar-inverse .btn-navbar[disabled]{color:#ffffff;background-color:#697e68;*background-color:#5d705c;} -.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active{background-color:#516251 \9;} +.navbar-inverse .btn-navbar{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#d8d8d8;background-image:-moz-linear-gradient(top, #dddddd, #d0d0d0);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#dddddd), to(#d0d0d0));background-image:-webkit-linear-gradient(top, #dddddd, #d0d0d0);background-image:-o-linear-gradient(top, #dddddd, #d0d0d0);background-image:linear-gradient(to bottom, #dddddd, #d0d0d0);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdddddd', endColorstr='#ffd0d0d0', GradientType=0);border-color:#d0d0d0 #d0d0d0 #aaaaaa;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#d0d0d0;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.navbar-inverse .btn-navbar:hover,.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active,.navbar-inverse .btn-navbar.disabled,.navbar-inverse .btn-navbar[disabled]{color:#ffffff;background-color:#d0d0d0;*background-color:#c3c3c3;} +.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active{background-color:#b7b7b7 \9;} .breadcrumb{padding:8px 15px;margin:0 0 21px;list-style:none;background-color:#f5f5f5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.breadcrumb li{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 0 #ffffff;} .breadcrumb .divider{padding:0 5px;color:#ccc;} .breadcrumb .active{color:#999999;} .pagination{margin:21px 0;} .pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);} .pagination ul>li{display:inline;} -.pagination ul>li>a,.pagination ul>li>span{float:left;padding:4px 12px;line-height:21px;text-decoration:none;background-color:#748c73;border:1px solid transparent;border-left-width:0;} +.pagination ul>li>a,.pagination ul>li>span{float:left;padding:4px 12px;line-height:21px;text-decoration:none;background-color:#e6e6e6;border:1px solid transparent;border-left-width:0;} .pagination ul>li>a:hover,.pagination ul>.active>a,.pagination ul>.active>span{background-color:#a2cdb5;} .pagination ul>.active>a,.pagination ul>.active>span{color:#999999;cursor:default;} .pagination ul>.disabled>span,.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover{color:#999999;background-color:transparent;cursor:default;} @@ -707,13 +707,13 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .pagination ul>li:last-child>a,.pagination ul>li:last-child>span{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;} .pagination-centered{text-align:center;} .pagination-right{text-align:right;} -.pagination-large ul>li>a,.pagination-large ul>li>span{padding:11px 19px;font-size:17.5px;} +.pagination-large ul>li>a,.pagination-large ul>li>span{padding:11px 19px;font-size:18.75px;} .pagination-large ul>li:first-child>a,.pagination-large ul>li:first-child>span{-webkit-border-top-left-radius:6px;-moz-border-radius-topleft:6px;border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-moz-border-radius-bottomleft:6px;border-bottom-left-radius:6px;} .pagination-large ul>li:last-child>a,.pagination-large ul>li:last-child>span{-webkit-border-top-right-radius:6px;-moz-border-radius-topright:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-bottomright:6px;border-bottom-right-radius:6px;} .pagination-mini ul>li:first-child>a,.pagination-small ul>li:first-child>a,.pagination-mini ul>li:first-child>span,.pagination-small ul>li:first-child>span{-webkit-border-top-left-radius:3px;-moz-border-radius-topleft:3px;border-top-left-radius:3px;-webkit-border-bottom-left-radius:3px;-moz-border-radius-bottomleft:3px;border-bottom-left-radius:3px;} .pagination-mini ul>li:last-child>a,.pagination-small ul>li:last-child>a,.pagination-mini ul>li:last-child>span,.pagination-small ul>li:last-child>span{-webkit-border-top-right-radius:3px;-moz-border-radius-topright:3px;border-top-right-radius:3px;-webkit-border-bottom-right-radius:3px;-moz-border-radius-bottomright:3px;border-bottom-right-radius:3px;} -.pagination-small ul>li>a,.pagination-small ul>li>span{padding:2px 10px;font-size:11.9px;} -.pagination-mini ul>li>a,.pagination-mini ul>li>span{padding:1px 6px;font-size:10.5px;} +.pagination-small ul>li>a,.pagination-small ul>li>span{padding:2px 10px;font-size:12.75px;} +.pagination-mini ul>li>a,.pagination-mini ul>li>span{padding:1px 6px;font-size:11.25px;} .pager{margin:21px 0;list-style:none;text-align:center;*zoom:1;}.pager:before,.pager:after{display:table;content:"";line-height:0;} .pager:after{clear:both;} .pager li{display:inline;} @@ -750,7 +750,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .popover.right{margin-left:10px;} .popover.bottom{margin-top:10px;} .popover.left{margin-left:-10px;} -.popover-title{margin:0;padding:8px 14px;font-size:14px;font-weight:normal;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0;} +.popover-title{margin:0;padding:8px 14px;font-size:14px;font-weight:normal;line-height:18px;background-color:#015b4e;border-bottom:1px solid #014238;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0;} .popover-content{padding:9px 14px;}.popover-content p,.popover-content ul,.popover-content ol{margin-bottom:0;} .popover .arrow,.popover .arrow:after{position:absolute;display:inline-block;width:0;height:0;border-color:transparent;border-style:solid;} .popover .arrow:after{content:"";z-index:-1;} @@ -763,7 +763,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .row-fluid .thumbnails{margin-left:0;} .thumbnails>li{float:left;margin-bottom:21px;margin-left:20px;} .thumbnail{display:block;padding:4px;line-height:21px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.055);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.055);box-shadow:0 1px 3px rgba(0, 0, 0, 0.055);-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;} -a.thumbnail:hover{border-color:#ebd90b;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} +a.thumbnail:hover{border-color:#028d79;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} .thumbnail>img{display:block;max-width:100%;margin-left:auto;margin-right:auto;} .thumbnail .caption{padding:9px;color:#555555;} .media,.media-body{overflow:hidden;*overflow:visible;zoom:1;} @@ -774,14 +774,14 @@ a.thumbnail:hover{border-color:#ebd90b;-webkit-box-shadow:0 1px 4px rgba(0, 105, .media .pull-left{margin-right:10px;} .media .pull-right{margin-left:10px;} .media-list{margin-left:0;list-style:none;} -.label,.badge{display:inline-block;padding:2px 4px;font-size:11.844px;font-weight:bold;line-height:14px;color:#ffffff;vertical-align:baseline;white-space:nowrap;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#999999;} +.label,.badge{display:inline-block;padding:2px 4px;font-size:12.69px;font-weight:bold;line-height:14px;color:#ffffff;vertical-align:baseline;white-space:nowrap;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#999999;} .label{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} .badge{padding-left:9px;padding-right:9px;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px;} a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} .label-important,.badge-important{background-color:#ffffff;} .label-important[href],.badge-important[href]{background-color:#e6e6e6;} -.label-warning,.badge-warning{background-color:#ee7026;} -.label-warning[href],.badge-warning[href]{background-color:#d15710;} +.label-warning,.badge-warning{background-color:#f26522;} +.label-warning[href],.badge-warning[href]{background-color:#d44d0d;} .label-success,.badge-success{background-color:#ffffff;} .label-success[href],.badge-success[href]{background-color:#e6e6e6;} .label-info,.badge-info{background-color:#ffffff;} @@ -801,8 +801,8 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} .progress-success.progress-striped .bar,.progress-striped .bar-success{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:-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);} .progress-info .bar,.progress .bar-info{background-color:#4bb1cf;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(to bottom, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0);} .progress-info.progress-striped .bar,.progress-striped .bar-info{background-color:#5bc0de;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:-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);} -.progress-warning .bar,.progress .bar-warning{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);} -.progress-warning.progress-striped .bar,.progress-striped .bar-warning{background-color:#f49f6d;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:-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);} +.progress-warning .bar,.progress .bar-warning{background-color:#f5834d;background-image:-moz-linear-gradient(top, #f6976a, #f26522);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f6976a), to(#f26522));background-image:-webkit-linear-gradient(top, #f6976a, #f26522);background-image:-o-linear-gradient(top, #f6976a, #f26522);background-image:linear-gradient(to bottom, #f6976a, #f26522);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff6976a', endColorstr='#fff26522', GradientType=0);} +.progress-warning.progress-striped .bar,.progress-striped .bar-warning{background-color:#f6976a;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:-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);} .accordion{margin-bottom:21px;} .accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} .accordion-heading{border-bottom:0;} @@ -827,7 +827,7 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} .carousel-caption h4,.carousel-caption p{color:#ffffff;line-height:21px;} .carousel-caption h4{margin:0 0 5px;} .carousel-caption p{margin-bottom:0;} -.hero-unit{padding:60px;margin-bottom:30px;font-size:18px;font-weight:200;line-height:31.5px;color:inherit;background-color:#748c73;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:#f5f3dc;letter-spacing:-1px;} +.hero-unit{padding:60px;margin-bottom:30px;font-size:18px;font-weight:200;line-height:31.5px;color:inherit;background-color:#dddddd;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:#333333;letter-spacing:-1px;} .hero-unit li{line-height:31.5px;} .pull-right{float:right;} .pull-left{float:left;} @@ -835,93 +835,91 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} .show{display:block;} .invisible{visibility:hidden;} .affix{position:fixed;} -h1{font-size:54px;line-height:1.2em;color:#ebd90b;} -h2{font-size:48px;} -h3{font-size:36px;} -h4{font-size:24px;} -h5{font-size:20px;} -h1>small,h2>small,h3>small,h4>small,h5>small,h6>small,.muted{color:#f5f3dc;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;} -code,pre{color:#026567;background-color:#f5f3dc;} -.page-header{border-bottom:2px solid #f5f3dc;padding-bottom:5px;}.page-header h1{margin-bottom:0;} -hr{border-top:none;border-bottom:2px solid #f5f3dc;} -blockquote{border-left:2px solid #f5f3dc;}blockquote.pull-right{border-right:2px solid #f5f3dc;} +h1>small,h2>small,h3>small,h4>small,h5>small,h6>small,.muted{color:#333333;font-family:Georgia,"Times New Roman",Times,serif;} +.jumbotron h1{font-weight:normal !important;} +.page-header{border-bottom:none;padding-bottom:5px;}.page-header h1{margin-bottom:0;} +hr{border-top:none;border-bottom:2px solid #333333;} +blockquote{border-left:2px solid #333333;}blockquote.pull-right{border-right:2px solid #333333;} blockquote small{color:#013435;} .navbar .navbar-inner{background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.navbar .brand{padding:18px 20px 12px;font-size:26px;font-family:'Josefin Slab',serif;font-weight:700;} -.navbar .nav>li>a{padding:20px 20px 10px;font-size:20px;font-family:'Josefin Slab',serif;font-weight:700;} -.navbar .nav .active>a,.navbar .nav .active>a:hover{color:#ebd90b;} +.navbar .brand{padding:18px 20px 16px;font-size:26px;font-family:'Crete Round',serif;font-weight:normal;}.navbar .brand:hover{background-color:#002425;} +.navbar .nav>li>a{padding:20px 20px 14px;font-size:20px;font-family:'Crete Round',serif;font-weight:normal;text-shadow:none;} .navbar .nav>.active>a,.navbar .nav>.active>a:hover,.navbar .nav>.active>a:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.navbar .navbar-text{margin:19px 20px 0;font-size:20px;font-family:'Josefin Slab',serif;font-weight:700;line-height:inherit;} +.navbar .navbar-text{margin:19px 20px 0;font-size:20px;font-family:'Crete Round',serif;font-weight:normal;line-height:inherit;} .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 .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;} -div.subnav .nav>li+li>a{border-color:transparent;} -div.subnav .nav>li.active>a,div.subnav .nav>li>a:hover,div.subnav .nav>li.active>a:hover,div.subnav .dropdown.open .dropdown-toggle,div.subnav .dropdown.open.active .dropdown-toggle:hover{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;background-color:transparent;border-color:transparent;color:#ebd90b;} -div.subnav .dropdown.open>.dropdown-menu{background-color:#f5f3dc;color:#013435;border-color:transparent;} -div.subnav .dropdown.open>.dropdown-menu a:hover{background-color:#748c73;color:#f5f3dc;} -div.subnav.subnav-fixed{top:50px;} -.nav .disabled>a{color:#ccc;}.nav .disabled>a:hover{background-color:#748C73;} -.nav-list li>a,.nav-list .nav-header{text-shadow:none;} -.nav-list li>a:hover{background-color:transparent;} -.nav-list li.active>a,.nav-list li.active>a:hover{background-color:#A2CDB5;text-shadow:none;} -.nav-list .divider{background-color:transparent;border-bottom:1px solid #f5f3dc;} -.nav-tabs{border-color:transparent;} -.nav-tabs>li>a,.nav-pills>li>a{background-color:#748C73;}.nav-tabs>li>a:hover,.nav-pills>li>a:hover{background-color:#748C73;border-color:transparent;} -.nav-tabs>.active>a,.nav-tabs>.active>a:hover,.nav-pills .active>a,.nav-pills .active>a:hover{background-color:#A2CDB5;border-color:transparent;color:#01584c;} +.navbar .navbar-form,.navbar .navbar-search{border-color:transparent;margin-top:12px;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;line-height:normal;} +.navbar .navbar-search .search-query{border-color:transparent;background-color:rgba(255, 255, 255, 0.4);line-height:normal;color:#ffffff;} +.navbar .dropdown-menu li>a{font-family:'Crete Round',serif;font-weight:normal;} +.navbar .nav>li>.dropdown-menu::before,.navbar .nav>li>.dropdown-menu::after{border-bottom:none;} +.navbar-inverse .dropdown-menu{background-color:#cbcbcb;}.navbar-inverse .dropdown-menu li>a{color:#333333;}.navbar-inverse .dropdown-menu li>a:hover{background-color:#dddddd;} +.navbar-inverse .dropdown-menu .divider{border-bottom:1px solid rgba(0, 0, 0, 0.2);} +.navbar-inverse .dropdown-menu .nav-header{color:#333333;} +@media (max-width:979px){.navbar .nav-collapse .nav li>a{color:#ffffff;}.navbar .nav-collapse .nav li>a:hover{background-color:#002425;} .navbar-inverse .nav-collapse .nav li>a:hover{background-color:rgba(0, 0, 0, 0.06) !important;} .nav-collapse .navbar-form,.nav-collapse .navbar-search{border:none !important;-webkit-box-shadow:none !important;-moz-box-shadow:none !important;box-shadow:none !important;}}div.subnav{background-color:#015b4e;background-image:none;border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}div.subnav .nav>li>a{padding:12px 12px 10px;border-color:transparent;background-color:transparent;font-family:'Crete Round',serif;font-weight:normal;color:#ffffff;} +div.subnav .nav>li>a:hover,div.subnav .nav>.active>a,div.subnav .nav>.active>a:hover,div.subnav .dropdown.open .dropdown-toggle,div.subnav .dropdown.open.active .dropdown-toggle:hover{background-color:#002425;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border-color:transparent;color:#ffffff;} +div.subnav.subnav-fixed{top:55px;} +.nav .nav-header{color:#333333;} +.nav .disabled>a,.nav .disabled>a:hover{background-color:#028d79;color:#ffffff;} +.nav-tabs{border-color:transparent;}.nav-tabs >li>a{background-color:#015b4e;color:#ffffff;}.nav-tabs >li>a:hover{background-color:#013435;border-color:transparent;} +.nav-tabs .active>a,.nav-tabs .active>a:hover{background-color:#013435;border-color:transparent;color:#ffffff;} .nav-tabs.nav-stacked>li>a{border-color:transparent;}.nav-tabs.nav-stacked>li>a:hover{border-color:transparent;} -.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle{background-color:#748C73;border-color:transparent;color:#ebd90b;} -.nav-tabs .active.open .dropdown-toggle,.nav-pills .active.open .dropdown-toggle{background-color:#A2CDB5;} -.nav-tabs .dropdown-menu,.nav-pills .dropdown-menu{background-color:#f5f3dc;color:#013435;border-color:transparent;}.nav-tabs .dropdown-menu a:hover,.nav-pills .dropdown-menu a:hover{background-color:#A2CDB5;color:#f5f3dc;} -.nav .nav-header{color:#01584c;} +.nav-tabs .open .dropdown-toggle,.nav-tabs .active.open .dropdown-toggle{background-color:#013435;} +.nav-pills >li>a{background-color:#015b4e;color:#ffffff;}.nav-pills >li>a:hover{background-color:#013435;border-color:transparent;} +.nav-pills .active>a,.nav-pills .active>a:hover{background-color:#013435;border-color:transparent;color:#ffffff;} +.nav-pills .open .dropdown-toggle,.nav-pills .active.open .dropdown-toggle{background-color:#013435;} .tabbable .nav-tabs,.tabbable .nav-tabs>li>a,.tabbable .nav-tabs>li>a:hover,.tabbable .nav-tabs>li.active>a,.tabbable .nav-tabs>li.active>a:hover{border-color:transparent;} -.breadcrumb{background-color:#748c73;background-image:none;border-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.breadcrumb li{color:#ebd90b;text-shadow:none;}.breadcrumb li a{color:#ebd90b;} -.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 ul>li>a,.pagination ul>li>span{color:#ebd90b;border-color:transparent;}.pagination ul>li>a:hover,.pagination ul>li>span:hover{color:#ebd90b;background-color:rgba(0, 0, 0, 0.1);} -.pagination ul>.active>a,.pagination ul>.active>span{color:#f5f3dc;background-color:rgba(0, 0, 0, 0.1);} -.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover,.pagination ul>.disabled>span,.pagination ul>.disabled>span: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{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;} +.nav-list .nav-header,.nav-list li>a{text-shadow:none;} +.nav-list li>a:hover{background-color:#015b4e;color:#ffffff;} +.nav-list li.active>a,.nav-list li.active>a:hover{background-color:#013435;text-shadow:none;} +.nav-list .divider{background-color:transparent;border-bottom:1px solid #333333;} +.breadcrumb{background-color:#015b4e;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}.breadcrumb li{color:#ffffff;text-shadow:none;}.breadcrumb li a{color:#ffffff;text-decoration:underline;} +.breadcrumb li a:hover{color:#ffffff;} +.breadcrumb li .divider{color:#ffffff;} +.breadcrumb .active{color:#ffffff;} +.pagination ul{background-color:#015b4e;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.pagination ul>li>a,.pagination ul>li>span{background-color:#015b4e;border-color:transparent;color:#ffffff;}.pagination ul>li>a:hover,.pagination ul>li>span:hover{background-color:#013435;color:#ffffff;} +.pagination ul>.active>a,.pagination ul>.active>span{background-color:#013435;color:#ffffff;} +.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover,.pagination ul>.disabled>span,.pagination ul>.disabled>span:hover{background-color:#028d79;color:#ffffff;} +.pager li>a,.pager li>span{border:none;background-color:#015b4e;color:#ffffff;}.pager li>a:hover,.pager li>span:hover{background-color:#013435;} +.pager .disabled a,.pager .disabled a:hover{background-color:#028d79;color:#ffffff;} +.btn{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;font-family:'Crete Round',serif;font-weight:normal;text-shadow:none;} .btn-large{font-size:18px;} .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;} -.table-striped tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 8px;-moz-border-radius:0 0 0 8px;border-radius:0 0 0 8px;} -.table-striped tbody:last-child tr:last-child td:last-child{-webkit-border-radius:0 0 8px 0;-moz-border-radius:0 0 8px 0;border-radius:0 0 8px 0;} -.table-bordered{border:none;} -.table thead tr th:first-child,.table tbody tr td:first-child{border-left:none;} -.table th,.table-striped tbody tr:nth-child(odd) th{background-color:#748c73;color:#f5f3dc;} -legend{font-family:'Josefin Slab',serif;font-weight:700;color:#f5f3dc;} -label,.help-block,input[type="file"]{color:#f5f3dc;} -input,textarea,select{color:#013435;} +.table,.table.table-bordered,.table.table-striped{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.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,.table-bordered tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.table th,.table-striped tbody tr:nth-child(odd) th{background-color:#015b4e;color:#ffffff;} +.table tbody tr.success td{background-color:#B5EEAA;} +.table tbody tr.error td{background-color:#EEB8B8;} +.table tbody tr.info td{background-color:#AEE2EE;} +legend{border-bottom:none;font-family:'Crete Round',serif;font-weight:normal;color:#333333;} +label,.help-block,input[type="file"]{color:#333333;} +input,textarea,select{color:#555555;} .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;} -.badge-warning,.label-warning{background-color:#ee7026;} -.badge-important,.label-important{background-color:#d14432;} -.badge-info,.label-info{background-color:#185af9;} -.badge-inverse,.label-inverse{background-color:#ebd90b;} -.well{border:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +.control-group.error label,.control-group.error .help-block,.control-group.error .help-inline{color:#d14432;} +.control-group.error input,.control-group.error select,.control-group.error textarea{border:1px solid #d14432;color:#555555;} +.control-group.success label,.control-group.success .help-block,.control-group.success .help-inline{color:#015b4e;} +.control-group.success input,.control-group.success select,.control-group.success textarea{border:1px solid #015b4e;color:#555555;} +.control-group.warning label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#f26522;} +.control-group.warning input,.control-group.warning select,.control-group.warning textarea{border:1px solid #f26522;color:#555555;} +.alert{text-shadow:none;border:none;}.alert h1,.alert h2,.alert h3,.alert h4,.alert h5,.alert h6{font-weight:bold;color:#ffffff;} +.alert-heading{font-family:Georgia,"Times New Roman",Times,serif;color:inherit;} +.badge,.label{background-color:#015b4e;text-shadow:none;}.badge-success,.label-success{background-color:#006bbe;} +.badge-warning,.label-warning{background-color:#f3763a;} +.badge-important,.label-important{background-color:#d65747;} +.badge-info,.label-info{background-color:#34a7c8;} +.badge-inverse,.label-inverse{background-color:#555555;} +.well{border:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +.hero-unit{border:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} .thumbnail{border:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.thumbnail img{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.progress{background-color:#748c73;background-image:none;} +.dropdown-menu .nav-header{color:#ffffff;text-shadow:none;} +.dropdown-menu li>a:hover,.dropdown-menu li>a:focus,.dropdown-submenu:hover>a{background-image:none;} +.progress{background-color:#d5d5d5;background-image:none;} +[class^="icon-"],[class*=" icon-"]{vertical-align:baseline;} .modal-header{padding:12px 15px 6px;background-color:#015b4e;} -.modal-body,.modal-footer{background-color:#f5f3dc;border:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.modal-body label,.modal-footer label{color:#013435;} +.modal-body,.modal-footer{background-color:#333333;border:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.modal-body label,.modal-footer label{color:#555555;} .modal-footer{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;} +.popover-title{color:#ffffff;} .pull-right{float:right;} .pull-left{float:left;} .hide{display:none;} diff --git a/spruce/bootswatch.less b/spruce/bootswatch.less index f2f164b..4cc96fa 100755 --- a/spruce/bootswatch.less +++ b/spruce/bootswatch.less @@ -6,18 +6,7 @@ // TYPOGRAPHY // -------------------------------------------------- -@import url('https://fonts.googleapis.com/css?family=Josefin+Slab:400,700'); - -h1 { - font-size: 54px; - line-height: 1.2em; - color: @yellow; -} - -h2 { font-size: 48px; } -h3 { font-size: 36px; } -h4 { font-size: 24px; } -h5 { font-size: 20px; } +@import url(http://fonts.googleapis.com/css?family=Crete+Round); h1 > small, h2 > small, @@ -30,22 +19,15 @@ h6 > small, font-family: @baseFontFamily; } -code, pre { - color: lighten(@blueDark, 10%); - background-color: @headingsColor; +.jumbotron h1 { + font-weight: normal !important; } // SCAFFOLDING // -------------------------------------------------- -// body { -// #gradient > .vertical-three-colors (#90A38F, #AEAD8E, 60%, #90A38F); -// background-size: 100% 1400px; -// background-repeat: repeat-y; -// } - .page-header { - border-bottom: 2px solid @headingsColor; + border-bottom: none; padding-bottom: 5px; h1 { @@ -81,22 +63,22 @@ blockquote { } .brand { - padding: 18px 20px 12px; + padding: 18px 20px 16px; font-size: 26px; font-family: @headingsFontFamily; font-weight: @headingsFontWeight; + + &:hover { + background-color: @navbarLinkBackgroundHover; + } } .nav > li > a { - padding: 20px 20px 10px; + padding: 20px 20px 14px; font-size: 20px; font-family: @headingsFontFamily; font-weight: @headingsFontWeight; - } - - .nav .active > a, - .nav .active > a:hover { - color: @yellow; + text-shadow: none; } .nav > .active > a, @@ -117,24 +99,58 @@ blockquote { border-color: rgba(0, 0, 0, 0.2); } - .navbar-search { + .btn-navbar { + margin-top: 14px; + } + + .navbar-form, .navbar-search { + border-color: transparent; margin-top: 12px; + .box-shadow(none); + line-height: normal; } .navbar-search .search-query { border-color: transparent; background-color: rgba(255, 255, 255, 0.4); + line-height: normal; color: @white; } - .btn-navbar { - margin-top: 14px; + .dropdown-menu li > a { + font-family: @headingsFontFamily; + font-weight: @headingsFontWeight; } - .navbar-form, .navbar-search { - border-color: transparent; - .box-shadow(none); + .nav > li > .dropdown-menu::before, + .nav > li > .dropdown-menu::after { + border-bottom: none; } + + &-inverse { + + .dropdown-menu { + background-color: @navbarInverseLinkBackgroundHover; + + li > a { + color: @headingsColor; + + &:hover { + background-color: @navbarInverseBackground; + } + } + + .divider { + border-bottom: 1px solid rgba(0, 0, 0, 0.2); + } + + .nav-header { + color: @headingsColor; + } + } + + } + } @media (max-width: @navbarCollapseWidth) { @@ -142,11 +158,10 @@ blockquote { .navbar .nav-collapse { .nav li > a { - color: @headingsColor; + color: @navbarLinkColor; &:hover { - color: @yellow; - background-color: @blue; + background-color: @navbarLinkBackgroundHover; } } } @@ -156,50 +171,40 @@ blockquote { .nav li > a:hover { background-color: rgba(0, 0, 0, 0.06) !important; } + } + .nav-collapse .navbar-form, + .nav-collapse .navbar-search { + border: none !important; + .box-shadow(none) !important; } } div.subnav { + background-color: @green; background-image: none; border-color: transparent; - .box-shadow(0 1px 5px rgba(0,0,0,.1)); - font-size: 18px; + .border-radius(0); .nav > li > a { - padding: 13px 12px 9px; + padding: 12px 12px 10px; border-color: transparent; background-color: transparent; font-family: @headingsFontFamily; font-weight: @headingsFontWeight; - color: @headingsColor; - } - - .nav > li + li > a { - border-color: transparent; + color: @navbarLinkColor; } - .nav > li.active > a, .nav > li > a:hover, - .nav > li.active > a:hover, + .nav > .active > a, + .nav > .active > a:hover, .dropdown.open .dropdown-toggle, .dropdown.open.active .dropdown-toggle:hover { + background-color: @navbarLinkBackgroundHover; .box-shadow(none); - background-color: transparent; - border-color: transparent; - color: @yellow; - } - - .dropdown.open > .dropdown-menu { - background-color: @headingsColor; - color: @textColor; border-color: transparent; - } - - .dropdown.open > .dropdown-menu a:hover { - background-color: darken(#90A38F, 10%); - color: @headingsColor; + color: @white; } &.subnav-fixed { @@ -211,96 +216,76 @@ div.subnav { // -------------------------------------------------- .nav { - .disabled > a { - - color: #ccc; - - &:hover { - background-color: #748C73; - } - } -} - -.nav-list { - li > a, .nav-header { - text-shadow: none; - } - - li > a:hover { - background-color: transparent; - } - - li.active > a, - li.active > a:hover { - background-color: #A2CDB5; - text-shadow: none; + color: @headingsColor; } - .divider { - background-color: transparent; - border-bottom: 1px solid @headingsColor; + .disabled > a, + .disabled > a:hover { + background-color: lighten(@green, 10%); + color: @white; } } .nav-tabs { + border-color: transparent; -} -.nav-tabs > li > a, -.nav-pills > li > a { - background-color: #748C73; + & > li > a { + background-color: @green; + color: @white; + + &:hover { + background-color: @navbarBackground; + border-color: transparent; + } + } - &:hover { - background-color: #748C73; + .active > a, + .active > a:hover { + background-color: @navbarBackground; border-color: transparent; + color: @white; } -} -.nav-tabs > .active > a, -.nav-tabs > .active > a:hover, -.nav-pills .active > a, -.nav-pills .active > a:hover { - background-color: #A2CDB5; - border-color: transparent; - color: @blue; -} + &.nav-stacked > li > a { + border-color: transparent; -.nav-tabs.nav-stacked > li > a { - border-color: transparent; + &:hover { + border-color: transparent; + } + } - &:hover { - border-color: transparent; + .open .dropdown-toggle, + .active.open .dropdown-toggle { + background-color: @navbarBackground; } } -.nav-tabs .open .dropdown-toggle, -.nav-pills .open .dropdown-toggle { - background-color: #748C73; - border-color: transparent; - color: @yellow; -} +.nav-pills { -.nav-tabs .active.open .dropdown-toggle, -.nav-pills .active.open .dropdown-toggle { - background-color: #A2CDB5; -} + & > li > a { + background-color: @green; + color: @white; -.nav-tabs .dropdown-menu, -.nav-pills .dropdown-menu { - background-color: @headingsColor; - color: @textColor; - border-color: transparent; + &:hover { + background-color: @navbarBackground; + border-color: transparent; + } + } - a:hover { - background-color: #A2CDB5; - color: @headingsColor; + .active > a, + .active > a:hover { + background-color: @navbarBackground; + border-color: transparent; + color: @white; } -} -.nav .nav-header { - color: @blue; + .open .dropdown-toggle, + .active.open .dropdown-toggle { + background-color: @navbarBackground; + } } .tabbable { @@ -313,83 +298,116 @@ div.subnav { } } +.nav-list { + + .nav-header, + li > a { + text-shadow: none; + } + + li > a:hover { + background-color: @green; + color: @white; + } + + li.active > a, + li.active > a:hover { + background-color: @navbarBackground; + text-shadow: none; + } + + .divider { + background-color: transparent; + border-bottom: 1px solid @headingsColor; + } +} + .breadcrumb { - background-color: darken(#90A38F, 10%); + + background-color: @green; background-image: none; - border-color: transparent; .box-shadow(none); + border-color: transparent; + .border-radius(0); li { - color: @yellow; + color: @white; text-shadow: none; a { - color: @yellow; + color: @white; + text-decoration: underline; } a:hover { - color: @yellow; + color: @white; } .divider { - color: @headingsColor; + color: @white; } } .active { - color: @headingsColor; + color: @white; } } .pagination { ul { - background-color: darken(#90A38F, 10%); + background-color: @green; background-image: none; - border-color: transparent; .box-shadow(none); + border-color: transparent; + .border-radius(0); } + ul > li > a, ul > li > span { - color: @yellow; + background-color: @green; border-color: transparent; + color: @white; &:hover { - color: @yellow; - background-color: rgba(0, 0, 0, 0.1); + background-color: @navbarBackground; + color: @white; } } ul > .active > a, ul > .active > span { - color: @headingsColor; - background-color: rgba(0, 0, 0, 0.1); + background-color: @navbarBackground; + color: @white; } ul > .disabled > a, ul > .disabled > a:hover, ul > .disabled > span, ul > .disabled > span:hover { - color: @blue; + background-color: lighten(@green, 10%); + color: @white; } } .pager { - a { + li > a, + li > span { border: none; - background-color: #748C73; + background-color: @green; + color: @white; &:hover { - background-color: #687D67; + background-color: @navbarBackground; } } .disabled a, .disabled a:hover { - background-color: #748C73; - color: @textColor; + background-color: lighten(@green, 10%); + color: @white; } } @@ -397,11 +415,10 @@ div.subnav { // -------------------------------------------------- .btn { + .border-radius(0); font-family: @headingsFontFamily; font-weight: @headingsFontWeight; text-shadow: none; - border-color: transparent; - .box-shadow(none); } .btn-large { @@ -418,43 +435,48 @@ div.subnav { .table, .table.table-bordered, .table.table-striped { - .border-radius(0 0 8px 8px); + .border-radius(0); } .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 { +.table-bordered tbody:first-child tr:first-child td:last-child, +.table-bordered tbody:last-child tr:last-child td:first-child, { .border-radius(0); } -.table-striped tbody:last-child tr:last-child td:first-child { - .border-radius(0 0 0 8px); -} - -.table-striped tbody:last-child tr:last-child td:last-child { - .border-radius(0 0 8px 0); -} - -.table-bordered { - border: none; -} - .table thead tr th:first-child, .table tbody tr td:first-child { - border-left: none; + // border-left: none; } .table th, .table-striped tbody tr:nth-child(odd) th { - background-color: darken(#90A38F, 10%); - color: @headingsColor; + background-color: @green; + color: @white; +} + +.table { + + tbody tr.success td { + background-color: #B5EEAA; + } + + tbody tr.error td { + background-color: #EEB8B8; + } + + tbody tr.info td { + background-color: #AEE2EE; + } } // FORMS // -------------------------------------------------- legend { + border-bottom: none; font-family: @headingsFontFamily; font-weight: @headingsFontWeight; color: @headingsColor; @@ -472,10 +494,6 @@ input, textarea, select { color: @gray; } -legend { - border-bottom: 2px solid @white; -} - .form-actions { border-top: none; .border-radius(4px); @@ -484,11 +502,11 @@ legend { .control-group.error { label, .help-block, .help-inline { - color: lighten(@red, 30%); + color: @red; } input, select, textarea { - border: 2px solid lighten(@red, 30%); + border: 1px solid @red; color: @textColor; } } @@ -496,11 +514,11 @@ legend { .control-group.success { label, .help-block, .help-inline { - color: lighten(#24C00B, 25%); + color: @green; } input, select, textarea { - border: 2px solid lighten(#24C00B, 25%); + border: 1px solid @green; color: @textColor; } } @@ -508,11 +526,11 @@ legend { .control-group.warning { label, .help-block, .help-inline { - color: lighten(@orange, 25%); + color: @orange; } input, select, textarea { - border: 2px solid lighten(@orange, 25%); + border: 1px solid @orange; color: @textColor; } } @@ -523,6 +541,11 @@ legend { .alert { text-shadow: none; border: none; + + h1, h2, h3, h4, h5, h6 { + font-weight: bold; + color: @white; + } } .alert-heading { @@ -533,27 +556,27 @@ legend { .badge, .label { - background-color: @blue; + background-color: @green; text-shadow: none; &-success { - background-color: @successBackground; + background-color: @btnSuccessBackground; } &-warning { - background-color: @warningBackground; + background-color: @btnWarningBackground; } &-important { - background-color: @errorBackground; + background-color: @btnDangerBackground; } &-info { - background-color: @infoBackground; + background-color: @btnInfoBackground; } &-inverse { - background-color: @yellow; + background-color: @btnInverseBackground; } } @@ -562,9 +585,15 @@ legend { .well { border: none; + .border-radius(0); .box-shadow(none); } +.hero-unit { + border: none; + .border-radius(0); +} + .thumbnail { border: none; .box-shadow(none); @@ -574,11 +603,27 @@ legend { } } +.dropdown-menu .nav-header { + color: @white; + text-shadow: none; +} + +.dropdown-menu li > a:hover, +.dropdown-menu li > a:focus, +.dropdown-submenu:hover > a { + background-image: none; +} + .progress { - background-color: darken(#90A38F, 10%); + background-color: darken(@grayLighter, 10%); background-image: none; } +[class^="icon-"], +[class*=" icon-"] { + vertical-align: baseline; +} + .modal { &-header { @@ -602,5 +647,12 @@ legend { } } +.popover { + + &-title { + color: @white; + } +} + // MEDIA QUERIES // -------------------------------------------------- diff --git a/spruce/variables.less b/spruce/variables.less index d8afc16..410887f 100755 --- a/spruce/variables.less +++ b/spruce/variables.less @@ -20,26 +20,26 @@ // Accent colors // ------------------------- -@blue: #01584C; +@blue: #004E8B; @blueDark: #013435; @green: #015B4E; @red: #D14432; -@yellow: #EBD90B; -@orange: #EE7026; +@yellow: #F0F1E1; +@orange: #F26522; @pink: #A15B66; @purple: #7073CF; // Scaffolding // ------------------------- -@bodyBackground: #90A38F; -@textColor: @blueDark; +@bodyBackground: @white; +@textColor: @gray; // Links // ------------------------- -@linkColor: @yellow; -@linkColorHover: @yellow; +@linkColor: lighten(@green, 10%); +@linkColorHover: @linkColor; // Typography @@ -48,14 +48,14 @@ @serifFontFamily: Georgia, "Times New Roman", Times, serif; @monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace; -@baseFontSize: 14px; -@baseFontFamily: @sansFontFamily; +@baseFontSize: 15px; +@baseFontFamily: @serifFontFamily; @baseLineHeight: 21px; @altFontFamily: @serifFontFamily; -@headingsFontFamily: 'Josefin Slab', serif; // empty to use BS default, @baseFontFamily -@headingsFontWeight: 700; // instead of browser default, bold -@headingsColor: #F5F3DC; // empty to use BS default, @textColor +@headingsFontFamily: 'Crete Round', serif; // empty to use BS default, @baseFontFamily +@headingsFontWeight: normal; // instead of browser default, bold +@headingsColor: @grayDark; // empty to use BS default, @textColor // Component sizing @@ -77,34 +77,34 @@ // Tables // ------------------------- -@tableBackground: #C3C7AE; // overall background-color -@tableBackgroundAccent: darken(#C3C7AE, 5%); // for striping -@tableBackgroundHover: darken(#C3C7AE, 10%); // for hover +@tableBackground: lighten(#ddd, 10%); // overall background-color +@tableBackgroundAccent: lighten(#ddd, 5%); // for striping +@tableBackgroundHover: #ddd; // for hover @tableBorder: @headingsColor; // table and cell border // Buttons // ------------------------- @btnBackground: @white; @btnBackgroundHighlight: darken(@white, 10%); -@btnBorder: darken(@white, 20%); +@btnBorder: darken(@white, 15%); -@btnPrimaryBackground: lighten(@blueDark, 10%); -@btnPrimaryBackgroundHighlight: lighten(@blueDark, 5%); +@btnPrimaryBackground: lighten(@green, 5%); +@btnPrimaryBackgroundHighlight: @green; -@btnInfoBackground: #5bc0de; +@btnInfoBackground: lighten(#2f96b4, 5%); @btnInfoBackgroundHighlight: #2f96b4; @btnSuccessBackground: lighten(@blue, 10%); @btnSuccessBackgroundHighlight: lighten(@blue, 5%); -@btnWarningBackground: lighten(@orange, 15%); +@btnWarningBackground: lighten(@orange, 5%); @btnWarningBackgroundHighlight: @orange; @btnDangerBackground: lighten(@red, 5%); @btnDangerBackgroundHighlight: @red; -@btnInverseBackground: @yellow; -@btnInverseBackgroundHighlight: darken(@yellow, 5%); +@btnInverseBackground: @gray; +@btnInverseBackgroundHighlight: darken(@gray, 5%); // Forms @@ -119,17 +119,17 @@ // Dropdowns // ------------------------- -@dropdownBackground: @headingsColor; -@dropdownBorder: rgba(0,0,0,.2); +@dropdownBackground: #002425; +@dropdownBorder: transparent; @dropdownDividerTop: transparent; -@dropdownDividerBottom: @bodyBackground; +@dropdownDividerBottom: @black; -@dropdownLinkColor: @grayDark; +@dropdownLinkColor: @white; @dropdownLinkColorHover: @white; -@dropdownLinkColorActive: @dropdownLinkColorHover; +@dropdownLinkColorActive: @white; -@dropdownLinkBackgroundActive: @dropdownLinkBackgroundHover; -@dropdownLinkBackgroundHover: darken(@bodyBackground, 10%); +@dropdownLinkBackgroundActive: @green; +@dropdownLinkBackgroundHover: @green; @@ -172,7 +172,7 @@ // Wells // ------------------------- -@wellBackground: darken(@bodyBackground, 10%); +@wellBackground: #ddd; // Navbar @@ -180,31 +180,31 @@ @navbarCollapseWidth: 979px; @navbarCollapseDesktopWidth: @navbarCollapseWidth + 1; -@navbarHeight: 50px; +@navbarHeight: 55px; @navbarBackgroundHighlight: @navbarBackground; @navbarBackground: @blueDark; @navbarBorder: darken(@navbarBackground, 5%); @navbarText: @grayLight; -@navbarLinkColor: @headingsColor; -@navbarLinkColorHover: @yellow; -@navbarLinkColorActive: @navbarLinkColorHover; -@navbarLinkBackgroundHover: transparent; -@navbarLinkBackgroundActive: @navbarBackground; +@navbarLinkColor: @white; +@navbarLinkColorHover: @white; +@navbarLinkColorActive: @white; +@navbarLinkBackgroundHover: #002425; +@navbarLinkBackgroundActive: @navbarLinkBackgroundHover; -@navbarBrandColor: @headingsColor; +@navbarBrandColor: @navbarLinkColor; // Inverted navbar @navbarInverseBackground: @wellBackground; @navbarInverseBackgroundHighlight: lighten(@wellBackground, 5%); @navbarInverseBorder: darken(@navbarInverseBackground, 5%); -@navbarInverseText: @grayLight; +@navbarInverseText: @textColor; @navbarInverseLinkColor: @headingsColor; -@navbarInverseLinkColorHover: @yellow; -@navbarInverseLinkColorActive: @yellow; -@navbarInverseLinkBackgroundHover: transparent; -@navbarInverseLinkBackgroundActive: @navbarInverseBackground; +@navbarInverseLinkColorHover: @navbarInverseLinkColor; +@navbarInverseLinkColorActive: @navbarInverseLinkColor; +@navbarInverseLinkBackgroundHover: darken(@navbarInverseBackground, 7%); +@navbarInverseLinkBackgroundActive: @navbarInverseLinkBackgroundHover; @navbarInverseSearchBackground: lighten(@navbarInverseBackground, 25%); @navbarInverseSearchBackgroundFocus: @white; @@ -223,7 +223,7 @@ // Hero unit // ------------------------- -@heroUnitBackground: darken(@bodyBackground, 10%); +@heroUnitBackground: #ddd; @heroUnitHeadingColor: @headingsColor; @heroUnitLeadColor: inherit; @@ -257,7 +257,7 @@ @popoverBackground: #fff; @popoverArrowWidth: 10px; @popoverArrowColor: #fff; -@popoverTitleBackground: darken(@popoverBackground, 3%); +@popoverTitleBackground: @green; // Special enhancement for popovers @popoverArrowOuterWidth: @popoverArrowWidth + 1; -- 2.39.2