From 5f3bb7718752d47fda4f86c91e88d1bfdc27c375 Mon Sep 17 00:00:00 2001 From: Thomas Park Date: Fri, 23 Nov 2012 17:10:43 -0500 Subject: [PATCH] spacelab: changed font to open sans, tweaked buttons, link color --- spacelab/bootstrap.css | 463 +++++++++++++++++-------------------- spacelab/bootstrap.min.css | 201 ++++++++-------- spacelab/bootswatch.less | 89 ++----- spacelab/variables.less | 44 ++-- 4 files changed, 351 insertions(+), 446 deletions(-) diff --git a/spacelab/bootstrap.css b/spacelab/bootstrap.css index 9fde78e..d60897c 100644 --- a/spacelab/bootstrap.css +++ b/spacelab/bootstrap.css @@ -1,4 +1,4 @@ -@import url('http://fonts.googleapis.com/css?family=Muli'); +@import url('http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700'); /*! * Bootstrap v2.2.1 * @@ -145,18 +145,18 @@ textarea { } body { margin: 0; - font-family: "Muli", "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 14px; + font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 15px; line-height: 21px; - color: #2d2d2d; + color: #666666; background-color: #ffffff; } a { - color: #558bc4; + color: #0099dd; text-decoration: none; } a:hover { - color: #558bc4; + color: #0099dd; 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; } @@ -542,7 +542,7 @@ h6 { font-family: inherit; font-weight: normal; line-height: 21px; - color: inherit; + color: #2d2d2d; 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; @@ -718,8 +718,8 @@ code, pre { padding: 0 3px 2px; font-family: Menlo, Monaco, Consolas, "Courier New", monospace; - font-size: 12px; - color: #333333; + font-size: 13px; + color: #434848; -webkit-border-radius: 3px; -moz-border-radius: 3px; 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,9 +773,9 @@ legend { width: 100%; padding: 0; margin-bottom: 21px; - font-size: 21px; + font-size: 22.5px; line-height: 42px; - color: #333333; + color: #434848; border: 0; border-bottom: 1px solid #e5e5e5; } @@ -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: "Muli", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; } label { display: block; @@ -823,9 +823,9 @@ input[type="color"], height: 21px; padding: 4px 6px; margin-bottom: 10.5px; - font-size: 14px; + font-size: 15px; line-height: 21px; - color: #777777; + color: #666666; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -1212,7 +1212,7 @@ input[type="checkbox"][readonly] { .control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on { color: #ffffff; - background-color: #819e37; + background-color: #3cb521; border-color: #ffffff; } .control-group.info > label, @@ -1282,7 +1282,7 @@ select:focus:required:invalid:focus { } .help-block, .help-inline { - color: #535353; + color: #8c8c8c; } .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; @@ -1361,8 +1361,8 @@ select:focus:required:invalid:focus { } .input-append .active, .input-prepend .active { - background-color: #c6da94; - border-color: #819e37; + background-color: #98e986; + border-color: #3cb521; } .input-prepend .add-on, .input-prepend .btn { @@ -1774,7 +1774,7 @@ table th[class*="span"], margin-left: 0; } .table tbody tr.success td { - background-color: #819e37; + background-color: #3cb521; } .table tbody tr.error td { background-color: #cd0200; @@ -1786,7 +1786,7 @@ table th[class*="span"], background-color: #3399f3; } .table-hover tbody tr.success:hover td { - background-color: #728b30; + background-color: #359f1d; } .table-hover tbody tr.error:hover td { background-color: #b40200; @@ -2318,7 +2318,7 @@ table th[class*="span"], clear: both; font-weight: normal; line-height: 21px; - color: #2d2d2d; + color: #666666; 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: #4d86c1; - background-image: -moz-linear-gradient(top, #558bc4, #427ebd); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#558bc4), to(#427ebd)); - background-image: -webkit-linear-gradient(top, #558bc4, #427ebd); - background-image: -o-linear-gradient(top, #558bc4, #427ebd); - background-image: linear-gradient(to bottom, #558bc4, #427ebd); + background-color: #0092d3; + background-image: -moz-linear-gradient(top, #0099dd, #0087c4); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0099dd), to(#0087c4)); + background-image: -webkit-linear-gradient(top, #0099dd, #0087c4); + background-image: -o-linear-gradient(top, #0099dd, #0087c4); + background-image: linear-gradient(to bottom, #0099dd, #0087c4); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff558bc4', endColorstr='#ff427ebd', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0099dd', endColorstr='#ff0087c4', GradientType=0); } .dropdown-menu .active > a, .dropdown-menu .active > a:hover { - color: #2d2d2d; + color: #666666; text-decoration: none; outline: 0; - background-color: #4d86c1; - background-image: -moz-linear-gradient(top, #558bc4, #427ebd); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#558bc4), to(#427ebd)); - background-image: -webkit-linear-gradient(top, #558bc4, #427ebd); - background-image: -o-linear-gradient(top, #558bc4, #427ebd); - background-image: linear-gradient(to bottom, #558bc4, #427ebd); + background-color: #0092d3; + background-image: -moz-linear-gradient(top, #0099dd, #0087c4); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0099dd), to(#0087c4)); + background-image: -webkit-linear-gradient(top, #0099dd, #0087c4); + background-image: -o-linear-gradient(top, #0099dd, #0087c4); + background-image: linear-gradient(to bottom, #0099dd, #0087c4); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff558bc4', endColorstr='#ff427ebd', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0099dd', endColorstr='#ff0087c4', GradientType=0); } .dropdown-menu .disabled > a, .dropdown-menu .disabled > a:hover { @@ -2445,8 +2445,8 @@ table th[class*="span"], min-height: 20px; padding: 19px; margin-bottom: 20px; - background-color: #f5f5f5; - border: 1px solid #e3e3e3; + background-color: #eeeeee; + border: 1px solid #dcdcdc; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -2524,13 +2524,13 @@ 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; vertical-align: middle; cursor: pointer; - color: #333333; + color: #434848; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); background-color: #f8f8f8; background-image: -moz-linear-gradient(top, #ffffff, #eeeeee); @@ -2562,7 +2562,7 @@ button.close { .btn.active, .btn.disabled, .btn[disabled] { - color: #333333; + color: #434848; background-color: #eeeeee; *background-color: #e1e1e1; } @@ -2574,7 +2574,7 @@ button.close { *margin-left: 0; } .btn:hover { - color: #333333; + color: #434848; text-decoration: none; background-color: #e6e6e6; *background-color: #d9d9d9; @@ -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: #77a2d0; - background-image: -moz-linear-gradient(top, #8eb2d8, #558bc4); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#8eb2d8), to(#558bc4)); - background-image: -webkit-linear-gradient(top, #8eb2d8, #558bc4); - background-image: -o-linear-gradient(top, #8eb2d8, #558bc4); - background-image: linear-gradient(to bottom, #8eb2d8, #558bc4); + background-color: #0aaaf1; + background-image: -moz-linear-gradient(top, #11b6ff, #0099dd); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#11b6ff), to(#0099dd)); + background-image: -webkit-linear-gradient(top, #11b6ff, #0099dd); + background-image: -o-linear-gradient(top, #11b6ff, #0099dd); + background-image: linear-gradient(to bottom, #11b6ff, #0099dd); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8eb2d8', endColorstr='#ff558bc4', GradientType=0); - border-color: #558bc4 #558bc4 #356598; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff11b6ff', endColorstr='#ff0099dd', GradientType=0); + border-color: #0099dd #0099dd #006491; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #558bc4; + *background-color: #0099dd; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2694,24 +2694,24 @@ input[type="button"].btn-block { .btn-primary.disabled, .btn-primary[disabled] { color: #ffffff; - background-color: #558bc4; - *background-color: #427ebd; + background-color: #0099dd; + *background-color: #0087c4; } .btn-primary:active, .btn-primary.active { - background-color: #3b71ab \9; + background-color: #0076aa \9; } .btn-warning { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #ee8c14; - background-image: -moz-linear-gradient(top, #ff9c21, #d47500); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ff9c21), to(#d47500)); - background-image: -webkit-linear-gradient(top, #ff9c21, #d47500); - background-image: -o-linear-gradient(top, #ff9c21, #d47500); - background-image: linear-gradient(to bottom, #ff9c21, #d47500); + background-color: #ee8505; + background-image: -moz-linear-gradient(top, #ff9008, #d47500); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ff9008), to(#d47500)); + background-image: -webkit-linear-gradient(top, #ff9008, #d47500); + background-image: -o-linear-gradient(top, #ff9008, #d47500); + background-image: linear-gradient(to bottom, #ff9008, #d47500); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffff9c21', endColorstr='#ffd47500', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffff9008', endColorstr='#ffd47500', GradientType=0); border-color: #d47500 #d47500 #884b00; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #d47500; @@ -2735,14 +2735,14 @@ input[type="button"].btn-block { .btn-danger { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #eb1210; - background-image: -moz-linear-gradient(top, #ff1d1b, #cd0200); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ff1d1b), to(#cd0200)); - background-image: -webkit-linear-gradient(top, #ff1d1b, #cd0200); - background-image: -o-linear-gradient(top, #ff1d1b, #cd0200); - background-image: linear-gradient(to bottom, #ff1d1b, #cd0200); + background-color: #eb0301; + background-image: -moz-linear-gradient(top, #ff0301, #cd0200); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ff0301), to(#cd0200)); + background-image: -webkit-linear-gradient(top, #ff0301, #cd0200); + background-image: -o-linear-gradient(top, #ff0301, #cd0200); + background-image: linear-gradient(to bottom, #ff0301, #cd0200); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffff1d1b', endColorstr='#ffcd0200', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffff0301', endColorstr='#ffcd0200', GradientType=0); border-color: #cd0200 #cd0200 #810100; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); *background-color: #cd0200; @@ -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: #98b64d; - background-image: -moz-linear-gradient(top, #a8c65b, #819e37); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#a8c65b), to(#819e37)); - background-image: -webkit-linear-gradient(top, #a8c65b, #819e37); - background-image: -o-linear-gradient(top, #a8c65b, #819e37); - background-image: linear-gradient(to bottom, #a8c65b, #819e37); + background-color: #47cb2a; + background-image: -moz-linear-gradient(top, #4fd930, #3cb521); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#4fd930), to(#3cb521)); + background-image: -webkit-linear-gradient(top, #4fd930, #3cb521); + background-image: -o-linear-gradient(top, #4fd930, #3cb521); + background-image: linear-gradient(to bottom, #4fd930, #3cb521); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa8c65b', endColorstr='#ff819e37', GradientType=0); - border-color: #819e37 #819e37 #536523; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff4fd930', endColorstr='#ff3cb521', GradientType=0); + border-color: #3cb521 #3cb521 #277415; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #819e37; + *background-color: #3cb521; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2787,27 +2787,27 @@ input[type="button"].btn-block { .btn-success.disabled, .btn-success[disabled] { color: #ffffff; - background-color: #819e37; - *background-color: #728b30; + background-color: #3cb521; + *background-color: #359f1d; } .btn-success:active, .btn-success.active { - background-color: #62782a \9; + background-color: #2e8a19 \9; } .btn-info { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #d2d2d2; - background-image: -moz-linear-gradient(top, #e1e1e1, #bbbbbb); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#e1e1e1), to(#bbbbbb)); - background-image: -webkit-linear-gradient(top, #e1e1e1, #bbbbbb); - background-image: -o-linear-gradient(top, #e1e1e1, #bbbbbb); - background-image: linear-gradient(to bottom, #e1e1e1, #bbbbbb); + background-color: #436c98; + background-image: -moz-linear-gradient(top, #4a76a6, #3a5d83); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#4a76a6), to(#3a5d83)); + background-image: -webkit-linear-gradient(top, #4a76a6, #3a5d83); + background-image: -o-linear-gradient(top, #4a76a6, #3a5d83); + background-image: linear-gradient(to bottom, #4a76a6, #3a5d83); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe1e1e1', endColorstr='#ffbbbbbb', GradientType=0); - border-color: #bbbbbb #bbbbbb #959595; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff4a76a6', endColorstr='#ff3a5d83', GradientType=0); + border-color: #3a5d83 #3a5d83 #23374e; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #bbbbbb; + *background-color: #3a5d83; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2818,12 +2818,12 @@ input[type="button"].btn-block { .btn-info.disabled, .btn-info[disabled] { color: #ffffff; - background-color: #bbbbbb; - *background-color: #aeaeae; + background-color: #3a5d83; + *background-color: #325071; } .btn-info:active, .btn-info.active { - background-color: #a2a2a2 \9; + background-color: #2a4460 \9; } .btn-inverse { color: #ffffff; @@ -2893,18 +2893,18 @@ input[type="submit"].btn.btn-mini { .btn-link { border-color: transparent; cursor: pointer; - color: #558bc4; + color: #0099dd; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } .btn-link:hover { - color: #558bc4; + color: #0099dd; text-decoration: underline; background-color: transparent; } .btn-link[disabled]:hover { - color: #333333; + color: #434848; text-decoration: none; } .btn-group { @@ -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,7 +3038,7 @@ input[type="submit"].btn.btn-mini { background-color: #eeeeee; } .btn-group.open .btn-primary.dropdown-toggle { - background-color: #558bc4; + background-color: #0099dd; } .btn-group.open .btn-warning.dropdown-toggle { background-color: #d47500; @@ -3047,10 +3047,10 @@ input[type="submit"].btn.btn-mini { background-color: #cd0200; } .btn-group.open .btn-success.dropdown-toggle { - background-color: #819e37; + background-color: #3cb521; } .btn-group.open .btn-info.dropdown-toggle { - background-color: #bbbbbb; + background-color: #3a5d83; } .btn-group.open .btn-inverse.dropdown-toggle { background-color: #6c737e; @@ -3141,8 +3141,8 @@ input[type="submit"].btn.btn-mini { line-height: 21px; } .alert-success { - background-color: #819e37; - border-color: #818b30; + background-color: #3cb521; + border-color: #4b9f1d; color: #ffffff; } .alert-danger, @@ -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: #558bc4; + background-color: #0099dd; } .nav-list [class^="icon-"], .nav-list [class*=" icon-"] { @@ -3275,7 +3275,7 @@ input[type="submit"].btn.btn-mini { } .nav-tabs > .active > a, .nav-tabs > .active > a:hover { - color: #777777; + color: #666666; background-color: #ffffff; border: 1px solid #ddd; border-bottom-color: transparent; @@ -3293,7 +3293,7 @@ input[type="submit"].btn.btn-mini { .nav-pills > .active > a, .nav-pills > .active > a:hover { color: #ffffff; - background-color: #558bc4; + background-color: #0099dd; } .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: #558bc4; - border-bottom-color: #558bc4; + border-top-color: #0099dd; + border-bottom-color: #0099dd; margin-top: 6px; } .nav .dropdown-toggle:hover .caret { - border-top-color: #558bc4; - border-bottom-color: #558bc4; + border-top-color: #0099dd; + border-bottom-color: #0099dd; } /* move down carets for tabs */ .nav-tabs .dropdown-toggle .caret { @@ -3364,8 +3364,8 @@ input[type="submit"].btn.btn-mini { border-bottom-color: #fff; } .nav-tabs .active .dropdown-toggle .caret { - border-top-color: #777777; - border-bottom-color: #777777; + border-top-color: #666666; + border-bottom-color: #666666; } .nav > .dropdown.active > a:hover { cursor: pointer; @@ -3495,7 +3495,7 @@ input[type="submit"].btn.btn-mini { .navbar { overflow: visible; margin-bottom: 21px; - color: #2d2d2d; + color: #666666; *position: relative; *z-index: 2; } @@ -3503,15 +3503,15 @@ input[type="submit"].btn.btn-mini { min-height: 40px; padding-left: 20px; padding-right: 20px; - background-color: #dadada; - background-image: -moz-linear-gradient(top, #eeeeee, #bbbbbb); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#eeeeee), to(#bbbbbb)); - background-image: -webkit-linear-gradient(top, #eeeeee, #bbbbbb); - background-image: -o-linear-gradient(top, #eeeeee, #bbbbbb); - background-image: linear-gradient(to bottom, #eeeeee, #bbbbbb); + background-color: #dfdfdf; + background-image: -moz-linear-gradient(top, #eeeeee, #c8c8c8); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#eeeeee), to(#c8c8c8)); + background-image: -webkit-linear-gradient(top, #eeeeee, #c8c8c8); + background-image: -o-linear-gradient(top, #eeeeee, #c8c8c8); + background-image: linear-gradient(to bottom, #eeeeee, #c8c8c8); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffeeeeee', endColorstr='#ffbbbbbb', GradientType=0); - border: 1px solid #aeaeae; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffeeeeee', endColorstr='#ffc8c8c8', GradientType=0); + border: 1px solid #bbbbbb; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -3543,7 +3543,7 @@ input[type="submit"].btn.btn-mini { margin-left: -20px; font-size: 20px; font-weight: 200; - color: #333333; + color: #666666; text-shadow: 0 1px 0 #eeeeee; } .navbar .brand:hover { @@ -3554,15 +3554,15 @@ input[type="submit"].btn.btn-mini { line-height: 40px; } .navbar-link { - color: #2d2d2d; + color: #666666; } .navbar-link:hover { - color: #558bc4; + color: #000000; } .navbar .divider-vertical { height: 40px; margin: 0 9px; - border-left: 1px solid #bbbbbb; + border-left: 1px solid #c8c8c8; border-right: 1px solid #eeeeee; } .navbar .btn, @@ -3622,7 +3622,7 @@ input[type="submit"].btn.btn-mini { .navbar-search .search-query { margin-bottom: 0; padding: 4px 14px; - font-family: "Muli", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 1; @@ -3701,7 +3701,7 @@ input[type="submit"].btn.btn-mini { .navbar .nav > li > a { float: none; padding: 9.5px 15px 9.5px; - color: #2d2d2d; + color: #666666; text-decoration: none; text-shadow: 0 1px 0 #eeeeee; } @@ -3711,13 +3711,13 @@ input[type="submit"].btn.btn-mini { .navbar .nav > li > a:focus, .navbar .nav > li > a:hover { background-color: transparent; - color: #558bc4; + color: #000000; text-decoration: none; } .navbar .nav > .active > a, .navbar .nav > .active > a:hover, .navbar .nav > .active > a:focus { - color: #2d2d2d; + color: #000000; text-decoration: none; background-color: transparent; -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); @@ -3732,17 +3732,17 @@ input[type="submit"].btn.btn-mini { margin-right: 5px; color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #cdcdcd; - background-image: -moz-linear-gradient(top, #e1e1e1, #aeaeae); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#e1e1e1), to(#aeaeae)); - background-image: -webkit-linear-gradient(top, #e1e1e1, #aeaeae); - background-image: -o-linear-gradient(top, #e1e1e1, #aeaeae); - background-image: linear-gradient(to bottom, #e1e1e1, #aeaeae); + background-color: #d2d2d2; + background-image: -moz-linear-gradient(top, #e1e1e1, #bbbbbb); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#e1e1e1), to(#bbbbbb)); + background-image: -webkit-linear-gradient(top, #e1e1e1, #bbbbbb); + background-image: -o-linear-gradient(top, #e1e1e1, #bbbbbb); + background-image: linear-gradient(to bottom, #e1e1e1, #bbbbbb); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe1e1e1', endColorstr='#ffaeaeae', GradientType=0); - border-color: #aeaeae #aeaeae #888888; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe1e1e1', endColorstr='#ffbbbbbb', GradientType=0); + border-color: #bbbbbb #bbbbbb #959595; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #aeaeae; + *background-color: #bbbbbb; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -3756,12 +3756,12 @@ input[type="submit"].btn.btn-mini { .navbar .btn-navbar.disabled, .navbar .btn-navbar[disabled] { color: #ffffff; - background-color: #aeaeae; - *background-color: #a1a1a1; + background-color: #bbbbbb; + *background-color: #aeaeae; } .navbar .btn-navbar:active, .navbar .btn-navbar.active { - background-color: #959595 \9; + background-color: #a2a2a2 \9; } .navbar .btn-navbar .icon-bar { display: block; @@ -3816,17 +3816,17 @@ input[type="submit"].btn.btn-mini { .navbar .nav li.dropdown.active > .dropdown-toggle, .navbar .nav li.dropdown.open.active > .dropdown-toggle { background-color: transparent; - color: #2d2d2d; + color: #000000; } .navbar .nav li.dropdown > .dropdown-toggle .caret { - border-top-color: #2d2d2d; - border-bottom-color: #2d2d2d; + border-top-color: #666666; + border-bottom-color: #666666; } .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: #2d2d2d; - border-bottom-color: #2d2d2d; + border-top-color: #000000; + border-bottom-color: #000000; } .navbar .pull-right > li > .dropdown-menu, .navbar .nav > li > .dropdown-menu.pull-right { @@ -3937,7 +3937,7 @@ input[type="submit"].btn.btn-mini { .navbar-inverse .navbar-search .search-query:focus, .navbar-inverse .navbar-search .search-query.focused { padding: 5px 15px; - color: #333333; + color: #434848; text-shadow: 0 1px 0 #ffffff; background-color: #ffffff; border: 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; @@ -4508,7 +4508,7 @@ input[type="submit"].btn.btn-mini { transition: all 0.2s ease-in-out; } a.thumbnail:hover { - border-color: #558bc4; + border-color: #0099dd; -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); @@ -4521,7 +4521,7 @@ a.thumbnail:hover { } .thumbnail .caption { padding: 9px; - color: #777777; + color: #666666; } .media, .media-body { @@ -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; @@ -4617,11 +4617,11 @@ a.badge:hover { } .label-inverse, .badge-inverse { - background-color: #333333; + background-color: #434848; } .label-inverse[href], .badge-inverse[href] { - background-color: #1a1a1a; + background-color: #2a2e2e; } .btn .label, .btn .badge { @@ -4934,7 +4934,7 @@ a.badge:hover { right: 0; bottom: 0; padding: 15px; - background: #333333; + background: #434848; background: rgba(0, 0, 0, 0.75); } .carousel-caption h4, @@ -4964,7 +4964,7 @@ a.badge:hover { margin-bottom: 0; font-size: 60px; line-height: 1; - color: inherit; + color: #2d2d2d; letter-spacing: -1px; } .hero-unit li { @@ -4989,25 +4989,23 @@ a.badge:hover { position: fixed; } .navbar .navbar-inner { - border-bottom: 1px solid #CACACA; - -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4) , 0 0 10px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4) , 0 0 10px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4) , 0 0 10px rgba(0, 0, 0, 0.1); + -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4) , 0 1px 0 rgba(0, 0, 0, 0.8); + -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4) , 0 1px 0 rgba(0, 0, 0, 0.8); + box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4) , 0 1px 0 rgba(0, 0, 0, 0.8); } .navbar .brand { text-shadow: 0 1px 0 rgba(255, 255, 255, 0.3); } .navbar .brand:hover { - color: #558bc4; + color: #000000; } .navbar .nav > li > a { - padding: 11px 10px 9px; + padding: 11px 10px 8px; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.3); } .navbar .navbar-text { - margin-top: 2px; - padding: 0 10px; - line-height: 38px; + padding: 11px 10px 8px; + line-height: inherit; } .navbar .navbar-search .search-query, .navbar .navbar-search .search-query:hover { @@ -5037,7 +5035,7 @@ a.badge:hover { -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.5); -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.5); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.5); - color: #2d2d2d; + color: #666666; } .navbar-inverse .brand { text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3); @@ -5071,7 +5069,7 @@ a.badge:hover { } @media (max-width: 979px) { .navbar .nav-collapse .nav li > a:hover { - background-color: #558bc4; + background-color: #0099dd; color: #ffffff; text-shadow: none; } @@ -5083,23 +5081,23 @@ a.badge:hover { color: #eeeeee; } .navbar-inverse .nav-collapse .nav li > a:hover { - background-color: #558bc4 !important; + background-color: #0099dd !important; } .navbar-inverse .nav-collapse .nav-header { color: #eeeeee; } } div.subnav .nav > li > a { - color: #2d2d2d; + color: #666666; } div.subnav .nav > li > a:hover { - color: #558bc4; + color: #000000; } div.subnav .nav > li.active > a { - color: #2d2d2d; + color: #666666; } div.subnav .nav > li.active > a:hover { - color: #2d2d2d; + color: #666666; } div.subnav .nav > li.dropdown > .dropdown-toggle { background-color: transparent; @@ -5107,76 +5105,26 @@ div.subnav .nav > li.dropdown > .dropdown-toggle { div.subnav .nav > li.dropdown.open > .dropdown-toggle { border-left: 1px solid whiteSmoke; border-right: 1px solid #E5E5E5; - color: #2d2d2d; + color: #666666; } div.subnav .nav > li.dropdown.open > .dropdown-toggle:hover { - color: #558bc4; + color: #0099dd; } .nav > li.dropdown > .dropdown-toggle .caret, .nav > li.dropdown.active > .dropdown-toggle .caret, .nav > li.dropdown.open > .dropdown-toggle .caret, .nav > li.dropdown.open.active > .dropdown-toggle .caret { - border-top: 4px solid #2d2d2d; - border-top-color: #2d2d2d; + border-top: 4px solid #666666; + border-top-color: #666666; opacity: 1; } .nav > li.dropdown > .dropdown-toggle:hover .caret, .nav > li.dropdown.active > .dropdown-toggle:hover .caret, .nav > li.dropdown.open > .dropdown-toggle:hover .caret, .nav > li.dropdown.open.active > .dropdown-toggle:hover .caret { - border-top: 4px solid #558bc4; - border-top-color: #558bc4; + border-top: 4px solid #0099dd; + border-top-color: #0099dd; } -.btn-info, -.btn-info:hover, -.btn-info.disabled { - color: #2d2d2d; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.3); -} -.btn-info .caret, -.btn-info:hover .caret, -.btn-info.disabled .caret { - border-top-color: #2d2d2d; - border-bottom-color: #2d2d2d; -} -/*.btn { - .buttonBackground(#F4F4F4, #ECECEC); - color: @textColor; - text-shadow: none; - - - &:hover, - &:active, - &.active, - &.disabled, - &[disabled] { - color: @grayDark; - } -} - -.btn-primary { - .buttonBackground(#909090, #3F3F3F); -} - -.btn-warning { - .buttonBackground(lighten(@yellow, 15%), @yellow); -} - -.btn-danger { - .buttonBackground(lighten(#DA2D2D, 15%), #DA2D2D); -} - -.btn-success { - .buttonBackground(#8ADD6D, #60B044); -} - -.btn-info { - .buttonBackground(lighten(#4488BB, 15%), #4488BB); -} - -.btn-inverse { - .buttonBackground(lighten(@purple, 5%), @purple); -}*/ .control-group.warning > label, .control-group.warning .help-block, .control-group.warning .help-inline { @@ -5276,11 +5224,20 @@ div.subnav .nav > li.dropdown.open > .dropdown-toggle:hover { .control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on { color: #2ba949; - background-color: #819e37; + background-color: #3cb521; border-color: #2ba949; } .alert { + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +} +.alert h1, +.alert h2, +.alert h3, +.alert h4, +.alert h5, +.alert h6 { color: #ffffff; + font-weight: bold; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } .label, @@ -5297,20 +5254,22 @@ div.subnav .nav > li.dropdown.open > .dropdown-toggle:hover { } .label-success, .badge-success { - background-color: #819e37; + background-color: #3cb521; } .label-info, .badge-info { background-color: #3399f3; } .well { - background-color: #eeeeee; + -webkit-box-shadow: inset 1px 1px 0 rgba(0, 0, 0, 0.1); + -moz-box-shadow: inset 1px 1px 0 rgba(0, 0, 0, 0.1); + box-shadow: inset 1px 1px 0 rgba(0, 0, 0, 0.1); } .hero-unit { - -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); - border: 1px solid rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 1px 1px 0 rgba(0, 0, 0, 0.1); + -moz-box-shadow: inset 1px 1px 0 rgba(0, 0, 0, 0.1); + box-shadow: inset 1px 1px 0 rgba(0, 0, 0, 0.1); + border: 1px solid rgba(0, 0, 0, 0.1); } .pull-right { float: right; diff --git a/spacelab/bootstrap.min.css b/spacelab/bootstrap.min.css index 4a0c052..c67aef9 100644 --- a/spacelab/bootstrap.min.css +++ b/spacelab/bootstrap.min.css @@ -1,4 +1,4 @@ -@import url('http://fonts.googleapis.com/css?family=Muli'); +@import url('http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700'); 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:"Muli","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:21px;color:#2d2d2d;background-color:#ffffff;} -a{color:#558bc4;text-decoration:none;} -a:hover{color:#558bc4;text-decoration:underline;} +body{margin:0;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;line-height:21px;color:#666666;background-color:#ffffff;} +a{color:#0099dd;text-decoration:none;} +a:hover{color:#0099dd;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:#558bc4;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:inherit;font-weight:normal;line-height:21px;color:inherit;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;line-height:1;color:#bbbbbb;} +h1,h2,h3,h4,h5,h6{margin:10.5px 0;font-family:inherit;font-weight:normal;line-height:21px;color:#2d2d2d;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;line-height:1;color:#bbbbbb;} 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;} @@ -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:#434848;-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:#bbbbbb;} -label,input,button,select,textarea{font-size:14px;font-weight:normal;line-height:21px;} -input,button,select,textarea{font-family:"Muli","Helvetica Neue",Helvetica,Arial,sans-serif;} +legend{display:block;width:100%;padding:0;margin-bottom:21px;font-size:22.5px;line-height:42px;color:#434848;border:0;border-bottom:1px solid #e5e5e5;}legend small{font-size:15.75px;color:#bbbbbb;} +label,input,button,select,textarea{font-size:15px;font-weight:normal;line-height:21px;} +input,button,select,textarea{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-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:#777777;-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:#666666;-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);} @@ -223,7 +223,7 @@ input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio .control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#ffffff;} .control-group.success .checkbox,.control-group.success .radio,.control-group.success input,.control-group.success select,.control-group.success textarea{color:#ffffff;} .control-group.success input,.control-group.success select,.control-group.success 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.success input:focus,.control-group.success select:focus,.control-group.success 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.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#ffffff;background-color:#819e37;border-color:#ffffff;} +.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#ffffff;background-color:#3cb521;border-color:#ffffff;} .control-group.info>label,.control-group.info .help-block,.control-group.info .help-inline{color:#ffffff;} .control-group.info .checkbox,.control-group.info .radio,.control-group.info input,.control-group.info select,.control-group.info textarea{color:#ffffff;} .control-group.info input,.control-group.info select,.control-group.info 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.info input:focus,.control-group.info select:focus,.control-group.info 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,14 +231,14 @@ 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:#f5f5f5;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:#535353;} +.help-block,.help-inline{color:#8c8c8c;} .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:#c6da94;border-color:#819e37;} +.input-append .active,.input-prepend .active{background-color:#98e986;border-color:#3cb521;} .input-prepend .add-on,.input-prepend .btn{margin-right:-1px;} .input-prepend .add-on:first-child,.input-prepend .btn:first-child{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;} .input-append input,.input-append select,.input-append .uneditable-input{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;}.input-append input+.btn-group .btn,.input-append select+.btn-group .btn,.input-append .uneditable-input+.btn-group .btn{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;} @@ -299,11 +299,11 @@ table td[class*="span"],table th[class*="span"],.row-fluid table td[class*="span .table td.span10,.table th.span10{float:none;width:764px;margin-left:0;} .table td.span11,.table th.span11{float:none;width:844px;margin-left:0;} .table td.span12,.table th.span12{float:none;width:924px;margin-left:0;} -.table tbody tr.success td{background-color:#819e37;} +.table tbody tr.success td{background-color:#3cb521;} .table tbody tr.error td{background-color:#cd0200;} .table tbody tr.warning td{background-color:#d47500;} .table tbody tr.info td{background-color:#3399f3;} -.table-hover tbody tr.success:hover td{background-color:#728b30;} +.table-hover tbody tr.success:hover td{background-color:#359f1d;} .table-hover tbody tr.error:hover td{background-color:#b40200;} .table-hover tbody tr.warning:hover td{background-color:#bb6700;} .table-hover tbody tr.info:hover td{background-color:#1b8df2;} @@ -456,9 +456,9 @@ table td[class*="span"],table th[class*="span"],.row-fluid table td[class*="span .dropdown .caret{margin-top:8px;margin-left:2px;} .dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;background-color:#ffffff;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;}.dropdown-menu.pull-right{right:0;left:auto;} .dropdown-menu .divider{*width:100%;height:1px;margin:9.5px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;} -.dropdown-menu li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:21px;color:#2d2d2d;white-space:nowrap;} -.dropdown-menu li>a:hover,.dropdown-menu li>a:focus,.dropdown-submenu:hover>a{text-decoration:none;color:#ffffff;background-color:#4d86c1;background-image:-moz-linear-gradient(top, #558bc4, #427ebd);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#558bc4), to(#427ebd));background-image:-webkit-linear-gradient(top, #558bc4, #427ebd);background-image:-o-linear-gradient(top, #558bc4, #427ebd);background-image:linear-gradient(to bottom, #558bc4, #427ebd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff558bc4', endColorstr='#ff427ebd', GradientType=0);} -.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#2d2d2d;text-decoration:none;outline:0;background-color:#4d86c1;background-image:-moz-linear-gradient(top, #558bc4, #427ebd);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#558bc4), to(#427ebd));background-image:-webkit-linear-gradient(top, #558bc4, #427ebd);background-image:-o-linear-gradient(top, #558bc4, #427ebd);background-image:linear-gradient(to bottom, #558bc4, #427ebd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff558bc4', endColorstr='#ff427ebd', GradientType=0);} +.dropdown-menu li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:21px;color:#666666;white-space:nowrap;} +.dropdown-menu li>a:hover,.dropdown-menu li>a:focus,.dropdown-submenu:hover>a{text-decoration:none;color:#ffffff;background-color:#0092d3;background-image:-moz-linear-gradient(top, #0099dd, #0087c4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0099dd), to(#0087c4));background-image:-webkit-linear-gradient(top, #0099dd, #0087c4);background-image:-o-linear-gradient(top, #0099dd, #0087c4);background-image:linear-gradient(to bottom, #0099dd, #0087c4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0099dd', endColorstr='#ff0087c4', GradientType=0);} +.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#666666;text-decoration:none;outline:0;background-color:#0092d3;background-image:-moz-linear-gradient(top, #0099dd, #0087c4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0099dd), to(#0087c4));background-image:-webkit-linear-gradient(top, #0099dd, #0087c4);background-image:-o-linear-gradient(top, #0099dd, #0087c4);background-image:linear-gradient(to bottom, #0099dd, #0087c4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0099dd', endColorstr='#ff0087c4', GradientType=0);} .dropdown-menu .disabled>a,.dropdown-menu .disabled>a:hover{color:#bbbbbb;} .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;} @@ -474,40 +474,40 @@ table td[class*="span"],table th[class*="span"],.row-fluid table td[class*="span .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:#f5f5f5;border:1px solid #e3e3e3;-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:#eeeeee;border:1px solid #dcdcdc;-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:#f8f8f8;background-image:-moz-linear-gradient(top, #ffffff, #eeeeee);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#eeeeee));background-image:-webkit-linear-gradient(top, #ffffff, #eeeeee);background-image:-o-linear-gradient(top, #ffffff, #eeeeee);background-image:linear-gradient(to bottom, #ffffff, #eeeeee);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0);border-color:#eeeeee #eeeeee #c8c8c8;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#eeeeee;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:#eeeeee;*background-color:#e1e1e1;} +.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:#434848;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#f8f8f8;background-image:-moz-linear-gradient(top, #ffffff, #eeeeee);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#eeeeee));background-image:-webkit-linear-gradient(top, #ffffff, #eeeeee);background-image:-o-linear-gradient(top, #ffffff, #eeeeee);background-image:linear-gradient(to bottom, #ffffff, #eeeeee);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0);border-color:#eeeeee #eeeeee #c8c8c8;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#eeeeee;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:#434848;background-color:#eeeeee;*background-color:#e1e1e1;} .btn:active,.btn.active{background-color:#d5d5d5 \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:hover{color:#434848;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:#77a2d0;background-image:-moz-linear-gradient(top, #8eb2d8, #558bc4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#8eb2d8), to(#558bc4));background-image:-webkit-linear-gradient(top, #8eb2d8, #558bc4);background-image:-o-linear-gradient(top, #8eb2d8, #558bc4);background-image:linear-gradient(to bottom, #8eb2d8, #558bc4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8eb2d8', endColorstr='#ff558bc4', GradientType=0);border-color:#558bc4 #558bc4 #356598;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#558bc4;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:#558bc4;*background-color:#427ebd;} -.btn-primary:active,.btn-primary.active{background-color:#3b71ab \9;} -.btn-warning{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#ee8c14;background-image:-moz-linear-gradient(top, #ff9c21, #d47500);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ff9c21), to(#d47500));background-image:-webkit-linear-gradient(top, #ff9c21, #d47500);background-image:-o-linear-gradient(top, #ff9c21, #d47500);background-image:linear-gradient(to bottom, #ff9c21, #d47500);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffff9c21', endColorstr='#ffd47500', GradientType=0);border-color:#d47500 #d47500 #884b00;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#d47500;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:#d47500;*background-color:#bb6700;} +.btn-primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0aaaf1;background-image:-moz-linear-gradient(top, #11b6ff, #0099dd);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#11b6ff), to(#0099dd));background-image:-webkit-linear-gradient(top, #11b6ff, #0099dd);background-image:-o-linear-gradient(top, #11b6ff, #0099dd);background-image:linear-gradient(to bottom, #11b6ff, #0099dd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff11b6ff', endColorstr='#ff0099dd', GradientType=0);border-color:#0099dd #0099dd #006491;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#0099dd;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:#0099dd;*background-color:#0087c4;} +.btn-primary:active,.btn-primary.active{background-color:#0076aa \9;} +.btn-warning{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#ee8505;background-image:-moz-linear-gradient(top, #ff9008, #d47500);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ff9008), to(#d47500));background-image:-webkit-linear-gradient(top, #ff9008, #d47500);background-image:-o-linear-gradient(top, #ff9008, #d47500);background-image:linear-gradient(to bottom, #ff9008, #d47500);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffff9008', endColorstr='#ffd47500', GradientType=0);border-color:#d47500 #d47500 #884b00;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#d47500;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:#d47500;*background-color:#bb6700;} .btn-warning:active,.btn-warning.active{background-color:#a15900 \9;} -.btn-danger{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#eb1210;background-image:-moz-linear-gradient(top, #ff1d1b, #cd0200);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ff1d1b), to(#cd0200));background-image:-webkit-linear-gradient(top, #ff1d1b, #cd0200);background-image:-o-linear-gradient(top, #ff1d1b, #cd0200);background-image:linear-gradient(to bottom, #ff1d1b, #cd0200);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffff1d1b', endColorstr='#ffcd0200', GradientType=0);border-color:#cd0200 #cd0200 #810100;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#cd0200;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:#cd0200;*background-color:#b40200;} +.btn-danger{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#eb0301;background-image:-moz-linear-gradient(top, #ff0301, #cd0200);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ff0301), to(#cd0200));background-image:-webkit-linear-gradient(top, #ff0301, #cd0200);background-image:-o-linear-gradient(top, #ff0301, #cd0200);background-image:linear-gradient(to bottom, #ff0301, #cd0200);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffff0301', endColorstr='#ffcd0200', GradientType=0);border-color:#cd0200 #cd0200 #810100;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#cd0200;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:#cd0200;*background-color:#b40200;} .btn-danger:active,.btn-danger.active{background-color:#9a0200 \9;} -.btn-success{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#98b64d;background-image:-moz-linear-gradient(top, #a8c65b, #819e37);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#a8c65b), to(#819e37));background-image:-webkit-linear-gradient(top, #a8c65b, #819e37);background-image:-o-linear-gradient(top, #a8c65b, #819e37);background-image:linear-gradient(to bottom, #a8c65b, #819e37);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa8c65b', endColorstr='#ff819e37', GradientType=0);border-color:#819e37 #819e37 #536523;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#819e37;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:#819e37;*background-color:#728b30;} -.btn-success:active,.btn-success.active{background-color:#62782a \9;} -.btn-info{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#d2d2d2;background-image:-moz-linear-gradient(top, #e1e1e1, #bbbbbb);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#e1e1e1), to(#bbbbbb));background-image:-webkit-linear-gradient(top, #e1e1e1, #bbbbbb);background-image:-o-linear-gradient(top, #e1e1e1, #bbbbbb);background-image:linear-gradient(to bottom, #e1e1e1, #bbbbbb);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe1e1e1', endColorstr='#ffbbbbbb', GradientType=0);border-color:#bbbbbb #bbbbbb #959595;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#bbbbbb;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:#bbbbbb;*background-color:#aeaeae;} -.btn-info:active,.btn-info.active{background-color:#a2a2a2 \9;} +.btn-success{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#47cb2a;background-image:-moz-linear-gradient(top, #4fd930, #3cb521);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#4fd930), to(#3cb521));background-image:-webkit-linear-gradient(top, #4fd930, #3cb521);background-image:-o-linear-gradient(top, #4fd930, #3cb521);background-image:linear-gradient(to bottom, #4fd930, #3cb521);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff4fd930', endColorstr='#ff3cb521', GradientType=0);border-color:#3cb521 #3cb521 #277415;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#3cb521;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:#3cb521;*background-color:#359f1d;} +.btn-success:active,.btn-success.active{background-color:#2e8a19 \9;} +.btn-info{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#436c98;background-image:-moz-linear-gradient(top, #4a76a6, #3a5d83);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#4a76a6), to(#3a5d83));background-image:-webkit-linear-gradient(top, #4a76a6, #3a5d83);background-image:-o-linear-gradient(top, #4a76a6, #3a5d83);background-image:linear-gradient(to bottom, #4a76a6, #3a5d83);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff4a76a6', endColorstr='#ff3a5d83', GradientType=0);border-color:#3a5d83 #3a5d83 #23374e;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#3a5d83;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:#3a5d83;*background-color:#325071;} +.btn-info:active,.btn-info.active{background-color:#2a4460 \9;} .btn-inverse{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#848a94;background-image:-moz-linear-gradient(top, #949aa3, #6c737e);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#949aa3), to(#6c737e));background-image:-webkit-linear-gradient(top, #949aa3, #6c737e);background-image:-o-linear-gradient(top, #949aa3, #6c737e);background-image:linear-gradient(to bottom, #949aa3, #6c737e);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff949aa3', endColorstr='#ff6c737e', GradientType=0);border-color:#6c737e #6c737e #494d55;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#6c737e;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:#6c737e;*background-color:#606670;} .btn-inverse:active,.btn-inverse.active{background-color:#545a63 \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;} @@ -515,15 +515,15 @@ button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*paddin 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:#558bc4;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.btn-link:hover{color:#558bc4;text-decoration:underline;background-color:transparent;} -.btn-link[disabled]:hover{color:#333333;text-decoration:none;} +.btn-link{border-color:transparent;cursor:pointer;color:#0099dd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.btn-link:hover{color:#0099dd;text-decoration:underline;background-color:transparent;} +.btn-link[disabled]:hover{color:#434848;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,11 +539,11 @@ 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:#eeeeee;} -.btn-group.open .btn-primary.dropdown-toggle{background-color:#558bc4;} +.btn-group.open .btn-primary.dropdown-toggle{background-color:#0099dd;} .btn-group.open .btn-warning.dropdown-toggle{background-color:#d47500;} .btn-group.open .btn-danger.dropdown-toggle{background-color:#cd0200;} -.btn-group.open .btn-success.dropdown-toggle{background-color:#819e37;} -.btn-group.open .btn-info.dropdown-toggle{background-color:#bbbbbb;} +.btn-group.open .btn-success.dropdown-toggle{background-color:#3cb521;} +.btn-group.open .btn-info.dropdown-toggle{background-color:#3a5d83;} .btn-group.open .btn-inverse.dropdown-toggle{background-color:#6c737e;} .btn .caret{margin-top:8px;margin-left:0;} .btn-mini .caret,.btn-small .caret,.btn-large .caret{margin-top:6px;} @@ -560,7 +560,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .alert{padding:8px 35px 8px 14px;margin-bottom:21px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#d47500;border:1px solid #c54c00;-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:#819e37;border-color:#818b30;color:#ffffff;} +.alert-success{background-color:#3cb521;border-color:#4b9f1d;color:#ffffff;} .alert-danger,.alert-error{background-color:#cd0200;border-color:#be001e;color:#ffffff;} .alert-info{background-color:#3399f3;border-color:#11adf1;color:#ffffff;} .alert-block{padding-top:14px;padding-bottom:14px;} @@ -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:#558bc4;} +.nav-list>.active>a,.nav-list>.active>a:hover{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#0099dd;} .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:#777777;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;} +.nav-tabs>.active>a,.nav-tabs>.active>a:hover{color:#666666;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:#558bc4;} +.nav-pills>.active>a,.nav-pills>.active>a:hover{color:#ffffff;background-color:#0099dd;} .nav-stacked>li{float:none;} .nav-stacked>li>a{margin-right:0;} .nav-tabs.nav-stacked{border-bottom:0;} @@ -599,11 +599,11 @@ 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:#558bc4;border-bottom-color:#558bc4;margin-top:6px;} -.nav .dropdown-toggle:hover .caret{border-top-color:#558bc4;border-bottom-color:#558bc4;} +.nav .dropdown-toggle .caret{border-top-color:#0099dd;border-bottom-color:#0099dd;margin-top:6px;} +.nav .dropdown-toggle:hover .caret{border-top-color:#0099dd;border-bottom-color:#0099dd;} .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:#777777;border-bottom-color:#777777;} +.nav-tabs .active .dropdown-toggle .caret{border-top-color:#666666;border-bottom-color:#666666;} .nav>.dropdown.active>a:hover{cursor:pointer;} .nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover{color:#ffffff;background-color:#bbbbbb;border-color:#bbbbbb;} .nav li.dropdown.open .caret,.nav li.dropdown.open.active .caret,.nav li.dropdown.open a:hover .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;opacity:1;filter:alpha(opacity=100);} @@ -630,15 +630,15 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .tabs-right>.nav-tabs .active>a,.tabs-right>.nav-tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;*border-left-color:#ffffff;} .nav>.disabled>a{color:#bbbbbb;} .nav>.disabled>a:hover{text-decoration:none;background-color:transparent;cursor:default;} -.navbar{overflow:visible;margin-bottom:21px;color:#2d2d2d;*position:relative;*z-index:2;} -.navbar-inner{min-height:40px;padding-left:20px;padding-right:20px;background-color:#dadada;background-image:-moz-linear-gradient(top, #eeeeee, #bbbbbb);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#eeeeee), to(#bbbbbb));background-image:-webkit-linear-gradient(top, #eeeeee, #bbbbbb);background-image:-o-linear-gradient(top, #eeeeee, #bbbbbb);background-image:linear-gradient(to bottom, #eeeeee, #bbbbbb);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffeeeeee', endColorstr='#ffbbbbbb', GradientType=0);border:1px solid #aeaeae;-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{overflow:visible;margin-bottom:21px;color:#666666;*position:relative;*z-index:2;} +.navbar-inner{min-height:40px;padding-left:20px;padding-right:20px;background-color:#dfdfdf;background-image:-moz-linear-gradient(top, #eeeeee, #c8c8c8);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#eeeeee), to(#c8c8c8));background-image:-webkit-linear-gradient(top, #eeeeee, #c8c8c8);background-image:-o-linear-gradient(top, #eeeeee, #c8c8c8);background-image:linear-gradient(to bottom, #eeeeee, #c8c8c8);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffeeeeee', endColorstr='#ffc8c8c8', GradientType=0);border:1px solid #bbbbbb;-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:9.5px 20px 9.5px;margin-left:-20px;font-size:20px;font-weight:200;color:#333333;text-shadow:0 1px 0 #eeeeee;}.navbar .brand:hover{text-decoration:none;} +.navbar .brand{float:left;display:block;padding:9.5px 20px 9.5px;margin-left:-20px;font-size:20px;font-weight:200;color:#666666;text-shadow:0 1px 0 #eeeeee;}.navbar .brand:hover{text-decoration:none;} .navbar-text{margin-bottom:0;line-height:40px;} -.navbar-link{color:#2d2d2d;}.navbar-link:hover{color:#558bc4;} -.navbar .divider-vertical{height:40px;margin:0 9px;border-left:1px solid #bbbbbb;border-right:1px solid #eeeeee;} +.navbar-link{color:#666666;}.navbar-link:hover{color:#000000;} +.navbar .divider-vertical{height:40px;margin:0 9px;border-left:1px solid #c8c8c8;border-right:1px solid #eeeeee;} .navbar .btn,.navbar .btn-group{margin-top: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;} @@ -647,7 +647,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .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:5px;margin-bottom:0;}.navbar-search .search-query{margin-bottom:0;padding:4px 14px;font-family:"Muli","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:5px;margin-bottom:0;}.navbar-search .search-query{margin-bottom:0;padding:4px 14px;font-family:"Open Sans","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,21 +660,21 @@ 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:9.5px 15px 9.5px;color:#2d2d2d;text-decoration:none;text-shadow:0 1px 0 #eeeeee;} +.navbar .nav>li>a{float:none;padding:9.5px 15px 9.5px;color:#666666;text-decoration:none;text-shadow:0 1px 0 #eeeeee;} .navbar .nav .dropdown-toggle .caret{margin-top:8px;} -.navbar .nav>li>a:focus,.navbar .nav>li>a:hover{background-color:transparent;color:#558bc4;text-decoration:none;} -.navbar .nav>.active>a,.navbar .nav>.active>a:hover,.navbar .nav>.active>a:focus{color:#2d2d2d;text-decoration:none;background-color:transparent;-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:#cdcdcd;background-image:-moz-linear-gradient(top, #e1e1e1, #aeaeae);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#e1e1e1), to(#aeaeae));background-image:-webkit-linear-gradient(top, #e1e1e1, #aeaeae);background-image:-o-linear-gradient(top, #e1e1e1, #aeaeae);background-image:linear-gradient(to bottom, #e1e1e1, #aeaeae);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe1e1e1', endColorstr='#ffaeaeae', GradientType=0);border-color:#aeaeae #aeaeae #888888;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#aeaeae;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:#aeaeae;*background-color:#a1a1a1;} -.navbar .btn-navbar:active,.navbar .btn-navbar.active{background-color:#959595 \9;} +.navbar .nav>li>a:focus,.navbar .nav>li>a:hover{background-color:transparent;color:#000000;text-decoration:none;} +.navbar .nav>.active>a,.navbar .nav>.active>a:hover,.navbar .nav>.active>a:focus{color:#000000;text-decoration:none;background-color:transparent;-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:#d2d2d2;background-image:-moz-linear-gradient(top, #e1e1e1, #bbbbbb);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#e1e1e1), to(#bbbbbb));background-image:-webkit-linear-gradient(top, #e1e1e1, #bbbbbb);background-image:-o-linear-gradient(top, #e1e1e1, #bbbbbb);background-image:linear-gradient(to bottom, #e1e1e1, #bbbbbb);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe1e1e1', endColorstr='#ffbbbbbb', GradientType=0);border-color:#bbbbbb #bbbbbb #959595;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#bbbbbb;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:#bbbbbb;*background-color:#aeaeae;} +.navbar .btn-navbar:active,.navbar .btn-navbar.active{background-color:#a2a2a2 \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 #ffffff;position:absolute;top:-6px;left:10px;} .navbar-fixed-bottom .nav>li>.dropdown-menu:before{border-top:7px solid #ccc;border-top-color:rgba(0, 0, 0, 0.2);border-bottom:0;bottom:-7px;top:auto;} .navbar-fixed-bottom .nav>li>.dropdown-menu:after{border-top:6px solid #ffffff;border-bottom:0;bottom:-6px;top:auto;} -.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.open.active>.dropdown-toggle{background-color:transparent;color:#2d2d2d;} -.navbar .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#2d2d2d;border-bottom-color:#2d2d2d;} -.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:#2d2d2d;border-bottom-color:#2d2d2d;} +.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.open.active>.dropdown-toggle{background-color:transparent;color:#000000;} +.navbar .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#666666;border-bottom-color:#666666;} +.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:#000000;border-bottom-color:#000000;} .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;} @@ -690,7 +690,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .navbar-inverse .navbar-search .search-query{color:#ffffff;background-color:#afb3ba;border-color:#6c737e;-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:#eeeeee;} .navbar-inverse .navbar-search .search-query:-ms-input-placeholder{color:#eeeeee;} .navbar-inverse .navbar-search .search-query::-webkit-input-placeholder{color:#eeeeee;} -.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 .navbar-search .search-query:focus,.navbar-inverse .navbar-search .search-query.focused{padding:5px 15px;color:#434848;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:#878d96;background-image:-moz-linear-gradient(top, #a1a7af, #606670);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#a1a7af), to(#606670));background-image:-webkit-linear-gradient(top, #a1a7af, #606670);background-image:-o-linear-gradient(top, #a1a7af, #606670);background-image:linear-gradient(to bottom, #a1a7af, #606670);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa1a7af', endColorstr='#ff606670', GradientType=0);border-color:#606670 #606670 #3d4147;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#606670;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:#606670;*background-color:#545a63;} .navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active{background-color:#494d55 \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;} @@ -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;} @@ -763,9 +763,9 @@ 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:#558bc4;-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:#0099dd;-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:#777777;} +.thumbnail .caption{padding:9px;color:#666666;} .media,.media-body{overflow:hidden;*overflow:visible;zoom:1;} .media,.media .media{margin-top:15px;} .media:first-child{margin-top:0;} @@ -774,7 +774,7 @@ a.thumbnail:hover{border-color:#558bc4;-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:#bbbbbb;} +.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:#bbbbbb;} .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;} @@ -786,8 +786,8 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} .label-success[href],.badge-success[href]{background-color:#e6e6e6;} .label-info,.badge-info{background-color:#ffffff;} .label-info[href],.badge-info[href]{background-color:#e6e6e6;} -.label-inverse,.badge-inverse{background-color:#333333;} -.label-inverse[href],.badge-inverse[href]{background-color:#1a1a1a;} +.label-inverse,.badge-inverse{background-color:#434848;} +.label-inverse[href],.badge-inverse[href]{background-color:#2a2e2e;} .btn .label,.btn .badge{position:relative;top:-1px;} .btn-mini .label,.btn-mini .badge{top:0;} @-webkit-keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}@-ms-keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}@-o-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}.progress{overflow:hidden;height:21px;margin-bottom:21px;background-color:#f7f7f7;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(to bottom, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} @@ -823,11 +823,11 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} .carousel .active.right{left:100%;} .carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#ffffff;text-align:center;background:#2d2d2d;border:3px solid #ffffff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:0.5;filter:alpha(opacity=50);}.carousel-control.right{left:auto;right:15px;} .carousel-control:hover{color:#ffffff;text-decoration:none;opacity:0.9;filter:alpha(opacity=90);} -.carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:15px;background:#333333;background:rgba(0, 0, 0, 0.75);} +.carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:15px;background:#434848;background:rgba(0, 0, 0, 0.75);} .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:#eeeeee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:inherit;letter-spacing:-1px;} +.hero-unit{padding:60px;margin-bottom:30px;font-size:18px;font-weight:200;line-height:31.5px;color:inherit;background-color:#eeeeee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:#2d2d2d;letter-spacing:-1px;} .hero-unit li{line-height:31.5px;} .pull-right{float:right;} .pull-left{float:left;} @@ -835,27 +835,26 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} .show{display:block;} .invisible{visibility:hidden;} .affix{position:fixed;} -.navbar .navbar-inner{border-bottom:1px solid #CACACA;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.4) , 0 0 10px rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.4) , 0 0 10px rgba(0, 0, 0, 0.1);box-shadow:0 1px 0 rgba(255, 255, 255, 0.4) , 0 0 10px rgba(0, 0, 0, 0.1);} -.navbar .brand{text-shadow:0 1px 0 rgba(255, 255, 255, 0.3);}.navbar .brand:hover{color:#558bc4;} -.navbar .nav>li>a{padding:11px 10px 9px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.3);} -.navbar .navbar-text{margin-top:2px;padding:0 10px;line-height:38px;} +.navbar .navbar-inner{-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.4) , 0 1px 0 rgba(0, 0, 0, 0.8);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.4) , 0 1px 0 rgba(0, 0, 0, 0.8);box-shadow:0 1px 0 rgba(255, 255, 255, 0.4) , 0 1px 0 rgba(0, 0, 0, 0.8);} +.navbar .brand{text-shadow:0 1px 0 rgba(255, 255, 255, 0.3);}.navbar .brand:hover{color:#000000;} +.navbar .nav>li>a{padding:11px 10px 8px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.3);} +.navbar .navbar-text{padding:11px 10px 8px;line-height:inherit;} .navbar .navbar-search .search-query,.navbar .navbar-search .search-query:hover{margin-bottom:0;line-height:normal;color:#bbbbbb;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.5);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.5);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.5);}.navbar .navbar-search .search-query:-moz-placeholder,.navbar .navbar-search .search-query:hover:-moz-placeholder{color:#bbbbbb;} .navbar .navbar-search .search-query:-ms-input-placeholder,.navbar .navbar-search .search-query:hover:-ms-input-placeholder{color:#bbbbbb;} .navbar .navbar-search .search-query::-webkit-input-placeholder,.navbar .navbar-search .search-query:hover::-webkit-input-placeholder{color:#bbbbbb;} -.navbar .navbar-search .search-query:focus,.navbar .navbar-search .search-query:hover:focus,.navbar .navbar-search .search-query.focused,.navbar .navbar-search .search-query:hover.focused{-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.5);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.5);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.5);color:#2d2d2d;} +.navbar .navbar-search .search-query:focus,.navbar .navbar-search .search-query:hover:focus,.navbar .navbar-search .search-query.focused,.navbar .navbar-search .search-query:hover.focused{-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.5);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.5);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.5);color:#666666;} .navbar-inverse .brand{text-shadow:-1px -1px 0 rgba(0, 0, 0, 0.3);}.navbar-inverse .brand:hover{color:#ffffff;} .navbar-inverse .nav>li>a{text-shadow:-1px -1px 0 rgba(0, 0, 0, 0.3);} .navbar-inverse .nav li.dropdown.open>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown:hover>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.open:hover>.dropdown-toggle .caret{border-top-color:#ffffff;} .navbar-inverse .navbar-search .search-query,.navbar-inverse .navbar-search .search-query:hover{color:#ffffff;}.navbar-inverse .navbar-search .search-query:-moz-placeholder,.navbar-inverse .navbar-search .search-query:hover:-moz-placeholder{color:#eeeeee;} .navbar-inverse .navbar-search .search-query:-ms-input-placeholder,.navbar-inverse .navbar-search .search-query:hover:-ms-input-placeholder{color:#eeeeee;} .navbar-inverse .navbar-search .search-query::-webkit-input-placeholder,.navbar-inverse .navbar-search .search-query:hover::-webkit-input-placeholder{color:#eeeeee;} -@media (max-width:979px){.navbar .nav-collapse .nav li>a:hover{background-color:#558bc4;color:#ffffff;text-shadow:none;} .navbar .nav-collapse .navbar-search{border-top:none;border-bottom:none;} .navbar-inverse .nav-collapse .nav li>a{color:#eeeeee;}.navbar-inverse .nav-collapse .nav li>a:hover{background-color:#558bc4 !important;} .navbar-inverse .nav-collapse .nav-header{color:#eeeeee;}}div.subnav .nav>li>a{color:#2d2d2d;}div.subnav .nav>li>a:hover{color:#558bc4;} -div.subnav .nav>li.active>a{color:#2d2d2d;}div.subnav .nav>li.active>a:hover{color:#2d2d2d;} +@media (max-width:979px){.navbar .nav-collapse .nav li>a:hover{background-color:#0099dd;color:#ffffff;text-shadow:none;} .navbar .nav-collapse .navbar-search{border-top:none;border-bottom:none;} .navbar-inverse .nav-collapse .nav li>a{color:#eeeeee;}.navbar-inverse .nav-collapse .nav li>a:hover{background-color:#0099dd !important;} .navbar-inverse .nav-collapse .nav-header{color:#eeeeee;}}div.subnav .nav>li>a{color:#666666;}div.subnav .nav>li>a:hover{color:#000000;} +div.subnav .nav>li.active>a{color:#666666;}div.subnav .nav>li.active>a:hover{color:#666666;} div.subnav .nav>li.dropdown>.dropdown-toggle{background-color:transparent;} -div.subnav .nav>li.dropdown.open>.dropdown-toggle{border-left:1px solid whiteSmoke;border-right:1px solid #E5E5E5;color:#2d2d2d;}div.subnav .nav>li.dropdown.open>.dropdown-toggle:hover{color:#558bc4;} -.nav>li.dropdown>.dropdown-toggle .caret,.nav>li.dropdown.active>.dropdown-toggle .caret,.nav>li.dropdown.open>.dropdown-toggle .caret,.nav>li.dropdown.open.active>.dropdown-toggle .caret{border-top:4px solid #2d2d2d;border-top-color:#2d2d2d;opacity:1;} -.nav>li.dropdown>.dropdown-toggle:hover .caret,.nav>li.dropdown.active>.dropdown-toggle:hover .caret,.nav>li.dropdown.open>.dropdown-toggle:hover .caret,.nav>li.dropdown.open.active>.dropdown-toggle:hover .caret{border-top:4px solid #558bc4;border-top-color:#558bc4;} -.btn-info,.btn-info:hover,.btn-info.disabled{color:#2d2d2d;text-shadow:0 1px 0 rgba(255, 255, 255, 0.3);}.btn-info .caret,.btn-info:hover .caret,.btn-info.disabled .caret{border-top-color:#2d2d2d;border-bottom-color:#2d2d2d;} +div.subnav .nav>li.dropdown.open>.dropdown-toggle{border-left:1px solid whiteSmoke;border-right:1px solid #E5E5E5;color:#666666;}div.subnav .nav>li.dropdown.open>.dropdown-toggle:hover{color:#0099dd;} +.nav>li.dropdown>.dropdown-toggle .caret,.nav>li.dropdown.active>.dropdown-toggle .caret,.nav>li.dropdown.open>.dropdown-toggle .caret,.nav>li.dropdown.open.active>.dropdown-toggle .caret{border-top:4px solid #666666;border-top-color:#666666;opacity:1;} +.nav>li.dropdown>.dropdown-toggle:hover .caret,.nav>li.dropdown.active>.dropdown-toggle:hover .caret,.nav>li.dropdown.open>.dropdown-toggle:hover .caret,.nav>li.dropdown.open.active>.dropdown-toggle:hover .caret{border-top:4px solid #0099dd;border-top-color:#0099dd;} .control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#e29235;} .control-group.warning .checkbox,.control-group.warning .radio,.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#e29235;} .control-group.warning input,.control-group.warning select,.control-group.warning textarea{border-color:#e29235;-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:#c7781d;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #efc28e;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #efc28e;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #efc28e;} @@ -867,14 +866,14 @@ div.subnav .nav>li.dropdown.open>.dropdown-toggle{border-left:1px solid whiteSmo .control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#2ba949;} .control-group.success .checkbox,.control-group.success .radio,.control-group.success input,.control-group.success select,.control-group.success textarea{color:#2ba949;} .control-group.success input,.control-group.success select,.control-group.success textarea{border-color:#2ba949;-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.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#218037;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #63d77e;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #63d77e;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #63d77e;} -.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#2ba949;background-color:#819e37;border-color:#2ba949;} -.alert{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} +.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#2ba949;background-color:#3cb521;border-color:#2ba949;} +.alert{text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.alert h1,.alert h2,.alert h3,.alert h4,.alert h5,.alert h6{color:#ffffff;font-weight:bold;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} .label,.badge{padding-top:4px;}.label-important,.badge-important{background-color:#cd0200;} .label-warning,.badge-warning{background-color:#d47500;} -.label-success,.badge-success{background-color:#819e37;} +.label-success,.badge-success{background-color:#3cb521;} .label-info,.badge-info{background-color:#3399f3;} -.well{background-color:#eeeeee;} -.hero-unit{-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);border:1px solid rgba(0, 0, 0, 0.05);} +.well{-webkit-box-shadow:inset 1px 1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 1px 1px 0 rgba(0, 0, 0, 0.1);box-shadow:inset 1px 1px 0 rgba(0, 0, 0, 0.1);} +.hero-unit{-webkit-box-shadow:inset 1px 1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 1px 1px 0 rgba(0, 0, 0, 0.1);box-shadow:inset 1px 1px 0 rgba(0, 0, 0, 0.1);border:1px solid rgba(0, 0, 0, 0.1);} .pull-right{float:right;} .pull-left{float:left;} .hide{display:none;} diff --git a/spacelab/bootswatch.less b/spacelab/bootswatch.less index f70589c..01a2ed4 100755 --- a/spacelab/bootswatch.less +++ b/spacelab/bootswatch.less @@ -6,7 +6,7 @@ // TYPOGRAPHY // ----------------------------------------------------- -@import url('http://fonts.googleapis.com/css?family=Muli'); +@import url('http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700'); // SCAFFOLDING // ----------------------------------------------------- @@ -17,8 +17,7 @@ .navbar { .navbar-inner { - border-bottom: 1px solid #CACACA; - .box-shadow(0 1px 0 rgba(255,255,255,0.4)~", "0 0 10px rgba(0,0,0,0.1)); + .box-shadow(0 1px 0 rgba(255,255,255,0.4)~", "0 1px 0 rgba(0,0,0,0.8)); } .brand { @@ -26,19 +25,18 @@ text-shadow: 0 1px 0 rgba(255, 255, 255, 0.3); &:hover { - color: @linkColor; + color: @navbarLinkColorHover; } } .nav > li > a { - padding: 11px 10px 9px; + padding: 11px 10px 8px; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.3); } .navbar-text { - margin-top: 2px; - padding: 0 10px; - line-height: 38px; + padding: 11px 10px 8px; + line-height: inherit; } .navbar-search .search-query, @@ -122,10 +120,10 @@ div.subnav { .nav > li > a { - color: @textColor; + color: @navbarLinkColor; &:hover { - color: @linkColor; + color: @navbarLinkColorHover; } } @@ -177,63 +175,6 @@ div.subnav { // BUTTONS // ----------------------------------------------------- -.btn { - - - &-info, - &-info:hover, - &-info.disabled { - - color: @textColor; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.3); - - .caret { - border-top-color: @textColor; - border-bottom-color: @textColor; - } - } - -} - -/*.btn { - .buttonBackground(#F4F4F4, #ECECEC); - color: @textColor; - text-shadow: none; - - - &:hover, - &:active, - &.active, - &.disabled, - &[disabled] { - color: @grayDark; - } -} - -.btn-primary { - .buttonBackground(#909090, #3F3F3F); -} - -.btn-warning { - .buttonBackground(lighten(@yellow, 15%), @yellow); -} - -.btn-danger { - .buttonBackground(lighten(#DA2D2D, 15%), #DA2D2D); -} - -.btn-success { - .buttonBackground(#8ADD6D, #60B044); -} - -.btn-info { - .buttonBackground(lighten(#4488BB, 15%), #4488BB); -} - -.btn-inverse { - .buttonBackground(lighten(@purple, 5%), @purple); -}*/ - // TABLES // ----------------------------------------------------- @@ -259,8 +200,14 @@ div.subnav { // ----------------------------------------------------- .alert { - color: @white; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + + h1, h2, h3, h4, h5, h6 { + color: @white; + font-weight: bold; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + } } .label, .badge { @@ -288,12 +235,12 @@ div.subnav { // ----------------------------------------------------- .well { - background-color: @grayLighter; + .box-shadow(inset 1px 1px 0 rgba(0,0,0,.1)); } .hero-unit { - .box-shadow(inset 0 1px 1px rgba(0,0,0,.05)); - border: 1px solid rgba(0,0,0,.05); + .box-shadow(inset 1px 1px 0 rgba(0,0,0,.1)); + border: 1px solid rgba(0,0,0,.1); } // MEDIA QUERIES diff --git a/spacelab/variables.less b/spacelab/variables.less index 35ad4ab..502b214 100755 --- a/spacelab/variables.less +++ b/spacelab/variables.less @@ -11,8 +11,8 @@ // ------------------------- @black: #000; @grayDarker: #2D2D2D; -@grayDark: #333; -@gray: #777; +@grayDark: #434848; +@gray: #666; @grayLight: #bbb; @grayLighter: #eee; @white: #fff; @@ -22,7 +22,7 @@ // ------------------------- @blue: #3399F3; @blueDark: #405A6A; -@green: #819E37; +@green: #3CB521; @red: #CD0200; @yellow: #F4CA00; @orange: #D47500; @@ -33,29 +33,29 @@ // Scaffolding // ------------------------- @bodyBackground: @white; -@textColor: @grayDarker; +@textColor: @gray; // Links // ------------------------- -@linkColor: #558BC4; +@linkColor: #09d; @linkColorHover: @linkColor; // Typography // ------------------------- -@sansFontFamily: "Muli", "Helvetica Neue", Helvetica, Arial, sans-serif; +@sansFontFamily: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; @serifFontFamily: Georgia, "Times New Roman", Times, serif; @monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace; -@baseFontSize: 14px; +@baseFontSize: 15px; @baseFontFamily: @sansFontFamily; @baseLineHeight: 21px; @altFontFamily: @serifFontFamily; @headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily @headingsFontWeight: normal; // instead of browser default, bold -@headingsColor: inherit; // empty to use BS default, @textColor +@headingsColor: @grayDarker; // empty to use BS default, @textColor // Component sizing @@ -88,19 +88,19 @@ @btnBackgroundHighlight: @grayLighter; @btnBorder: darken(@btnBackground, 20%); -@btnPrimaryBackground: lighten(@linkColor, 15%); +@btnPrimaryBackground: lighten(@linkColor, 10%); @btnPrimaryBackgroundHighlight: @linkColor; -@btnInfoBackground: lighten(@grayLight, 15%); -@btnInfoBackgroundHighlight: @grayLight; +@btnInfoBackground: lighten(#3A5D83, 10%); +@btnInfoBackgroundHighlight: #3A5D83; -@btnSuccessBackground: lighten(@green, 15%); +@btnSuccessBackground: lighten(@green, 10%); @btnSuccessBackgroundHighlight: @green; -@btnWarningBackground: lighten(@orange, 15%); +@btnWarningBackground: lighten(@orange, 10%); @btnWarningBackgroundHighlight: @orange; -@btnDangerBackground: lighten(@red, 15%); +@btnDangerBackground: lighten(@red, 10%); @btnDangerBackgroundHighlight: @red; @btnInverseBackground: lighten(@navbarInverseBackground, 15%); @@ -172,7 +172,7 @@ // Wells // ------------------------- -@wellBackground: #f5f5f5; +@wellBackground: @grayLighter; // Navbar @@ -181,18 +181,18 @@ @navbarCollapseDesktopWidth: @navbarCollapseWidth + 1; @navbarHeight: 40px; -@navbarBackgroundHighlight: #eee; -@navbarBackground: @grayLight; -@navbarBorder: darken(@navbarBackground, 5%); +@navbarBackgroundHighlight: @grayLighter; +@navbarBackground: lighten(@grayLight, 5%); +@navbarBorder: @grayLight; @navbarText: @textColor; @navbarLinkColor: @textColor; -@navbarLinkColorHover: @linkColor; -@navbarLinkColorActive: @textColor; +@navbarLinkColorHover: @black; +@navbarLinkColorActive: @black; @navbarLinkBackgroundHover: transparent; @navbarLinkBackgroundActive: transparent; -@navbarBrandColor: @grayDark; +@navbarBrandColor: @navbarLinkColor; // Inverted navbar @navbarInverseBackground: #6C737E; @@ -224,7 +224,7 @@ // Hero unit // ------------------------- @heroUnitBackground: @grayLighter; -@heroUnitHeadingColor: inherit; +@heroUnitHeadingColor: @headingsColor; @heroUnitLeadColor: inherit; -- 2.39.2