From 05491d09bf1943330acb2702f2966139b029f3e1 Mon Sep 17 00:00:00 2001 From: Thomas Park Date: Tue, 28 Aug 2012 18:01:49 -0400 Subject: spacelab: new type and colors to differentiate more from default --- spacelab/bootstrap.css | 1036 ++++++++++++++++++-------------------------- spacelab/bootstrap.min.css | 380 ++++++++-------- spacelab/bootswatch.less | 55 ++- spacelab/variables.less | 76 ++-- 4 files changed, 693 insertions(+), 854 deletions(-) (limited to 'spacelab') diff --git a/spacelab/bootstrap.css b/spacelab/bootstrap.css index 7a7b092c..4992a018 100644 --- a/spacelab/bootstrap.css +++ b/spacelab/bootstrap.css @@ -1,3 +1,4 @@ +@import url('http://fonts.googleapis.com/css?family=Muli'); /*! * Bootstrap v2.1.0 * @@ -134,18 +135,18 @@ textarea { } body { margin: 0; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Muli", "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 14px; - line-height: 20px; - color: #333333; + line-height: 21px; + color: #2d2d2d; background-color: #ffffff; } a { - color: #4183c4; + color: #6c737e; text-decoration: none; } a:hover { - color: #4183c4; + color: #6c737e; text-decoration: underline; } .img-rounded { @@ -470,13 +471,13 @@ a:hover { clear: both; } p { - margin: 0 0 10px; + margin: 0 0 10.5px; } .lead { - margin-bottom: 20px; + margin-bottom: 21px; font-size: 20px; font-weight: 200; - line-height: 30px; + line-height: 31.5px; } small { font-size: 85%; @@ -491,7 +492,7 @@ cite { font-style: normal; } .muted { - color: #999999; + color: #bbbbbb; } h1, h2, @@ -499,9 +500,9 @@ h3, h4, h5, h6 { - margin: 10px 0; + margin: 10.5px 0; font-family: inherit; - font-weight: bold; + font-weight: normal; line-height: 1; color: inherit; text-rendering: optimizelegibility; @@ -514,7 +515,7 @@ h5 small, h6 small { font-weight: normal; line-height: 1; - color: #999999; + color: #bbbbbb; } h1 { font-size: 36px; @@ -553,14 +554,14 @@ h4 small { font-size: 14px; } .page-header { - padding-bottom: 9px; - margin: 20px 0 30px; - border-bottom: 1px solid #dddddd; + padding-bottom: 9.5px; + margin: 21px 0 31.5px; + border-bottom: 1px solid #eeeeee; } ul, ol { padding: 0; - margin: 0 0 10px 25px; + margin: 0 0 10.5px 25px; } ul ul, ul ol, @@ -569,7 +570,7 @@ ol ul { margin-bottom: 0; } li { - line-height: 20px; + line-height: 21px; } ul.unstyled, ol.unstyled { @@ -577,17 +578,17 @@ ol.unstyled { list-style: none; } dl { - margin-bottom: 20px; + margin-bottom: 21px; } dt, dd { - line-height: 20px; + line-height: 21px; } dt { font-weight: bold; } dd { - margin-left: 10px; + margin-left: 10.5px; } .dl-horizontal dt { float: left; @@ -602,14 +603,14 @@ dd { margin-left: 130px; } hr { - margin: 20px 0; + margin: 21px 0; border: 0; - border-top: 1px solid #dddddd; + border-top: 1px solid #eeeeee; border-bottom: 1px solid #ffffff; } abbr[title] { cursor: help; - border-bottom: 1px dotted #999999; + border-bottom: 1px dotted #bbbbbb; } abbr.initialism { font-size: 90%; @@ -617,19 +618,19 @@ abbr.initialism { } blockquote { padding: 0 0 0 15px; - margin: 0 0 20px; - border-left: 5px solid #dddddd; + margin: 0 0 21px; + border-left: 5px solid #eeeeee; } blockquote p { margin-bottom: 0; font-size: 16px; font-weight: 300; - line-height: 25px; + line-height: 26.25px; } blockquote small { display: block; - line-height: 20px; - color: #999999; + line-height: 21px; + color: #bbbbbb; } blockquote small:before { content: '\2014 \00A0'; @@ -638,7 +639,7 @@ blockquote.pull-right { float: right; padding-right: 15px; padding-left: 0; - border-right: 5px solid #dddddd; + border-right: 5px solid #eeeeee; border-left: 0; } blockquote.pull-right p, @@ -659,9 +660,9 @@ blockquote:after { } address { display: block; - margin-bottom: 20px; + margin-bottom: 21px; font-style: normal; - line-height: 20px; + line-height: 21px; } code, pre { @@ -681,10 +682,10 @@ code { } pre { display: block; - padding: 9.5px; - margin: 0 0 10px; + padding: 10px; + margin: 0 0 10.5px; font-size: 13px; - line-height: 20px; + line-height: 21px; word-break: break-all; word-wrap: break-word; white-space: pre; @@ -697,7 +698,7 @@ pre { border-radius: 4px; } pre.prettyprint { - margin-bottom: 20px; + margin-bottom: 21px; } pre code { padding: 0; @@ -710,7 +711,7 @@ pre code { overflow-y: scroll; } form { - margin: 0 0 20px; + margin: 0 0 21px; } fieldset { padding: 0; @@ -721,16 +722,16 @@ legend { display: block; width: 100%; padding: 0; - margin-bottom: 20px; + margin-bottom: 21px; font-size: 21px; - line-height: 40px; + line-height: 42px; color: #333333; border: 0; border-bottom: 1px solid #e5e5e5; } legend small { - font-size: 15px; - color: #999999; + font-size: 15.75px; + color: #bbbbbb; } label, input, @@ -739,13 +740,13 @@ select, textarea { font-size: 14px; font-weight: normal; - line-height: 20px; + line-height: 21px; } input, button, select, textarea { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Muli", "Helvetica Neue", Helvetica, Arial, sans-serif; } label { display: block; @@ -769,12 +770,12 @@ input[type="tel"], input[type="color"], .uneditable-input { display: inline-block; - height: 20px; + height: 21px; padding: 4px 6px; margin-bottom: 9px; font-size: 14px; - line-height: 20px; - color: #555555; + line-height: 21px; + color: #777777; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; @@ -887,7 +888,7 @@ input[type="checkbox"]:focus { } .uneditable-input, .uneditable-textarea { - color: #999999; + color: #bbbbbb; background-color: #fcfcfc; border-color: #cccccc; -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); @@ -905,15 +906,15 @@ input[type="checkbox"]:focus { } input:-moz-placeholder, textarea:-moz-placeholder { - color: #999999; + color: #bbbbbb; } input:-ms-input-placeholder, textarea:-ms-input-placeholder { - color: #999999; + color: #bbbbbb; } input::-webkit-input-placeholder, textarea::-webkit-input-placeholder { - color: #999999; + color: #bbbbbb; } .radio, .checkbox { @@ -1047,7 +1048,7 @@ input[readonly], select[readonly], textarea[readonly] { cursor: not-allowed; - background-color: #dddddd; + background-color: #eeeeee; } input[type="radio"][disabled], input[type="checkbox"][disabled], @@ -1058,15 +1059,15 @@ input[type="checkbox"][readonly] { .control-group.warning > label, .control-group.warning .help-block, .control-group.warning .help-inline { - color: #393939; + color: #ffffff; } .control-group.warning .checkbox, .control-group.warning .radio, .control-group.warning input, .control-group.warning select, .control-group.warning textarea { - color: #393939; - border-color: #393939; + color: #ffffff; + 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); @@ -1076,29 +1077,29 @@ input[type="checkbox"][readonly] { .control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus { - border-color: #202020; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #6c6c6c; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #6c6c6c; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #6c6c6c; + border-color: #e6e6e6; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff; } .control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on { - color: #393939; - background-color: #f5f3b4; - border-color: #393939; + color: #ffffff; + background-color: #d47500; + border-color: #ffffff; } .control-group.error > label, .control-group.error .help-block, .control-group.error .help-inline { - color: #393939; + color: #ffffff; } .control-group.error .checkbox, .control-group.error .radio, .control-group.error input, .control-group.error select, .control-group.error textarea { - color: #393939; - border-color: #393939; + color: #ffffff; + 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); @@ -1108,29 +1109,29 @@ input[type="checkbox"][readonly] { .control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus { - border-color: #202020; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #6c6c6c; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #6c6c6c; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #6c6c6c; + 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.error .input-prepend .add-on, .control-group.error .input-append .add-on { - color: #393939; - background-color: #ffe9e9; - border-color: #393939; + color: #ffffff; + background-color: #cd0200; + border-color: #ffffff; } .control-group.success > label, .control-group.success .help-block, .control-group.success .help-inline { - color: #333333; + color: #ffffff; } .control-group.success .checkbox, .control-group.success .radio, .control-group.success input, .control-group.success select, .control-group.success textarea { - color: #333333; - border-color: #333333; + color: #ffffff; + 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); @@ -1140,16 +1141,16 @@ input[type="checkbox"][readonly] { .control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus { - border-color: #1a1a1a; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #666666; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #666666; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #666666; + 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: #333333; - background-color: #bedebe; - border-color: #333333; + color: #ffffff; + background-color: #819e37; + border-color: #ffffff; } input:focus:required:invalid, textarea:focus:required:invalid, @@ -1166,9 +1167,9 @@ select:focus:required:invalid:focus { box-shadow: 0 0 6px #f8b9b7; } .form-actions { - padding: 19px 20px 20px; - margin-top: 20px; - margin-bottom: 20px; + padding: 20px 20px 21px; + margin-top: 21px; + margin-bottom: 21px; background-color: #f5f5f5; border-top: 1px solid #e5e5e5; *zoom: 1; @@ -1184,11 +1185,11 @@ select:focus:required:invalid:focus { } .help-block, .help-inline { - color: #595959; + color: #535353; } .help-block { display: block; - margin-bottom: 10px; + margin-bottom: 10.5px; } .help-inline { display: inline-block; @@ -1232,15 +1233,15 @@ select:focus:required:invalid:focus { .input-prepend .add-on { display: inline-block; width: auto; - height: 20px; + height: 21px; min-width: 16px; padding: 4px 5px; font-size: 14px; font-weight: normal; - line-height: 20px; + line-height: 21px; text-align: center; text-shadow: 0 1px 0 #ffffff; - background-color: #dddddd; + background-color: #eeeeee; border: 1px solid #ccc; } .input-append .add-on, @@ -1255,8 +1256,8 @@ select:focus:required:invalid:focus { } .input-append .active, .input-prepend .active { - background-color: #fafefa; - border-color: #84de81; + background-color: #c6da94; + border-color: #819e37; } .input-prepend .add-on, .input-prepend .btn { @@ -1404,14 +1405,14 @@ input.search-query { margin-left: 0; } .control-group { - margin-bottom: 10px; + margin-bottom: 10.5px; } legend + .control-group { - margin-top: 20px; + margin-top: 21px; -webkit-margin-top-collapse: separate; } .form-horizontal .control-group { - margin-bottom: 20px; + margin-bottom: 21px; *zoom: 1; } .form-horizontal .control-group:before, @@ -1439,7 +1440,7 @@ legend + .control-group { *padding-left: 160px; } .form-horizontal .help-block { - margin-top: 10px; + margin-top: 10.5px; margin-bottom: 0; } .form-horizontal .form-actions { @@ -1453,12 +1454,12 @@ table { } .table { width: 100%; - margin-bottom: 20px; + margin-bottom: 21px; } .table th, .table td { padding: 8px; - line-height: 20px; + line-height: 21px; text-align: left; vertical-align: top; border-top: 1px solid #dddddd; @@ -1688,13 +1689,13 @@ table .span24 { margin-left: 0; } .table tbody tr.success td { - background-color: #bedebe; + background-color: #819e37; } .table tbody tr.error td { - background-color: #ffe9e9; + background-color: #cd0200; } .table tbody tr.info td { - background-color: #e4f0ff; + background-color: #3399f3; } [class^="icon-"], [class*=" icon-"] { @@ -2199,7 +2200,7 @@ table .span24 { .dropdown-menu .divider { *width: 100%; height: 1px; - margin: 9px 1px; + margin: 9.5px 1px; *margin: -5px 0 5px; overflow: hidden; background-color: #e5e5e5; @@ -2210,8 +2211,8 @@ table .span24 { padding: 3px 20px; clear: both; font-weight: normal; - line-height: 20px; - color: #333333; + line-height: 21px; + color: #2d2d2d; white-space: nowrap; } .dropdown-menu li > a:hover, @@ -2219,34 +2220,34 @@ table .span24 { .dropdown-submenu:hover > a { text-decoration: none; color: #ffffff; - background-color: #4183c4; - background-color: #3d7ebd; - background-image: -moz-linear-gradient(top, #4183c4, #3876b4); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#4183c4), to(#3876b4)); - background-image: -webkit-linear-gradient(top, #4183c4, #3876b4); - background-image: -o-linear-gradient(top, #4183c4, #3876b4); - background-image: linear-gradient(to bottom, #4183c4, #3876b4); + background-color: #6c737e; + background-color: #676e79; + background-image: -moz-linear-gradient(top, #6c737e, #606670); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#6c737e), to(#606670)); + background-image: -webkit-linear-gradient(top, #6c737e, #606670); + background-image: -o-linear-gradient(top, #6c737e, #606670); + background-image: linear-gradient(to bottom, #6c737e, #606670); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff4183c4', endColorstr='#ff3876b4', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff6c737e', endColorstr='#ff606670', GradientType=0); } .dropdown-menu .active > a, .dropdown-menu .active > a:hover { color: #ffffff; text-decoration: none; outline: 0; - background-color: #4183c4; - background-color: #3d7ebd; - background-image: -moz-linear-gradient(top, #4183c4, #3876b4); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#4183c4), to(#3876b4)); - background-image: -webkit-linear-gradient(top, #4183c4, #3876b4); - background-image: -o-linear-gradient(top, #4183c4, #3876b4); - background-image: linear-gradient(to bottom, #4183c4, #3876b4); + background-color: #6c737e; + background-color: #676e79; + background-image: -moz-linear-gradient(top, #6c737e, #606670); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#6c737e), to(#606670)); + background-image: -webkit-linear-gradient(top, #6c737e, #606670); + background-image: -o-linear-gradient(top, #6c737e, #606670); + background-image: linear-gradient(to bottom, #6c737e, #606670); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff4183c4', endColorstr='#ff3876b4', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff6c737e', endColorstr='#ff606670', GradientType=0); } .dropdown-menu .disabled > a, .dropdown-menu .disabled > a:hover { - color: #999999; + color: #bbbbbb; } .dropdown-menu .disabled > a:hover { text-decoration: none; @@ -2372,7 +2373,7 @@ table .span24 { float: right; font-size: 20px; font-weight: bold; - line-height: 20px; + line-height: 21px; color: #000000; text-shadow: 0 1px 0 #ffffff; opacity: 0.2; @@ -2401,24 +2402,24 @@ button.close { padding: 4px 14px; margin-bottom: 0; font-size: 14px; - line-height: 20px; - *line-height: 20px; + line-height: 21px; + *line-height: 21px; text-align: center; vertical-align: middle; cursor: pointer; color: #333333; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - background-color: #f5f5f5; - background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); - background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); + background-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='#ffe6e6e6', GradientType=0); - border-color: #e6e6e6 #e6e6e6 #bfbfbf; + 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: #e6e6e6; + *background-color: #eeeeee; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2439,12 +2440,12 @@ button.close { .btn.disabled, .btn[disabled] { color: #333333; - background-color: #e6e6e6; - *background-color: #d9d9d9; + background-color: #eeeeee; + *background-color: #e1e1e1; } .btn:active, .btn.active { - background-color: #cccccc \9; + background-color: #d5d5d5 \9; } .btn:first-child { *margin-left: 0; @@ -2502,7 +2503,7 @@ button.close { .btn-small { padding: 3px 9px; font-size: 12px; - line-height: 18px; + line-height: 19px; } .btn-small [class^="icon-"] { margin-top: 0; @@ -2510,7 +2511,7 @@ button.close { .btn-mini { padding: 2px 6px; font-size: 11px; - line-height: 16px; + line-height: 17px; } .btn-block { display: block; @@ -2539,17 +2540,17 @@ button.close { .btn-primary { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #4176c4; - background-image: -moz-linear-gradient(top, #4183c4, #4162c4); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#4183c4), to(#4162c4)); - background-image: -webkit-linear-gradient(top, #4183c4, #4162c4); - background-image: -o-linear-gradient(top, #4183c4, #4162c4); - background-image: linear-gradient(to bottom, #4183c4, #4162c4); + 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='#ff4183c4', endColorstr='#ff4162c4', GradientType=0); - border-color: #4162c4 #4162c4 #2c448d; + 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: #4162c4; + *background-color: #6c737e; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2560,27 +2561,27 @@ button.close { .btn-primary.disabled, .btn-primary[disabled] { color: #ffffff; - background-color: #4162c4; - *background-color: #3857b4; + background-color: #6c737e; + *background-color: #606670; } .btn-primary:active, .btn-primary.active { - background-color: #324ea0 \9; + background-color: #545a63 \9; } .btn-warning { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #ff942e; - background-image: -moz-linear-gradient(top, #ffa44d, #ff7d00); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffa44d), to(#ff7d00)); - background-image: -webkit-linear-gradient(top, #ffa44d, #ff7d00); - background-image: -o-linear-gradient(top, #ffa44d, #ff7d00); - background-image: linear-gradient(to bottom, #ffa44d, #ff7d00); + 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='#ffffa44d', endColorstr='#ffff7d00', GradientType=0); - border-color: #ff7d00 #ff7d00 #b35800; + 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: #ff7d00; + *background-color: #d47500; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2591,27 +2592,27 @@ button.close { .btn-warning.disabled, .btn-warning[disabled] { color: #ffffff; - background-color: #ff7d00; - *background-color: #e67100; + background-color: #d47500; + *background-color: #bb6700; } .btn-warning:active, .btn-warning.active { - background-color: #cc6400 \9; + background-color: #a15900 \9; } .btn-danger { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #da4f49; - background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); - background-image: linear-gradient(to bottom, #ee5f5b, #bd362f); + background-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='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0); - border-color: #bd362f #bd362f #802420; + 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: #bd362f; + *background-color: #cd0200; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2622,27 +2623,27 @@ button.close { .btn-danger.disabled, .btn-danger[disabled] { color: #ffffff; - background-color: #bd362f; - *background-color: #a9302a; + background-color: #cd0200; + *background-color: #b40200; } .btn-danger:active, .btn-danger.active { - background-color: #942a25 \9; + background-color: #9a0200 \9; } .btn-success { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #5bb75b; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); - background-image: -webkit-linear-gradient(top, #62c462, #51a351); - background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(to bottom, #62c462, #51a351); + background-color: #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='#ff62c462', endColorstr='#ff51a351', GradientType=0); - border-color: #51a351 #51a351 #387038; + 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: #51a351; + *background-color: #819e37; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2653,27 +2654,27 @@ button.close { .btn-success.disabled, .btn-success[disabled] { color: #ffffff; - background-color: #51a351; - *background-color: #499249; + background-color: #819e37; + *background-color: #728b30; } .btn-success:active, .btn-success.active { - background-color: #408140 \9; + background-color: #62782a \9; } .btn-info { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #49afcd; - background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); - background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); - background-image: linear-gradient(to bottom, #5bc0de, #2f96b4); + background-color: #5eaff6; + background-image: -moz-linear-gradient(top, #7bbdf7, #3399f3); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#7bbdf7), to(#3399f3)); + background-image: -webkit-linear-gradient(top, #7bbdf7, #3399f3); + background-image: -o-linear-gradient(top, #7bbdf7, #3399f3); + background-image: linear-gradient(to bottom, #7bbdf7, #3399f3); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0); - border-color: #2f96b4 #2f96b4 #1f6377; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff7bbdf7', endColorstr='#ff3399f3', GradientType=0); + border-color: #3399f3 #3399f3 #0c73cd; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #2f96b4; + *background-color: #3399f3; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2684,27 +2685,27 @@ button.close { .btn-info.disabled, .btn-info[disabled] { color: #ffffff; - background-color: #2f96b4; - *background-color: #2a85a0; + background-color: #3399f3; + *background-color: #1b8df2; } .btn-info:active, .btn-info.active { - background-color: #24748c \9; + background-color: #0e80e5 \9; } .btn-inverse { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #414141; - background-image: -moz-linear-gradient(top, #555555, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); - background-image: -webkit-linear-gradient(top, #555555, #222222); - background-image: -o-linear-gradient(top, #555555, #222222); - background-image: linear-gradient(to bottom, #555555, #222222); + background-color: #444444; + background-image: -moz-linear-gradient(top, #535353, #2d2d2d); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#535353), to(#2d2d2d)); + background-image: -webkit-linear-gradient(top, #535353, #2d2d2d); + background-image: -o-linear-gradient(top, #535353, #2d2d2d); + background-image: linear-gradient(to bottom, #535353, #2d2d2d); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff555555', endColorstr='#ff222222', GradientType=0); - border-color: #222222 #222222 #000000; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff535353', endColorstr='#ff2d2d2d', GradientType=0); + border-color: #2d2d2d #2d2d2d #070707; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #222222; + *background-color: #2d2d2d; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2715,12 +2716,12 @@ button.close { .btn-inverse.disabled, .btn-inverse[disabled] { color: #ffffff; - background-color: #222222; - *background-color: #151515; + background-color: #2d2d2d; + *background-color: #202020; } .btn-inverse:active, .btn-inverse.active { - background-color: #080808 \9; + background-color: #141414 \9; } button.btn, input[type="submit"].btn { @@ -2758,13 +2759,13 @@ input[type="submit"].btn.btn-mini { .btn-link { border-color: transparent; cursor: pointer; - color: #4183c4; + color: #6c737e; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; } .btn-link:hover { - color: #4183c4; + color: #6c737e; text-decoration: underline; background-color: transparent; } @@ -2782,8 +2783,8 @@ input[type="submit"].btn.btn-mini { } .btn-toolbar { font-size: 0; - margin-top: 10px; - margin-bottom: 10px; + margin-top: 10.5px; + margin-bottom: 10.5px; } .btn-toolbar .btn-group { display: inline-block; @@ -2897,25 +2898,25 @@ input[type="submit"].btn.btn-mini { box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); } .btn-group.open .btn.dropdown-toggle { - background-color: #e6e6e6; + background-color: #eeeeee; } .btn-group.open .btn-primary.dropdown-toggle { - background-color: #4162c4; + background-color: #6c737e; } .btn-group.open .btn-warning.dropdown-toggle { - background-color: #ff7d00; + background-color: #d47500; } .btn-group.open .btn-danger.dropdown-toggle { - background-color: #bd362f; + background-color: #cd0200; } .btn-group.open .btn-success.dropdown-toggle { - background-color: #51a351; + background-color: #819e37; } .btn-group.open .btn-info.dropdown-toggle { - background-color: #2f96b4; + background-color: #3399f3; } .btn-group.open .btn-inverse.dropdown-toggle { - background-color: #222222; + background-color: #2d2d2d; } .btn .caret { margin-top: 8px; @@ -2985,14 +2986,14 @@ input[type="submit"].btn.btn-mini { } .alert { padding: 8px 35px 8px 14px; - margin-bottom: 20px; + margin-bottom: 21px; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - background-color: #f5f3b4; - border: 1px solid #f3e4a7; + background-color: #d47500; + border: 1px solid #c54c00; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - color: #393939; + color: #ffffff; } .alert h4 { margin: 0; @@ -3001,23 +3002,23 @@ input[type="submit"].btn.btn-mini { position: relative; top: -2px; right: -21px; - line-height: 20px; + line-height: 21px; } .alert-success { - background-color: #bedebe; - border-color: #b4d5ad; - color: #333333; + background-color: #819e37; + border-color: #818b30; + color: #ffffff; } .alert-danger, .alert-error { - background-color: #ffe9e9; - border-color: #ffdae0; - color: #393939; + background-color: #cd0200; + border-color: #be001e; + color: #ffffff; } .alert-info { - background-color: #e4f0ff; - border-color: #c0e7ff; - color: #1b3650; + background-color: #3399f3; + border-color: #11adf1; + color: #ffffff; } .alert-block { padding-top: 14px; @@ -3032,7 +3033,7 @@ input[type="submit"].btn.btn-mini { } .nav { margin-left: 0; - margin-bottom: 20px; + margin-bottom: 21px; list-style: none; } .nav > li > a { @@ -3040,7 +3041,7 @@ input[type="submit"].btn.btn-mini { } .nav > li > a:hover { text-decoration: none; - background-color: #dddddd; + background-color: #eeeeee; } .nav > .pull-right { float: right; @@ -3050,8 +3051,8 @@ input[type="submit"].btn.btn-mini { padding: 3px 15px; font-size: 11px; font-weight: bold; - line-height: 20px; - color: #999999; + line-height: 21px; + color: #bbbbbb; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); text-transform: uppercase; } @@ -3076,7 +3077,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: #4183c4; + background-color: #6c737e; } .nav-list [class^="icon-"] { margin-right: 2px; @@ -3084,7 +3085,7 @@ input[type="submit"].btn.btn-mini { .nav-list .divider { *width: 100%; height: 1px; - margin: 9px 1px; + margin: 9.5px 1px; *margin: -5px 0 5px; overflow: hidden; background-color: #e5e5e5; @@ -3126,18 +3127,18 @@ input[type="submit"].btn.btn-mini { .nav-tabs > li > a { padding-top: 8px; padding-bottom: 8px; - line-height: 20px; + 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: #dddddd #dddddd #dddddd; + border-color: #eeeeee #eeeeee #dddddd; } .nav-tabs > .active > a, .nav-tabs > .active > a:hover { - color: #555555; + color: #777777; background-color: #ffffff; border: 1px solid #ddd; border-bottom-color: transparent; @@ -3155,7 +3156,7 @@ input[type="submit"].btn.btn-mini { .nav-pills > .active > a, .nav-pills > .active > a:hover { color: #ffffff; - background-color: #4183c4; + background-color: #6c737e; } .nav-stacked > li { float: none; @@ -3209,13 +3210,13 @@ input[type="submit"].btn.btn-mini { border-radius: 6px; } .nav .dropdown-toggle .caret { - border-top-color: #4183c4; - border-bottom-color: #4183c4; + border-top-color: #6c737e; + border-bottom-color: #6c737e; margin-top: 6px; } .nav .dropdown-toggle:hover .caret { - border-top-color: #4183c4; - border-bottom-color: #4183c4; + border-top-color: #6c737e; + border-bottom-color: #6c737e; } /* move down carets for tabs */ .nav-tabs .dropdown-toggle .caret { @@ -3226,8 +3227,8 @@ input[type="submit"].btn.btn-mini { border-bottom-color: #fff; } .nav-tabs .active .dropdown-toggle .caret { - border-top-color: #555555; - border-bottom-color: #555555; + border-top-color: #777777; + border-bottom-color: #777777; } .nav > .dropdown.active > a:hover { cursor: pointer; @@ -3236,8 +3237,8 @@ input[type="submit"].btn.btn-mini { .nav-pills .open .dropdown-toggle, .nav > li.dropdown.open.active > a:hover { color: #ffffff; - background-color: #999999; - border-color: #999999; + background-color: #bbbbbb; + border-color: #bbbbbb; } .nav li.dropdown.open .caret, .nav li.dropdown.open.active .caret, @@ -3248,7 +3249,7 @@ input[type="submit"].btn.btn-mini { filter: alpha(opacity=100); } .tabs-stacked .open > a:hover { - border-color: #999999; + border-color: #bbbbbb; } .tabbable { *zoom: 1; @@ -3320,7 +3321,7 @@ input[type="submit"].btn.btn-mini { border-radius: 4px 0 0 4px; } .tabs-left > .nav-tabs > li > a:hover { - border-color: #dddddd #dddddd #dddddd #dddddd; + border-color: #eeeeee #dddddd #eeeeee #eeeeee; } .tabs-left > .nav-tabs .active > a, .tabs-left > .nav-tabs .active > a:hover { @@ -3339,7 +3340,7 @@ input[type="submit"].btn.btn-mini { border-radius: 0 4px 4px 0; } .tabs-right > .nav-tabs > li > a:hover { - border-color: #dddddd #dddddd #dddddd #dddddd; + border-color: #eeeeee #eeeeee #eeeeee #dddddd; } .tabs-right > .nav-tabs .active > a, .tabs-right > .nav-tabs .active > a:hover { @@ -3347,7 +3348,7 @@ input[type="submit"].btn.btn-mini { *border-left-color: #ffffff; } .nav > .disabled > a { - color: #999999; + color: #bbbbbb; } .nav > .disabled > a:hover { text-decoration: none; @@ -3356,8 +3357,8 @@ input[type="submit"].btn.btn-mini { } .navbar { overflow: visible; - margin-bottom: 20px; - color: #333333; + margin-bottom: 21px; + color: #2d2d2d; *position: relative; *z-index: 2; } @@ -3365,15 +3366,15 @@ input[type="submit"].btn.btn-mini { min-height: 40px; padding-left: 20px; padding-right: 20px; - background-color: #f7f7f7; - background-image: -moz-linear-gradient(top, #ffffff, #eaeaea); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#eaeaea)); - background-image: -webkit-linear-gradient(top, #ffffff, #eaeaea); - background-image: -o-linear-gradient(top, #ffffff, #eaeaea); - background-image: linear-gradient(to bottom, #ffffff, #eaeaea); + 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='#ffffffff', endColorstr='#ffeaeaea', GradientType=0); - border: 1px solid #cbcbcb; + 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; @@ -3390,12 +3391,12 @@ input[type="submit"].btn.btn-mini { .navbar .brand { float: left; display: block; - padding: 10px 20px 10px; + padding: 9.5px 20px 9.5px; margin-left: -20px; font-size: 20px; font-weight: 200; color: #333333; - text-shadow: 0 1px 0 #ffffff; + text-shadow: 0 1px 0 #eeeeee; } .navbar .brand:hover { text-decoration: none; @@ -3405,16 +3406,16 @@ input[type="submit"].btn.btn-mini { line-height: 40px; } .navbar-link { - color: #333333; + color: #2d2d2d; } .navbar-link:hover { - color: #4183c4; + color: #6c737e; } .navbar .divider-vertical { height: 40px; margin: 0 9px; - border-left: 1px solid #eaeaea; - border-right: 1px solid #ffffff; + border-left: 1px solid #bbbbbb; + border-right: 1px solid #eeeeee; } .navbar .btn, .navbar .btn-group { @@ -3471,7 +3472,7 @@ input[type="submit"].btn.btn-mini { .navbar-search .search-query { margin-bottom: 0; padding: 4px 14px; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Muli", "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 1; @@ -3547,10 +3548,10 @@ input[type="submit"].btn.btn-mini { } .navbar .nav > li > a { float: none; - padding: 10px 15px 10px; - color: #333333; + padding: 9.5px 15px 9.5px; + color: #2d2d2d; text-decoration: none; - text-shadow: 0 1px 0 #ffffff; + text-shadow: 0 1px 0 #eeeeee; } .navbar .nav .dropdown-toggle .caret { margin-top: 8px; @@ -3558,13 +3559,13 @@ input[type="submit"].btn.btn-mini { .navbar .nav > li > a:focus, .navbar .nav > li > a:hover { background-color: transparent; - color: #4183c4; + color: #6c737e; text-decoration: none; } .navbar .nav > .active > a, .navbar .nav > .active > a:hover, .navbar .nav > .active > a:focus { - color: #333333; + color: #2d2d2d; text-decoration: none; background-color: transparent; -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); @@ -3579,17 +3580,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: #eaeaea; - background-image: -moz-linear-gradient(top, #f2f2f2, #dddddd); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#dddddd)); - background-image: -webkit-linear-gradient(top, #f2f2f2, #dddddd); - background-image: -o-linear-gradient(top, #f2f2f2, #dddddd); - background-image: linear-gradient(to bottom, #f2f2f2, #dddddd); + 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='#fff2f2f2', endColorstr='#ffdddddd', GradientType=0); - border-color: #dddddd #dddddd #b7b7b7; + 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: #dddddd; + *background-color: #aeaeae; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -3603,12 +3604,12 @@ input[type="submit"].btn.btn-mini { .navbar .btn-navbar.disabled, .navbar .btn-navbar[disabled] { color: #ffffff; - background-color: #dddddd; - *background-color: #d0d0d0; + background-color: #aeaeae; + *background-color: #a1a1a1; } .navbar .btn-navbar:active, .navbar .btn-navbar.active { - background-color: #c4c4c4 \9; + background-color: #959595 \9; } .navbar .btn-navbar .icon-bar { display: block; @@ -3663,17 +3664,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: #333333; + color: #2d2d2d; } .navbar .nav li.dropdown > .dropdown-toggle .caret { - border-top-color: #333333; - border-bottom-color: #333333; + 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: #333333; - border-bottom-color: #333333; + border-top-color: #2d2d2d; + border-bottom-color: #2d2d2d; } .navbar .pull-right > li > .dropdown-menu, .navbar .nav > li > .dropdown-menu.pull-right { @@ -3701,22 +3702,22 @@ input[type="submit"].btn.btn-mini { border-radius: 6px 0 6px 6px; } .navbar-inverse { - color: #dddddd; + color: #eeeeee; } .navbar-inverse .navbar-inner { - background-color: #5d5d5d; - background-image: -moz-linear-gradient(top, #626262, #555555); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#626262), to(#555555)); - background-image: -webkit-linear-gradient(top, #626262, #555555); - background-image: -o-linear-gradient(top, #626262, #555555); - background-image: linear-gradient(to bottom, #626262, #555555); + background-color: #949aa2; + background-image: -moz-linear-gradient(top, #afb3ba, #6c737e); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#afb3ba), to(#6c737e)); + background-image: -webkit-linear-gradient(top, #afb3ba, #6c737e); + background-image: -o-linear-gradient(top, #afb3ba, #6c737e); + background-image: linear-gradient(to bottom, #afb3ba, #6c737e); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff626262', endColorstr='#ff555555', GradientType=0); - border-color: #252525; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffafb3ba', endColorstr='#ff6c737e', GradientType=0); + border-color: #606670; } .navbar-inverse .brand, .navbar-inverse .nav > li > a { - color: #dddddd; + color: #eeeeee; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } .navbar-inverse .brand:hover, @@ -3732,27 +3733,27 @@ input[type="submit"].btn.btn-mini { .navbar-inverse .nav .active > a:hover, .navbar-inverse .nav .active > a:focus { color: #ffffff; - background-color: #555555; + background-color: #6c737e; } .navbar-inverse .navbar-link { - color: #dddddd; + color: #eeeeee; } .navbar-inverse .navbar-link:hover { color: #ffffff; } .navbar-inverse .divider-vertical { - border-left-color: #555555; - border-right-color: #626262; + border-left-color: #6c737e; + border-right-color: #afb3ba; } .navbar-inverse .nav li.dropdown.open > .dropdown-toggle, .navbar-inverse .nav li.dropdown.active > .dropdown-toggle, .navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle { - background-color: #555555; + background-color: #6c737e; color: #ffffff; } .navbar-inverse .nav li.dropdown > .dropdown-toggle .caret { - border-top-color: #dddddd; - border-bottom-color: #dddddd; + border-top-color: #eeeeee; + border-bottom-color: #eeeeee; } .navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret, .navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret, @@ -3762,8 +3763,8 @@ input[type="submit"].btn.btn-mini { } .navbar-inverse .navbar-search .search-query { color: #ffffff; - background-color: #959595; - border-color: #555555; + 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); @@ -3796,17 +3797,17 @@ input[type="submit"].btn.btn-mini { .navbar-inverse .btn-navbar { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #505050; - background-image: -moz-linear-gradient(top, #555555, #484848); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#484848)); - background-image: -webkit-linear-gradient(top, #555555, #484848); - background-image: -o-linear-gradient(top, #555555, #484848); - background-image: linear-gradient(to bottom, #555555, #484848); + background-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='#ff555555', endColorstr='#ff484848', GradientType=0); - border-color: #484848 #484848 #222222; + 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: #484848; + *background-color: #606670; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -3817,16 +3818,16 @@ input[type="submit"].btn.btn-mini { .navbar-inverse .btn-navbar.disabled, .navbar-inverse .btn-navbar[disabled] { color: #ffffff; - background-color: #484848; - *background-color: #3c3c3c; + background-color: #606670; + *background-color: #545a63; } .navbar-inverse .btn-navbar:active, .navbar-inverse .btn-navbar.active { - background-color: #2f2f2f \9; + background-color: #494d55 \9; } .breadcrumb { padding: 8px 15px; - margin: 0 0 20px; + margin: 0 0 21px; list-style: none; background-color: #f5f5f5; -webkit-border-radius: 4px; @@ -3846,11 +3847,11 @@ input[type="submit"].btn.btn-mini { color: #ccc; } .breadcrumb .active { - color: #999999; + color: #bbbbbb; } .pagination { - height: 40px; - margin: 20px 0; + height: 42px; + margin: 21px 0; } .pagination ul { display: inline-block; @@ -3874,7 +3875,7 @@ input[type="submit"].btn.btn-mini { .pagination span { float: left; padding: 0 14px; - line-height: 38px; + line-height: 40px; text-decoration: none; background-color: #ffffff; border: 1px solid #dddddd; @@ -3887,13 +3888,13 @@ input[type="submit"].btn.btn-mini { } .pagination .active a, .pagination .active span { - color: #999999; + color: #bbbbbb; cursor: default; } .pagination .disabled span, .pagination .disabled a, .pagination .disabled a:hover { - color: #999999; + color: #bbbbbb; background-color: transparent; cursor: default; } @@ -3917,7 +3918,7 @@ input[type="submit"].btn.btn-mini { text-align: right; } .pager { - margin: 20px 0; + margin: 21px 0; list-style: none; text-align: center; *zoom: 1; @@ -3955,7 +3956,7 @@ input[type="submit"].btn.btn-mini { } .pager .disabled a, .pager .disabled a:hover { - color: #999999; + color: #bbbbbb; background-color: #fff; cursor: default; } @@ -4280,13 +4281,13 @@ input[type="submit"].btn.btn-mini { } .thumbnails > li { float: left; - margin-bottom: 20px; + margin-bottom: 21px; margin-left: 20px; } .thumbnail { display: block; padding: 4px; - line-height: 20px; + line-height: 21px; border: 1px solid #ddd; -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -4300,7 +4301,7 @@ input[type="submit"].btn.btn-mini { transition: all 0.2s ease-in-out; } a.thumbnail:hover { - border-color: #4183c4; + border-color: #6c737e; -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); @@ -4313,7 +4314,7 @@ a.thumbnail:hover { } .thumbnail .caption { padding: 9px; - color: #555555; + color: #777777; } .label, .badge { @@ -4324,7 +4325,7 @@ a.thumbnail:hover { vertical-align: baseline; white-space: nowrap; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #999999; + background-color: #bbbbbb; } .label { padding: 1px 4px 2px; @@ -4346,35 +4347,35 @@ a.badge:hover { } .label-important, .badge-important { - background-color: #393939; + background-color: #ffffff; } .label-important[href], .badge-important[href] { - background-color: #202020; + background-color: #e6e6e6; } .label-warning, .badge-warning { - background-color: #ff7d00; + background-color: #d47500; } .label-warning[href], .badge-warning[href] { - background-color: #cc6400; + background-color: #a15900; } .label-success, .badge-success { - background-color: #333333; + background-color: #ffffff; } .label-success[href], .badge-success[href] { - background-color: #1a1a1a; + background-color: #e6e6e6; } .label-info, .badge-info { - background-color: #1b3650; + background-color: #ffffff; } .label-info[href], .badge-info[href] { - background-color: #0e1c2a; + background-color: #e6e6e6; } .label-inverse, .badge-inverse { @@ -4435,8 +4436,8 @@ a.badge:hover { } .progress { overflow: hidden; - height: 20px; - margin-bottom: 20px; + 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)); @@ -4565,18 +4566,18 @@ a.badge:hover { } .progress-warning .bar, .progress .bar-warning { - background-color: #ff942e; - background-image: -moz-linear-gradient(top, #ffa44d, #ff7d00); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffa44d), to(#ff7d00)); - background-image: -webkit-linear-gradient(top, #ffa44d, #ff7d00); - background-image: -o-linear-gradient(top, #ffa44d, #ff7d00); - background-image: linear-gradient(to bottom, #ffa44d, #ff7d00); + 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='#ffffa44d', endColorstr='#ffff7d00', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffff9c21', endColorstr='#ffd47500', GradientType=0); } .progress-warning.progress-striped .bar, .progress-striped .bar-warning { - background-color: #ffa44d; + background-color: #ff9c21; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); @@ -4584,7 +4585,7 @@ a.badge:hover { background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } .accordion { - margin-bottom: 20px; + margin-bottom: 21px; } .accordion-group { margin-bottom: 2px; @@ -4609,7 +4610,7 @@ a.badge:hover { } .carousel { position: relative; - margin-bottom: 20px; + margin-bottom: 21px; line-height: 1; } .carousel-inner { @@ -4671,7 +4672,7 @@ a.badge:hover { line-height: 30px; color: #ffffff; text-align: center; - background: #222222; + background: #2d2d2d; border: 3px solid #ffffff; -webkit-border-radius: 23px; -moz-border-radius: 23px; @@ -4701,7 +4702,7 @@ a.badge:hover { .carousel-caption h4, .carousel-caption p { color: #ffffff; - line-height: 20px; + line-height: 21px; } .carousel-caption h4 { margin: 0 0 5px; @@ -4712,7 +4713,7 @@ a.badge:hover { .hero-unit { padding: 60px; margin-bottom: 30px; - background-color: #dddddd; + background-color: #eeeeee; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; @@ -4727,7 +4728,7 @@ a.badge:hover { .hero-unit p { font-size: 18px; font-weight: 200; - line-height: 30px; + line-height: 31.5px; color: inherit; } .pull-right { @@ -4755,15 +4756,14 @@ a.badge:hover { box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4) , 0 0 10px rgba(0, 0, 0, 0.1); } .navbar .brand { - font-weight: bold; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.3); } .navbar .brand:hover { - color: #4183c4; + color: #6c737e; } .navbar .nav > li > a { padding: 11px 10px 9px; - font-weight: bold; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.3); } .navbar .navbar-text { margin-top: 2px; @@ -4773,22 +4773,22 @@ a.badge:hover { .navbar .navbar-search .search-query, .navbar .navbar-search .search-query:hover { margin-bottom: 0; - color: #999999; + 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: #999999; + color: #bbbbbb; } .navbar .navbar-search .search-query:-ms-input-placeholder, .navbar .navbar-search .search-query:hover:-ms-input-placeholder { - color: #999999; + color: #bbbbbb; } .navbar .navbar-search .search-query::-webkit-input-placeholder, .navbar .navbar-search .search-query:hover::-webkit-input-placeholder { - color: #999999; + color: #bbbbbb; } .navbar .navbar-search .search-query:focus, .navbar .navbar-search .search-query:hover:focus, @@ -4797,25 +4797,25 @@ 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: #333333; + color: #2d2d2d; } .navbar .nav-collapse.collapse .navbar-search { border-top: none; border-bottom: none; } .navbar .nav-collapse.collapse > .nav li > a:hover { - background-color: #4183c4; + background-color: #6c737e; color: #ffffff; text-shadow: none; } .navbar-inverse .brand { - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.5); + text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3); } .navbar-inverse .brand:hover { color: #ffffff; } .navbar-inverse .nav > li > a { - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.5); + 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, @@ -4824,20 +4824,19 @@ a.badge:hover { } .navbar-inverse .nav-collapse.collapse .nav li > a, .navbar-inverse .nav-collapse.collapse .nav-header { - color: #dddddd; + color: #eeeeee; } div.subnav .nav > li > a { - font-weight: bold; - color: #333333; + color: #2d2d2d; } div.subnav .nav > li > a:hover { - color: #4183c4; + color: #6c737e; } div.subnav .nav > li.active > a { - color: #333333; + color: #2d2d2d; } div.subnav .nav > li.active > a:hover { - color: #333333; + color: #2d2d2d; } div.subnav .nav > li.dropdown > .dropdown-toggle { background-color: transparent; @@ -4845,252 +4844,64 @@ 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: #333333; + color: #2d2d2d; } div.subnav .nav > li.dropdown.open > .dropdown-toggle:hover { - color: #4183c4; + color: #6c737e; } .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 #333333; - border-top-color: #333333; + 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 #4183c4; - border-top-color: #4183c4; + border-top: 4px solid #6c737e; + border-top-color: #6c737e; } -.btn { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #f1f1f1; - background-image: -moz-linear-gradient(top, #f4f4f4, #ececec); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f4f4f4), to(#ececec)); - background-image: -webkit-linear-gradient(top, #f4f4f4, #ececec); - background-image: -o-linear-gradient(top, #f4f4f4, #ececec); - background-image: linear-gradient(to bottom, #f4f4f4, #ececec); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff4f4f4', endColorstr='#ffececec', GradientType=0); - border-color: #ececec #ececec #c6c6c6; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #ececec; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ +/*.btn { + .buttonBackground(#F4F4F4, #ECECEC); + color: @textColor; + text-shadow: none; - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - color: #333333; - text-shadow: none; -} -.btn:hover, -.btn:active, -.btn.active, -.btn.disabled, -.btn[disabled] { - color: #ffffff; - background-color: #ececec; - *background-color: #dfdfdf; -} -.btn:active, -.btn.active { - background-color: #d3d3d3 \9; -} -.btn:hover, -.btn:active, -.btn.active, -.btn.disabled, -.btn[disabled] { - color: #333333; -} -.btn-primary { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #707070; - background-image: -moz-linear-gradient(top, #909090, #3f3f3f); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#909090), to(#3f3f3f)); - background-image: -webkit-linear-gradient(top, #909090, #3f3f3f); - background-image: -o-linear-gradient(top, #909090, #3f3f3f); - background-image: linear-gradient(to bottom, #909090, #3f3f3f); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff909090', endColorstr='#ff3f3f3f', GradientType=0); - border-color: #3f3f3f #3f3f3f #191919; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #3f3f3f; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + &:hover, + &:active, + &.active, + &.disabled, + &[disabled] { + color: @grayDark; + } } -.btn-primary:hover, -.btn-primary:active, -.btn-primary.active, -.btn-primary.disabled, -.btn-primary[disabled] { - color: #ffffff; - background-color: #3f3f3f; - *background-color: #323232; -} -.btn-primary:active, -.btn-primary.active { - background-color: #262626 \9; -} -.btn-warning { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #fbd627; - background-image: -moz-linear-gradient(top, #ffde42, #f4ca00); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffde42), to(#f4ca00)); - background-image: -webkit-linear-gradient(top, #ffde42, #f4ca00); - background-image: -o-linear-gradient(top, #ffde42, #f4ca00); - background-image: linear-gradient(to bottom, #ffde42, #f4ca00); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffde42', endColorstr='#fff4ca00', GradientType=0); - border-color: #f4ca00 #f4ca00 #a88b00; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #f4ca00; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -} -.btn-warning:hover, -.btn-warning:active, -.btn-warning.active, -.btn-warning.disabled, -.btn-warning[disabled] { - color: #ffffff; - background-color: #f4ca00; - *background-color: #dbb500; -} -.btn-warning:active, -.btn-warning.active { - background-color: #c1a000 \9; +.btn-primary { + .buttonBackground(#909090, #3F3F3F); } -.btn-danger { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #e15454; - background-image: -moz-linear-gradient(top, #e56e6e, #da2d2d); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#e56e6e), to(#da2d2d)); - background-image: -webkit-linear-gradient(top, #e56e6e, #da2d2d); - background-image: -o-linear-gradient(top, #e56e6e, #da2d2d); - background-image: linear-gradient(to bottom, #e56e6e, #da2d2d); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe56e6e', endColorstr='#ffda2d2d', GradientType=0); - border-color: #da2d2d #da2d2d #9f1c1c; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #da2d2d; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -} -.btn-danger:hover, -.btn-danger:active, -.btn-danger.active, -.btn-danger.disabled, -.btn-danger[disabled] { - color: #ffffff; - background-color: #da2d2d; - *background-color: #ca2424; -} -.btn-danger:active, -.btn-danger.active { - background-color: #b42020 \9; +.btn-warning { + .buttonBackground(lighten(@yellow, 15%), @yellow); } -.btn-success { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #79cb5d; - background-image: -moz-linear-gradient(top, #8add6d, #60b044); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#8add6d), to(#60b044)); - background-image: -webkit-linear-gradient(top, #8add6d, #60b044); - background-image: -o-linear-gradient(top, #8add6d, #60b044); - background-image: linear-gradient(to bottom, #8add6d, #60b044); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8add6d', endColorstr='#ff60b044', GradientType=0); - border-color: #60b044 #60b044 #42792f; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #60b044; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -} -.btn-success:hover, -.btn-success:active, -.btn-success.active, -.btn-success.disabled, -.btn-success[disabled] { - color: #ffffff; - background-color: #60b044; - *background-color: #569e3d; -} -.btn-success:active, -.btn-success.active { - background-color: #4c8b36 \9; +.btn-danger { + .buttonBackground(lighten(#DA2D2D, 15%), #DA2D2D); } -.btn-info { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #669dc7; - background-image: -moz-linear-gradient(top, #7caccf, #4488bb); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#7caccf), to(#4488bb)); - background-image: -webkit-linear-gradient(top, #7caccf, #4488bb); - background-image: -o-linear-gradient(top, #7caccf, #4488bb); - background-image: linear-gradient(to bottom, #7caccf, #4488bb); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff7caccf', endColorstr='#ff4488bb', GradientType=0); - border-color: #4488bb #4488bb #305f83; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #4488bb; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -} -.btn-info:hover, -.btn-info:active, -.btn-info.active, -.btn-info.disabled, -.btn-info[disabled] { - color: #ffffff; - background-color: #4488bb; - *background-color: #3d7aa8; -} -.btn-info:active, -.btn-info.active { - background-color: #366d96 \9; +.btn-success { + .buttonBackground(#8ADD6D, #60B044); } -.btn-inverse { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #466274; - background-image: -moz-linear-gradient(top, #4a687a, #405a6a); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#4a687a), to(#405a6a)); - background-image: -webkit-linear-gradient(top, #4a687a, #405a6a); - background-image: -o-linear-gradient(top, #4a687a, #405a6a); - background-image: linear-gradient(to bottom, #4a687a, #405a6a); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff4a687a', endColorstr='#ff405a6a', GradientType=0); - border-color: #405a6a #405a6a #23323a; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #405a6a; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -} -.btn-inverse:hover, -.btn-inverse:active, -.btn-inverse.active, -.btn-inverse.disabled, -.btn-inverse[disabled] { - color: #ffffff; - background-color: #405a6a; - *background-color: #364d5a; -} -.btn-inverse:active, -.btn-inverse.active { - background-color: #2d3f4a \9; +.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 { @@ -5120,7 +4931,7 @@ div.subnav .nav > li.dropdown.open > .dropdown-toggle:hover { .control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on { color: #e29235; - background-color: #f5f3b4; + background-color: #d47500; border-color: #e29235; } .control-group.error > label, @@ -5152,7 +4963,7 @@ div.subnav .nav > li.dropdown.open > .dropdown-toggle:hover { .control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on { color: #cc0000; - background-color: #ffe9e9; + background-color: #cd0200; border-color: #cc0000; } .control-group.success > label, @@ -5184,24 +4995,35 @@ 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: #bedebe; + background-color: #819e37; border-color: #2ba949; } +.alert { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +} +.label, +.badge { + padding-top: 4px; +} .label-important, .badge-important { - background-color: #BD2C00; + background-color: #cd0200; } .label-warning, .badge-warning { - background-color: #E3E84D; + background-color: #d47500; } .label-success, .badge-success { - background-color: #6CC644; + background-color: #819e37; } .label-info, .badge-info { - background-color: #4183C4; + background-color: #3399f3; +} +.well { + background-color: #eeeeee; } .hero-unit { -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); diff --git a/spacelab/bootstrap.min.css b/spacelab/bootstrap.min.css index 166ae7bc..624545f0 100644 --- a/spacelab/bootstrap.min.css +++ b/spacelab/bootstrap.min.css @@ -1,3 +1,4 @@ +@import url('http://fonts.googleapis.com/css?family=Muli'); 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;} @@ -20,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:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;} -body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:20px;color:#333333;background-color:#ffffff;} -a{color:#4183c4;text-decoration:none;} -a:hover{color:#4183c4;text-decoration:underline;} +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:#6c737e;text-decoration:none;} +a:hover{color:#6c737e;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;} @@ -100,14 +101,14 @@ a:hover{color:#4183c4;text-decoration:underline;} .container:after{clear:both;} .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 10px;} -.lead{margin-bottom:20px;font-size:20px;font-weight:200;line-height:30px;} +p{margin:0 0 10.5px;} +.lead{margin-bottom:21px;font-size:20px;font-weight:200;line-height:31.5px;} small{font-size:85%;} strong{font-weight:bold;} em{font-style:italic;} cite{font-style:normal;} -.muted{color:#999999;} -h1,h2,h3,h4,h5,h6{margin:10px 0;font-family:inherit;font-weight:bold;line-height:1;color:inherit;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;line-height:1;color:#999999;} +.muted{color:#bbbbbb;} +h1,h2,h3,h4,h5,h6{margin:10.5px 0;font-family:inherit;font-weight:normal;line-height:1;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{font-size:36px;line-height:40px;} h2{font-size:30px;line-height:40px;} h3{font-size:24px;line-height:40px;} @@ -118,39 +119,39 @@ h1 small{font-size:24px;} h2 small{font-size:18px;} h3 small{font-size:14px;} h4 small{font-size:14px;} -.page-header{padding-bottom:9px;margin:20px 0 30px;border-bottom:1px solid #dddddd;} -ul,ol{padding:0;margin:0 0 10px 25px;} +.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;} -li{line-height:20px;} +li{line-height:21px;} ul.unstyled,ol.unstyled{margin-left:0;list-style:none;} -dl{margin-bottom:20px;} -dt,dd{line-height:20px;} +dl{margin-bottom:21px;} +dt,dd{line-height:21px;} dt{font-weight:bold;} -dd{margin-left:10px;} +dd{margin-left:10.5px;} .dl-horizontal dt{float:left;width:120px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;} .dl-horizontal dd{margin-left:130px;} -hr{margin:20px 0;border:0;border-top:1px solid #dddddd;border-bottom:1px solid #ffffff;} -abbr[title]{cursor:help;border-bottom:1px dotted #999999;} +hr{margin:21px 0;border:0;border-top:1px solid #eeeeee;border-bottom:1px solid #ffffff;} +abbr[title]{cursor:help;border-bottom:1px dotted #bbbbbb;} abbr.initialism{font-size:90%;text-transform:uppercase;} -blockquote{padding:0 0 0 15px;margin:0 0 20px;border-left:5px solid #dddddd;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:25px;} -blockquote small{display:block;line-height:20px;color:#999999;}blockquote small:before{content:'\2014 \00A0';} -blockquote.pull-right{float:right;padding-right:15px;padding-left:0;border-right:5px solid #dddddd;border-left:0;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;} +blockquote{padding:0 0 0 15px;margin:0 0 21px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:26.25px;} +blockquote small{display:block;line-height:21px;color:#bbbbbb;}blockquote small:before{content:'\2014 \00A0';} +blockquote.pull-right{float:right;padding-right:15px;padding-left:0;border-right:5px solid #eeeeee;border-left:0;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;} 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:20px;font-style:normal;line-height:20px;} +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{padding:2px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;} -pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:20px;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:20px;} +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 code{padding:0;color:inherit;background-color:transparent;border:0;} .pre-scrollable{max-height:340px;overflow-y:scroll;} -form{margin:0 0 20px;} +form{margin:0 0 21px;} fieldset{padding:0;margin:0;border:0;} -legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:40px;color:#333333;border:0;border-bottom:1px solid #e5e5e5;}legend small{font-size:15px;color:#999999;} -label,input,button,select,textarea{font-size:14px;font-weight:normal;line-height:20px;} -input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;} +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;} 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:20px;padding:4px 6px;margin-bottom:9px;font-size:14px;line-height:20px;color:#555555;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +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:9px;font-size:14px;line-height:21px;color:#777777;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} input,textarea{width:210px;} 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);} @@ -160,12 +161,12 @@ select,input[type="file"]{height:30px;*margin-top:4px;line-height:30px;} select{width:220px;border:1px solid #bbb;background-color:#ffffff;} select[multiple],select[size]{height:auto;} select:focus,input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} -.uneditable-input,.uneditable-textarea{color:#999999;background-color:#fcfcfc;border-color:#cccccc;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;} +.uneditable-input,.uneditable-textarea{color:#bbbbbb;background-color:#fcfcfc;border-color:#cccccc;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;} .uneditable-input{overflow:hidden;white-space:nowrap;} .uneditable-textarea{width:auto;height:auto;} -input:-moz-placeholder,textarea:-moz-placeholder{color:#999999;} -input:-ms-input-placeholder,textarea:-ms-input-placeholder{color:#999999;} -input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{color:#999999;} +input:-moz-placeholder,textarea:-moz-placeholder{color:#bbbbbb;} +input:-ms-input-placeholder,textarea:-ms-input-placeholder{color:#bbbbbb;} +input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{color:#bbbbbb;} .radio,.checkbox{min-height:18px;padding-left:18px;} .radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-18px;} .controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px;} @@ -196,27 +197,27 @@ input.span1, textarea.span1, .uneditable-input.span1{width:46px;} .controls-row{*zoom:1;}.controls-row:before,.controls-row:after{display:table;content:"";line-height:0;} .controls-row:after{clear:both;} .controls-row [class*="span"]{float:left;} -input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#dddddd;} +input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#eeeeee;} input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio"][readonly],input[type="checkbox"][readonly]{background-color:transparent;} -.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#393939;} -.control-group.warning .checkbox,.control-group.warning .radio,.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#393939;border-color:#393939;-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 .checkbox:focus,.control-group.warning .radio:focus,.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#202020;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #6c6c6c;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #6c6c6c;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #6c6c6c;} -.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#393939;background-color:#f5f3b4;border-color:#393939;} -.control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#393939;} -.control-group.error .checkbox,.control-group.error .radio,.control-group.error input,.control-group.error select,.control-group.error textarea{color:#393939;border-color:#393939;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.control-group.error .checkbox:focus,.control-group.error .radio:focus,.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#202020;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #6c6c6c;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #6c6c6c;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #6c6c6c;} -.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#393939;background-color:#ffe9e9;border-color:#393939;} -.control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#333333;} -.control-group.success .checkbox,.control-group.success .radio,.control-group.success input,.control-group.success select,.control-group.success textarea{color:#333333;border-color:#333333;-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 .checkbox:focus,.control-group.success .radio:focus,.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#1a1a1a;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #666666;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #666666;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #666666;} -.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#333333;background-color:#bedebe;border-color:#333333;} +.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#ffffff;} +.control-group.warning .checkbox,.control-group.warning .radio,.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#ffffff;border-color:#ffffff;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.control-group.warning .checkbox:focus,.control-group.warning .radio:focus,.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#e6e6e6;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ffffff;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ffffff;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ffffff;} +.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#ffffff;background-color:#d47500;border-color:#ffffff;} +.control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#ffffff;} +.control-group.error .checkbox,.control-group.error .radio,.control-group.error input,.control-group.error select,.control-group.error textarea{color:#ffffff;border-color:#ffffff;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.control-group.error .checkbox:focus,.control-group.error .radio:focus,.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#e6e6e6;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ffffff;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ffffff;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ffffff;} +.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#ffffff;background-color:#cd0200;border-color:#ffffff;} +.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;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 .checkbox:focus,.control-group.success .radio:focus,.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;} 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:19px 20px 20px;margin-top:20px;margin-bottom:20px;background-color:#f5f5f5;border-top:1px solid #e5e5e5;*zoom:1;}.form-actions:before,.form-actions:after{display:table;content:"";line-height:0;} +.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:#595959;} -.help-block{display:block;margin-bottom:10px;} +.help-block,.help-inline{color:#535353;} +.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{position:relative;margin-bottom:0;*margin-left:0;font-size:14px;vertical-align:top;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 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:20px;min-width:16px;padding:4px 5px;font-size:14px;font-weight:normal;line-height:20px;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#dddddd;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: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,.input-append .btn,.input-prepend .btn{margin-left:-1px;vertical-align:top;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.input-append .active,.input-prepend .active{background-color:#fafefa;border-color:#84de81;} +.input-append .active,.input-prepend .active{background-color:#c6da94;border-color:#819e37;} .input-prepend .add-on,.input-prepend .btn{margin-right:-1px;} .input-prepend .add-on:first-child,.input-prepend .btn:first-child{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} .input-append input,.input-append select,.input-append .uneditable-input{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} @@ -236,16 +237,16 @@ input.search-query{padding-right:14px;padding-right:4px \9;padding-left:14px;pad .form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{margin-bottom:0;} .form-search .radio,.form-search .checkbox,.form-inline .radio,.form-inline .checkbox{padding-left:0;margin-bottom:0;vertical-align:middle;} .form-search .radio input[type="radio"],.form-search .checkbox input[type="checkbox"],.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:left;margin-right:3px;margin-left:0;} -.control-group{margin-bottom:10px;} -legend+.control-group{margin-top:20px;-webkit-margin-top-collapse:separate;} -.form-horizontal .control-group{margin-bottom:20px;*zoom:1;}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;content:"";line-height:0;} +.control-group{margin-bottom:10.5px;} +legend+.control-group{margin-top:21px;-webkit-margin-top-collapse:separate;} +.form-horizontal .control-group{margin-bottom:21px;*zoom:1;}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;content:"";line-height:0;} .form-horizontal .control-group:after{clear:both;} .form-horizontal .control-label{float:left;width:140px;padding-top:5px;text-align:right;} .form-horizontal .controls{*display:inline-block;*padding-left:20px;margin-left:160px;*margin-left:0;}.form-horizontal .controls:first-child{*padding-left:160px;} -.form-horizontal .help-block{margin-top:10px;margin-bottom:0;} +.form-horizontal .help-block{margin-top:10.5px;margin-bottom:0;} .form-horizontal .form-actions{padding-left:160px;} table{max-width:100%;background-color:transparent;border-collapse:collapse;border-spacing:0;} -.table{width:100%;margin-bottom:20px;}.table th,.table td{padding:8px;line-height:20px;text-align:left;vertical-align:top;border-top:1px solid #dddddd;} +.table{width:100%;margin-bottom:21px;}.table th,.table td{padding:8px;line-height:21px;text-align:left;vertical-align:top;border-top:1px solid #dddddd;} .table th{font-weight:bold;} .table thead th{vertical-align:bottom;} .table caption+thead tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0;} @@ -286,9 +287,9 @@ table .span21{float:none;width:1644px;margin-left:0;} table .span22{float:none;width:1724px;margin-left:0;} table .span23{float:none;width:1804px;margin-left:0;} table .span24{float:none;width:1884px;margin-left:0;} -.table tbody tr.success td{background-color:#bedebe;} -.table tbody tr.error td{background-color:#ffe9e9;} -.table tbody tr.info td{background-color:#e4f0ff;} +.table tbody tr.success td{background-color:#819e37;} +.table tbody tr.error td{background-color:#cd0200;} +.table tbody tr.info td{background-color:#3399f3;} [class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat;margin-top:1px;} .icon-white,.nav>.active>a>[class^="icon-"],.nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"]{background-image:url("../img/glyphicons-halflings-white.png");} .icon-glass{background-position:0 0;} @@ -437,11 +438,11 @@ table .span24{float:none;width:1884px;margin-left:0;} .caret{display:inline-block;width:0;height:0;vertical-align:top;border-top:4px solid #000000;border-right:4px solid transparent;border-left:4px solid transparent;content:"";} .dropdown .caret{margin-top:8px;margin-left:2px;} .dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;background-color:#ffffff;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;}.dropdown-menu.pull-right{right:0;left:auto;} -.dropdown-menu .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;} -.dropdown-menu a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:20px;color:#333333;white-space:nowrap;} -.dropdown-menu li>a:hover,.dropdown-menu li>a:focus,.dropdown-submenu:hover>a{text-decoration:none;color:#ffffff;background-color:#4183c4;background-color:#3d7ebd;background-image:-moz-linear-gradient(top, #4183c4, #3876b4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#4183c4), to(#3876b4));background-image:-webkit-linear-gradient(top, #4183c4, #3876b4);background-image:-o-linear-gradient(top, #4183c4, #3876b4);background-image:linear-gradient(to bottom, #4183c4, #3876b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff4183c4', endColorstr='#ff3876b4', GradientType=0);} -.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;outline:0;background-color:#4183c4;background-color:#3d7ebd;background-image:-moz-linear-gradient(top, #4183c4, #3876b4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#4183c4), to(#3876b4));background-image:-webkit-linear-gradient(top, #4183c4, #3876b4);background-image:-o-linear-gradient(top, #4183c4, #3876b4);background-image:linear-gradient(to bottom, #4183c4, #3876b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff4183c4', endColorstr='#ff3876b4', GradientType=0);} -.dropdown-menu .disabled>a,.dropdown-menu .disabled>a:hover{color:#999999;} +.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 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:#6c737e;background-color:#676e79;background-image:-moz-linear-gradient(top, #6c737e, #606670);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#6c737e), to(#606670));background-image:-webkit-linear-gradient(top, #6c737e, #606670);background-image:-o-linear-gradient(top, #6c737e, #606670);background-image:linear-gradient(to bottom, #6c737e, #606670);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff6c737e', endColorstr='#ff606670', GradientType=0);} +.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;outline:0;background-color:#6c737e;background-color:#676e79;background-image:-moz-linear-gradient(top, #6c737e, #606670);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#6c737e), to(#606670));background-image:-webkit-linear-gradient(top, #6c737e, #606670);background-image:-o-linear-gradient(top, #6c737e, #606670);background-image:linear-gradient(to bottom, #6c737e, #606670);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff6c737e', endColorstr='#ff606670', GradientType=0);} +.dropdown-menu .disabled>a,.dropdown-menu .disabled>a:hover{color:#bbbbbb;} .dropdown-menu .disabled>a:hover{text-decoration:none;background-color:transparent;cursor:default;} .open{*z-index:1000;}.open >.dropdown-menu{display:block;} .pull-right>.dropdown-menu{right:0;left:auto;} @@ -459,10 +460,10 @@ table .span24{float:none;width:1884px;margin-left:0;} .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;overflow:visible \9;-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:20px;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);} +.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 14px;margin-bottom:0;font-size:14px;line-height:20px;*line-height:20px;text-align:center;vertical-align:middle;cursor:pointer;color:#333333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#f5f5f5;background-image:-moz-linear-gradient(top, #ffffff, #e6e6e6);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(top, #ffffff, #e6e6e6);background-image:-o-linear-gradient(top, #ffffff, #e6e6e6);background-image:linear-gradient(to bottom, #ffffff, #e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#e6e6e6;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border:1px solid #cccccc;*border:0;border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*margin-left:.3em;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333333;background-color:#e6e6e6;*background-color:#d9d9d9;} -.btn:active,.btn.active{background-color:#cccccc \9;} +.btn{display:inline-block;*display:inline;*zoom:1;padding:4px 14px;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: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:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} @@ -470,35 +471,35 @@ button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-ap .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:9px 14px;font-size:16px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} .btn-large [class^="icon-"]{margin-top:2px;} -.btn-small{padding:3px 9px;font-size:12px;line-height:18px;} +.btn-small{padding:3px 9px;font-size:12px;line-height:19px;} .btn-small [class^="icon-"]{margin-top:0;} -.btn-mini{padding:2px 6px;font-size:11px;line-height:16px;} +.btn-mini{padding:2px 6px;font-size:11px;line-height:17px;} .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;} .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:#4176c4;background-image:-moz-linear-gradient(top, #4183c4, #4162c4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#4183c4), to(#4162c4));background-image:-webkit-linear-gradient(top, #4183c4, #4162c4);background-image:-o-linear-gradient(top, #4183c4, #4162c4);background-image:linear-gradient(to bottom, #4183c4, #4162c4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff4183c4', endColorstr='#ff4162c4', GradientType=0);border-color:#4162c4 #4162c4 #2c448d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#4162c4;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:#4162c4;*background-color:#3857b4;} -.btn-primary:active,.btn-primary.active{background-color:#324ea0 \9;} -.btn-warning{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#ff942e;background-image:-moz-linear-gradient(top, #ffa44d, #ff7d00);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffa44d), to(#ff7d00));background-image:-webkit-linear-gradient(top, #ffa44d, #ff7d00);background-image:-o-linear-gradient(top, #ffa44d, #ff7d00);background-image:linear-gradient(to bottom, #ffa44d, #ff7d00);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffa44d', endColorstr='#ffff7d00', GradientType=0);border-color:#ff7d00 #ff7d00 #b35800;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#ff7d00;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:#ff7d00;*background-color:#e67100;} -.btn-warning:active,.btn-warning.active{background-color:#cc6400 \9;} -.btn-danger{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#da4f49;background-image:-moz-linear-gradient(top, #ee5f5b, #bd362f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));background-image:-webkit-linear-gradient(top, #ee5f5b, #bd362f);background-image:-o-linear-gradient(top, #ee5f5b, #bd362f);background-image:linear-gradient(to bottom, #ee5f5b, #bd362f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);border-color:#bd362f #bd362f #802420;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#bd362f;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#ffffff;background-color:#bd362f;*background-color:#a9302a;} -.btn-danger:active,.btn-danger.active{background-color:#942a25 \9;} -.btn-success{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#5bb75b;background-image:-moz-linear-gradient(top, #62c462, #51a351);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));background-image:-webkit-linear-gradient(top, #62c462, #51a351);background-image:-o-linear-gradient(top, #62c462, #51a351);background-image:linear-gradient(to bottom, #62c462, #51a351);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);border-color:#51a351 #51a351 #387038;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#51a351;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#ffffff;background-color:#51a351;*background-color:#499249;} -.btn-success:active,.btn-success.active{background-color:#408140 \9;} -.btn-info{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#49afcd;background-image:-moz-linear-gradient(top, #5bc0de, #2f96b4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));background-image:-webkit-linear-gradient(top, #5bc0de, #2f96b4);background-image:-o-linear-gradient(top, #5bc0de, #2f96b4);background-image:linear-gradient(to bottom, #5bc0de, #2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#2f96b4;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{color:#ffffff;background-color:#2f96b4;*background-color:#2a85a0;} -.btn-info:active,.btn-info.active{background-color:#24748c \9;} -.btn-inverse{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#414141;background-image:-moz-linear-gradient(top, #555555, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222));background-image:-webkit-linear-gradient(top, #555555, #222222);background-image:-o-linear-gradient(top, #555555, #222222);background-image:linear-gradient(to bottom, #555555, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff555555', endColorstr='#ff222222', GradientType=0);border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#222222;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#ffffff;background-color:#222222;*background-color:#151515;} -.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9;} +.btn-primary{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-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#ffffff;background-color:#6c737e;*background-color:#606670;} +.btn-primary:active,.btn-primary.active{background-color:#545a63 \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-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: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:#5eaff6;background-image:-moz-linear-gradient(top, #7bbdf7, #3399f3);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#7bbdf7), to(#3399f3));background-image:-webkit-linear-gradient(top, #7bbdf7, #3399f3);background-image:-o-linear-gradient(top, #7bbdf7, #3399f3);background-image:linear-gradient(to bottom, #7bbdf7, #3399f3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff7bbdf7', endColorstr='#ff3399f3', GradientType=0);border-color:#3399f3 #3399f3 #0c73cd;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#3399f3;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:#3399f3;*background-color:#1b8df2;} +.btn-info:active,.btn-info.active{background-color:#0e80e5 \9;} +.btn-inverse{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#444444;background-image:-moz-linear-gradient(top, #535353, #2d2d2d);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#535353), to(#2d2d2d));background-image:-webkit-linear-gradient(top, #535353, #2d2d2d);background-image:-o-linear-gradient(top, #535353, #2d2d2d);background-image:linear-gradient(to bottom, #535353, #2d2d2d);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff535353', endColorstr='#ff2d2d2d', GradientType=0);border-color:#2d2d2d #2d2d2d #070707;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#2d2d2d;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:#2d2d2d;*background-color:#202020;} +.btn-inverse:active,.btn-inverse.active{background-color:#141414 \9;} button.btn,input[type="submit"].btn{*padding-top:3px;*padding-bottom:3px;}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0;} button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px;} button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px;} button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px;} .btn-link,.btn-link:active{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:#4183c4;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.btn-link:hover{color:#4183c4;text-decoration:underline;background-color:transparent;} +.btn-link{border-color:transparent;cursor:pointer;color:#6c737e;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.btn-link:hover{color:#6c737e;text-decoration:underline;background-color:transparent;} .btn-group{position:relative;font-size:0;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:10px;margin-bottom:10px;}.btn-toolbar .btn-group{display:inline-block;*display:inline;*zoom:1;} +.btn-toolbar{font-size:0;margin-top:10.5px;margin-bottom:10.5px;}.btn-toolbar .btn-group{display:inline-block;*display:inline;*zoom:1;} .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;} @@ -517,13 +518,13 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .btn-group>.btn-small+.dropdown-toggle{*padding-top:5px;*padding-bottom:4px;} .btn-group>.btn-large+.dropdown-toggle{padding-left:12px;padding-right:12px;*padding-top:7px;*padding-bottom:7px;} .btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);} -.btn-group.open .btn.dropdown-toggle{background-color:#e6e6e6;} -.btn-group.open .btn-primary.dropdown-toggle{background-color:#4162c4;} -.btn-group.open .btn-warning.dropdown-toggle{background-color:#ff7d00;} -.btn-group.open .btn-danger.dropdown-toggle{background-color:#bd362f;} -.btn-group.open .btn-success.dropdown-toggle{background-color:#51a351;} -.btn-group.open .btn-info.dropdown-toggle{background-color:#2f96b4;} -.btn-group.open .btn-inverse.dropdown-toggle{background-color:#222222;} +.btn-group.open .btn.dropdown-toggle{background-color:#eeeeee;} +.btn-group.open .btn-primary.dropdown-toggle{background-color:#6c737e;} +.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:#3399f3;} +.btn-group.open .btn-inverse.dropdown-toggle{background-color:#2d2d2d;} .btn .caret{margin-top:8px;margin-left:0;} .btn-mini .caret,.btn-small .caret,.btn-large .caret{margin-top:6px;} .btn-large .caret{border-left-width:5px;border-right-width:5px;border-top-width:5px;} @@ -536,37 +537,37 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .btn-group-vertical .btn:last-child{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;} .btn-group-vertical .btn-large:first-child{-webkit-border-radius:6px 6px 0 0;-moz-border-radius:6px 6px 0 0;border-radius:6px 6px 0 0;} .btn-group-vertical .btn-large:last-child{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;} -.alert{padding:8px 35px 8px 14px;margin-bottom:20px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#f5f3b4;border:1px solid #f3e4a7;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#393939;} +.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:20px;} -.alert-success{background-color:#bedebe;border-color:#b4d5ad;color:#333333;} -.alert-danger,.alert-error{background-color:#ffe9e9;border-color:#ffdae0;color:#393939;} -.alert-info{background-color:#e4f0ff;border-color:#c0e7ff;color:#1b3650;} +.alert .close{position:relative;top:-2px;right:-21px;line-height:21px;} +.alert-success{background-color:#819e37;border-color:#818b30;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;} .alert-block>p,.alert-block>ul{margin-bottom:0;} .alert-block p+p{margin-top:5px;} -.nav{margin-left:0;margin-bottom:20px;list-style:none;} +.nav{margin-left:0;margin-bottom:21px;list-style:none;} .nav>li>a{display:block;} -.nav>li>a:hover{text-decoration:none;background-color:#dddddd;} +.nav>li>a:hover{text-decoration:none;background-color:#eeeeee;} .nav>.pull-right{float:right;} -.nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:20px;color:#999999;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);text-transform:uppercase;} +.nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:21px;color:#bbbbbb;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);text-transform:uppercase;} .nav li+.nav-header{margin-top:9px;} .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:#4183c4;} +.nav-list>.active>a,.nav-list>.active>a:hover{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#6c737e;} .nav-list [class^="icon-"]{margin-right:2px;} -.nav-list .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;} +.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;} .nav-tabs:after,.nav-pills:after{clear:both;} .nav-tabs>li,.nav-pills>li{float:left;} .nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px;} .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:20px;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:#dddddd #dddddd #dddddd;} -.nav-tabs>.active>a,.nav-tabs>.active>a:hover{color:#555555;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;} +.nav-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-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:#4183c4;} +.nav-pills>.active>a,.nav-pills>.active>a:hover{color:#ffffff;background-color:#6c737e;} .nav-stacked>li{float:none;} .nav-stacked>li>a{margin-right:0;} .nav-tabs.nav-stacked{border-bottom:0;} @@ -578,15 +579,15 @@ 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:#4183c4;border-bottom-color:#4183c4;margin-top:6px;} -.nav .dropdown-toggle:hover .caret{border-top-color:#4183c4;border-bottom-color:#4183c4;} +.nav .dropdown-toggle .caret{border-top-color:#6c737e;border-bottom-color:#6c737e;margin-top:6px;} +.nav .dropdown-toggle:hover .caret{border-top-color:#6c737e;border-bottom-color:#6c737e;} .nav-tabs .dropdown-toggle .caret{margin-top:8px;} .nav .active .dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff;} -.nav-tabs .active .dropdown-toggle .caret{border-top-color:#555555;border-bottom-color:#555555;} +.nav-tabs .active .dropdown-toggle .caret{border-top-color:#777777;border-bottom-color:#777777;} .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:#999999;border-color:#999999;} +.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);} -.tabs-stacked .open>a:hover{border-color:#999999;} +.tabs-stacked .open>a:hover{border-color:#bbbbbb;} .tabbable{*zoom:1;}.tabbable:before,.tabbable:after{display:table;content:"";line-height:0;} .tabbable:after{clear:both;} .tab-content{overflow:auto;} @@ -601,22 +602,22 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px;} .tabs-left>.nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd;} .tabs-left>.nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;} -.tabs-left>.nav-tabs>li>a:hover{border-color:#dddddd #dddddd #dddddd #dddddd;} +.tabs-left>.nav-tabs>li>a:hover{border-color:#eeeeee #dddddd #eeeeee #eeeeee;} .tabs-left>.nav-tabs .active>a,.tabs-left>.nav-tabs .active>a:hover{border-color:#ddd transparent #ddd #ddd;*border-right-color:#ffffff;} .tabs-right>.nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd;} .tabs-right>.nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;} -.tabs-right>.nav-tabs>li>a:hover{border-color:#dddddd #dddddd #dddddd #dddddd;} +.tabs-right>.nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #eeeeee #dddddd;} .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:#999999;} +.nav>.disabled>a{color:#bbbbbb;} .nav>.disabled>a:hover{text-decoration:none;background-color:transparent;cursor:default;} -.navbar{overflow:visible;margin-bottom:20px;color:#333333;*position:relative;*z-index:2;} -.navbar-inner{min-height:40px;padding-left:20px;padding-right:20px;background-color:#f7f7f7;background-image:-moz-linear-gradient(top, #ffffff, #eaeaea);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#eaeaea));background-image:-webkit-linear-gradient(top, #ffffff, #eaeaea);background-image:-o-linear-gradient(top, #ffffff, #eaeaea);background-image:linear-gradient(to bottom, #ffffff, #eaeaea);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeaeaea', GradientType=0);border:1px solid #cbcbcb;-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);} +.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);} .navbar .container{width:auto;} .nav-collapse.collapse{height:auto;} -.navbar .brand{float:left;display:block;padding:10px 20px 10px;margin-left:-20px;font-size:20px;font-weight:200;color:#333333;text-shadow:0 1px 0 #ffffff;}.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:#333333;text-shadow:0 1px 0 #eeeeee;}.navbar .brand:hover{text-decoration:none;} .navbar-text{margin-bottom:0;line-height:40px;} -.navbar-link{color:#333333;}.navbar-link:hover{color:#4183c4;} -.navbar .divider-vertical{height:40px;margin:0 9px;border-left:1px solid #eaeaea;border-right:1px solid #ffffff;} +.navbar-link{color:#2d2d2d;}.navbar-link:hover{color:#6c737e;} +.navbar .divider-vertical{height:40px;margin:0 9px;border-left:1px solid #bbbbbb;border-right:1px solid #eeeeee;} .navbar .btn,.navbar .btn-group{margin-top:6px;} .navbar .btn-group .btn{margin:0;} .navbar-form{margin-bottom:0;*zoom:1;}.navbar-form:before,.navbar-form:after{display:table;content:"";line-height:0;} @@ -625,7 +626,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:"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:"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-static-top{position:static;width:100%;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-fixed-bottom .navbar-inner,.navbar-static-top .navbar-inner{border:0;} @@ -637,61 +638,61 @@ 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;} .navbar .nav>li{float:left;} -.navbar .nav>li>a{float:none;padding:10px 15px 10px;color:#333333;text-decoration:none;text-shadow:0 1px 0 #ffffff;} +.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 .dropdown-toggle .caret{margin-top:8px;} -.navbar .nav>li>a:focus,.navbar .nav>li>a:hover{background-color:transparent;color:#4183c4;text-decoration:none;} -.navbar .nav>.active>a,.navbar .nav>.active>a:hover,.navbar .nav>.active>a:focus{color:#333333;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:#eaeaea;background-image:-moz-linear-gradient(top, #f2f2f2, #dddddd);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#dddddd));background-image:-webkit-linear-gradient(top, #f2f2f2, #dddddd);background-image:-o-linear-gradient(top, #f2f2f2, #dddddd);background-image:linear-gradient(to bottom, #f2f2f2, #dddddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffdddddd', GradientType=0);border-color:#dddddd #dddddd #b7b7b7;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#dddddd;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:#dddddd;*background-color:#d0d0d0;} -.navbar .btn-navbar:active,.navbar .btn-navbar.active{background-color:#c4c4c4 \9;} +.navbar .nav>li>a:focus,.navbar .nav>li>a:hover{background-color:transparent;color:#6c737e;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 .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:#333333;} -.navbar .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#333333;border-bottom-color:#333333;} -.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:#333333;border-bottom-color:#333333;} +.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 .pull-right>li>.dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right{left:auto;right:0;}.navbar .pull-right>li>.dropdown-menu:before,.navbar .nav>li>.dropdown-menu.pull-right:before{left:auto;right:12px;} .navbar .pull-right>li>.dropdown-menu:after,.navbar .nav>li>.dropdown-menu.pull-right:after{left:auto;right:13px;} .navbar .pull-right>li>.dropdown-menu .dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right .dropdown-menu{left:auto;right:100%;margin-left:0;margin-right:-1px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px;} -.navbar-inverse{color:#dddddd;}.navbar-inverse .navbar-inner{background-color:#5d5d5d;background-image:-moz-linear-gradient(top, #626262, #555555);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#626262), to(#555555));background-image:-webkit-linear-gradient(top, #626262, #555555);background-image:-o-linear-gradient(top, #626262, #555555);background-image:linear-gradient(to bottom, #626262, #555555);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff626262', endColorstr='#ff555555', GradientType=0);border-color:#252525;} -.navbar-inverse .brand,.navbar-inverse .nav>li>a{color:#dddddd;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.navbar-inverse .brand:hover,.navbar-inverse .nav>li>a:hover{color:#ffffff;} +.navbar-inverse{color:#eeeeee;}.navbar-inverse .navbar-inner{background-color:#949aa2;background-image:-moz-linear-gradient(top, #afb3ba, #6c737e);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#afb3ba), to(#6c737e));background-image:-webkit-linear-gradient(top, #afb3ba, #6c737e);background-image:-o-linear-gradient(top, #afb3ba, #6c737e);background-image:linear-gradient(to bottom, #afb3ba, #6c737e);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffafb3ba', endColorstr='#ff6c737e', GradientType=0);border-color:#606670;} +.navbar-inverse .brand,.navbar-inverse .nav>li>a{color:#eeeeee;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.navbar-inverse .brand:hover,.navbar-inverse .nav>li>a:hover{color:#ffffff;} .navbar-inverse .nav>li>a:focus,.navbar-inverse .nav>li>a:hover{background-color:transparent;color:#ffffff;} -.navbar-inverse .nav .active>a,.navbar-inverse .nav .active>a:hover,.navbar-inverse .nav .active>a:focus{color:#ffffff;background-color:#555555;} -.navbar-inverse .navbar-link{color:#dddddd;}.navbar-inverse .navbar-link:hover{color:#ffffff;} -.navbar-inverse .divider-vertical{border-left-color:#555555;border-right-color:#626262;} -.navbar-inverse .nav li.dropdown.open>.dropdown-toggle,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle{background-color:#555555;color:#ffffff;} -.navbar-inverse .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#dddddd;border-bottom-color:#dddddd;} +.navbar-inverse .nav .active>a,.navbar-inverse .nav .active>a:hover,.navbar-inverse .nav .active>a:focus{color:#ffffff;background-color:#6c737e;} +.navbar-inverse .navbar-link{color:#eeeeee;}.navbar-inverse .navbar-link:hover{color:#ffffff;} +.navbar-inverse .divider-vertical{border-left-color:#6c737e;border-right-color:#afb3ba;} +.navbar-inverse .nav li.dropdown.open>.dropdown-toggle,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle{background-color:#6c737e;color:#ffffff;} +.navbar-inverse .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#eeeeee;border-bottom-color:#eeeeee;} .navbar-inverse .nav li.dropdown.open>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;} -.navbar-inverse .navbar-search .search-query{color:#ffffff;background-color:#959595;border-color:#555555;-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:#cccccc;} +.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:#cccccc;} .navbar-inverse .navbar-search .search-query:-ms-input-placeholder{color:#cccccc;} .navbar-inverse .navbar-search .search-query::-webkit-input-placeholder{color:#cccccc;} .navbar-inverse .navbar-search .search-query:focus,.navbar-inverse .navbar-search .search-query.focused{padding:5px 15px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;} -.navbar-inverse .btn-navbar{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#505050;background-image:-moz-linear-gradient(top, #555555, #484848);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#484848));background-image:-webkit-linear-gradient(top, #555555, #484848);background-image:-o-linear-gradient(top, #555555, #484848);background-image:linear-gradient(to bottom, #555555, #484848);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff555555', endColorstr='#ff484848', GradientType=0);border-color:#484848 #484848 #222222;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#484848;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.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:#484848;*background-color:#3c3c3c;} -.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active{background-color:#2f2f2f \9;} -.breadcrumb{padding:8px 15px;margin:0 0 20px;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;} +.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;} .breadcrumb .divider{padding:0 5px;color:#ccc;} -.breadcrumb .active{color:#999999;} -.pagination{height:40px;margin:20px 0;} +.breadcrumb .active{color:#bbbbbb;} +.pagination{height:42px;margin:21px 0;} .pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);} .pagination li{display:inline;} -.pagination a,.pagination span{float:left;padding:0 14px;line-height:38px;text-decoration:none;background-color:#ffffff;border:1px solid #dddddd;border-left-width:0;} +.pagination a,.pagination span{float:left;padding:0 14px;line-height:40px;text-decoration:none;background-color:#ffffff;border:1px solid #dddddd;border-left-width:0;} .pagination a:hover,.pagination .active a,.pagination .active span{background-color:#f5f5f5;} -.pagination .active a,.pagination .active span{color:#999999;cursor:default;} -.pagination .disabled span,.pagination .disabled a,.pagination .disabled a:hover{color:#999999;background-color:transparent;cursor:default;} +.pagination .active a,.pagination .active span{color:#bbbbbb;cursor:default;} +.pagination .disabled span,.pagination .disabled a,.pagination .disabled a:hover{color:#bbbbbb;background-color:transparent;cursor:default;} .pagination li:first-child a,.pagination li:first-child span{border-left-width:1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} .pagination li:last-child a,.pagination li:last-child span{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} .pagination-centered{text-align:center;} .pagination-right{text-align:right;} -.pager{margin:20px 0;list-style:none;text-align:center;*zoom:1;}.pager:before,.pager:after{display:table;content:"";line-height:0;} +.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;} .pager a{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;} .pager a:hover{text-decoration:none;background-color:#f5f5f5;} .pager .next a{float:right;} .pager .previous a{float:left;} -.pager .disabled a,.pager .disabled a:hover{color:#999999;background-color:#fff;cursor:default;} +.pager .disabled a,.pager .disabled a:hover{color:#bbbbbb;background-color:#fff;cursor:default;} .modal-open .dropdown-menu{z-index:2050;} .modal-open .dropdown.open{*z-index:2050;} .modal-open .popover{z-index:2060;} @@ -734,28 +735,28 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .thumbnails{margin-left:-20px;list-style:none;*zoom:1;}.thumbnails:before,.thumbnails:after{display:table;content:"";line-height:0;} .thumbnails:after{clear:both;} .row-fluid .thumbnails{margin-left:0;} -.thumbnails>li{float:left;margin-bottom:20px;margin-left:20px;} -.thumbnail{display:block;padding:4px;line-height:20px;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:#4183c4;-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);} +.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:#6c737e;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} .thumbnail>img{display:block;max-width:100%;margin-left:auto;margin-right:auto;} -.thumbnail .caption{padding:9px;color:#555555;} -.label,.badge{font-size:11.844px;font-weight:bold;line-height:14px;color:#ffffff;vertical-align:baseline;white-space:nowrap;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#999999;} +.thumbnail .caption{padding:9px;color:#777777;} +.label,.badge{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{padding:1px 4px 2px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} .badge{padding:1px 9px 2px;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px;} a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} -.label-important,.badge-important{background-color:#393939;} -.label-important[href],.badge-important[href]{background-color:#202020;} -.label-warning,.badge-warning{background-color:#ff7d00;} -.label-warning[href],.badge-warning[href]{background-color:#cc6400;} -.label-success,.badge-success{background-color:#333333;} -.label-success[href],.badge-success[href]{background-color:#1a1a1a;} -.label-info,.badge-info{background-color:#1b3650;} -.label-info[href],.badge-info[href]{background-color:#0e1c2a;} +.label-important,.badge-important{background-color:#ffffff;} +.label-important[href],.badge-important[href]{background-color:#e6e6e6;} +.label-warning,.badge-warning{background-color:#d47500;} +.label-warning[href],.badge-warning[href]{background-color:#a15900;} +.label-success,.badge-success{background-color:#ffffff;} +.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;} .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:20px;margin-bottom:20px;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;} +@-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;} .progress .bar{width:0%;height:100%;color:#ffffff;float:left;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(to bottom, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;} .progress .bar+.bar{-webkit-box-shadow:inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);-moz-box-shadow:inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);} .progress-striped .bar{background-color:#149bdf;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;} @@ -766,15 +767,15 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} .progress-success.progress-striped .bar,.progress-striped .bar-success{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} .progress-info .bar,.progress .bar-info{background-color:#4bb1cf;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(to bottom, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0);} .progress-info.progress-striped .bar,.progress-striped .bar-info{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} -.progress-warning .bar,.progress .bar-warning{background-color:#ff942e;background-image:-moz-linear-gradient(top, #ffa44d, #ff7d00);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffa44d), to(#ff7d00));background-image:-webkit-linear-gradient(top, #ffa44d, #ff7d00);background-image:-o-linear-gradient(top, #ffa44d, #ff7d00);background-image:linear-gradient(to bottom, #ffa44d, #ff7d00);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffa44d', endColorstr='#ffff7d00', GradientType=0);} -.progress-warning.progress-striped .bar,.progress-striped .bar-warning{background-color:#ffa44d;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} -.accordion{margin-bottom:20px;} +.progress-warning .bar,.progress .bar-warning{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);} +.progress-warning.progress-striped .bar,.progress-striped .bar-warning{background-color:#ff9c21;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} +.accordion{margin-bottom:21px;} .accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} .accordion-heading{border-bottom:0;} .accordion-heading .accordion-toggle{display:block;padding:8px 15px;} .accordion-toggle{cursor:pointer;} .accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5;} -.carousel{position:relative;margin-bottom:20px;line-height:1;} +.carousel{position:relative;margin-bottom:21px;line-height:1;} .carousel-inner{overflow:hidden;width:100%;position:relative;} .carousel .item{display:none;position:relative;-webkit-transition:0.6s ease-in-out left;-moz-transition:0.6s ease-in-out left;-o-transition:0.6s ease-in-out left;transition:0.6s ease-in-out left;} .carousel .item>img{display:block;line-height:1;} @@ -786,14 +787,14 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} .carousel .next.left,.carousel .prev.right{left:0;} .carousel .active.left{left:-100%;} .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:#222222;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{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 h4,.carousel-caption p{color:#ffffff;line-height:20px;} +.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;background-color:#dddddd;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:inherit;letter-spacing:-1px;} -.hero-unit p{font-size:18px;font-weight:200;line-height:30px;color:inherit;} +.hero-unit{padding:60px;margin-bottom:30px;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 p{font-size:18px;font-weight:200;line-height:31.5px;color:inherit;} .pull-right{float:right;} .pull-left{float:left;} .hide{display:none;} @@ -801,53 +802,40 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} .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{font-weight:bold;}.navbar .brand:hover{color:#4183c4;} -.navbar .nav>li>a{padding:11px 10px 9px;font-weight:bold;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);} +.navbar .brand{text-shadow:0 1px 0 rgba(255, 255, 255, 0.3);}.navbar .brand:hover{color:#6c737e;} +.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-search .search-query,.navbar .navbar-search .search-query:hover{margin-bottom:0;color:#999999;-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:#999999;} -.navbar .navbar-search .search-query:-ms-input-placeholder,.navbar .navbar-search .search-query:hover:-ms-input-placeholder{color:#999999;} -.navbar .navbar-search .search-query::-webkit-input-placeholder,.navbar .navbar-search .search-query:hover::-webkit-input-placeholder{color:#999999;} -.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:#333333;} +.navbar .navbar-search .search-query,.navbar .navbar-search .search-query:hover{margin-bottom:0;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 .nav-collapse.collapse .navbar-search{border-top:none;border-bottom:none;} -.navbar .nav-collapse.collapse >.nav li>a:hover{background-color:#4183c4;color:#ffffff;text-shadow:none;} -.navbar-inverse .brand{text-shadow:0 -1px 0 rgba(0, 0, 0, 0.5);}.navbar-inverse .brand:hover{color:#ffffff;} -.navbar-inverse .nav>li>a{text-shadow:0 -1px 0 rgba(0, 0, 0, 0.5);} +.navbar .nav-collapse.collapse >.nav li>a:hover{background-color:#6c737e;color:#ffffff;text-shadow:none;} +.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 .nav-collapse.collapse .nav li>a,.navbar-inverse .nav-collapse.collapse .nav-header{color:#dddddd;} -div.subnav .nav>li>a{font-weight:bold;color:#333333;}div.subnav .nav>li>a:hover{color:#4183c4;} -div.subnav .nav>li.active>a{color:#333333;}div.subnav .nav>li.active>a:hover{color:#333333;} +.navbar-inverse .nav-collapse.collapse .nav li>a,.navbar-inverse .nav-collapse.collapse .nav-header{color:#eeeeee;} +div.subnav .nav>li>a{color:#2d2d2d;}div.subnav .nav>li>a:hover{color:#6c737e;} +div.subnav .nav>li.active>a{color:#2d2d2d;}div.subnav .nav>li.active>a:hover{color:#2d2d2d;} 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:#333333;}div.subnav .nav>li.dropdown.open>.dropdown-toggle:hover{color:#4183c4;} -.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 #333333;border-top-color:#333333;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 #4183c4;border-top-color:#4183c4;} -.btn{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#f1f1f1;background-image:-moz-linear-gradient(top, #f4f4f4, #ececec);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f4f4f4), to(#ececec));background-image:-webkit-linear-gradient(top, #f4f4f4, #ececec);background-image:-o-linear-gradient(top, #f4f4f4, #ececec);background-image:linear-gradient(to bottom, #f4f4f4, #ececec);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff4f4f4', endColorstr='#ffececec', GradientType=0);border-color:#ececec #ececec #c6c6c6;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#ececec;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);color:#333333;text-shadow:none;}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#ffffff;background-color:#ececec;*background-color:#dfdfdf;} -.btn:active,.btn.active{background-color:#d3d3d3 \9;} -.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333333;} -.btn-primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#707070;background-image:-moz-linear-gradient(top, #909090, #3f3f3f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#909090), to(#3f3f3f));background-image:-webkit-linear-gradient(top, #909090, #3f3f3f);background-image:-o-linear-gradient(top, #909090, #3f3f3f);background-image:linear-gradient(to bottom, #909090, #3f3f3f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff909090', endColorstr='#ff3f3f3f', GradientType=0);border-color:#3f3f3f #3f3f3f #191919;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#3f3f3f;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:#3f3f3f;*background-color:#323232;} -.btn-primary:active,.btn-primary.active{background-color:#262626 \9;} -.btn-warning{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#fbd627;background-image:-moz-linear-gradient(top, #ffde42, #f4ca00);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffde42), to(#f4ca00));background-image:-webkit-linear-gradient(top, #ffde42, #f4ca00);background-image:-o-linear-gradient(top, #ffde42, #f4ca00);background-image:linear-gradient(to bottom, #ffde42, #f4ca00);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffde42', endColorstr='#fff4ca00', GradientType=0);border-color:#f4ca00 #f4ca00 #a88b00;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#f4ca00;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:#f4ca00;*background-color:#dbb500;} -.btn-warning:active,.btn-warning.active{background-color:#c1a000 \9;} -.btn-danger{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#e15454;background-image:-moz-linear-gradient(top, #e56e6e, #da2d2d);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#e56e6e), to(#da2d2d));background-image:-webkit-linear-gradient(top, #e56e6e, #da2d2d);background-image:-o-linear-gradient(top, #e56e6e, #da2d2d);background-image:linear-gradient(to bottom, #e56e6e, #da2d2d);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe56e6e', endColorstr='#ffda2d2d', GradientType=0);border-color:#da2d2d #da2d2d #9f1c1c;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#da2d2d;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:#da2d2d;*background-color:#ca2424;} -.btn-danger:active,.btn-danger.active{background-color:#b42020 \9;} -.btn-success{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#79cb5d;background-image:-moz-linear-gradient(top, #8add6d, #60b044);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#8add6d), to(#60b044));background-image:-webkit-linear-gradient(top, #8add6d, #60b044);background-image:-o-linear-gradient(top, #8add6d, #60b044);background-image:linear-gradient(to bottom, #8add6d, #60b044);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff8add6d', endColorstr='#ff60b044', GradientType=0);border-color:#60b044 #60b044 #42792f;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#60b044;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:#60b044;*background-color:#569e3d;} -.btn-success:active,.btn-success.active{background-color:#4c8b36 \9;} -.btn-info{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#669dc7;background-image:-moz-linear-gradient(top, #7caccf, #4488bb);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#7caccf), to(#4488bb));background-image:-webkit-linear-gradient(top, #7caccf, #4488bb);background-image:-o-linear-gradient(top, #7caccf, #4488bb);background-image:linear-gradient(to bottom, #7caccf, #4488bb);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff7caccf', endColorstr='#ff4488bb', GradientType=0);border-color:#4488bb #4488bb #305f83;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#4488bb;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:#4488bb;*background-color:#3d7aa8;} -.btn-info:active,.btn-info.active{background-color:#366d96 \9;} -.btn-inverse{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#466274;background-image:-moz-linear-gradient(top, #4a687a, #405a6a);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#4a687a), to(#405a6a));background-image:-webkit-linear-gradient(top, #4a687a, #405a6a);background-image:-o-linear-gradient(top, #4a687a, #405a6a);background-image:linear-gradient(to bottom, #4a687a, #405a6a);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff4a687a', endColorstr='#ff405a6a', GradientType=0);border-color:#405a6a #405a6a #23323a;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#405a6a;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:#405a6a;*background-color:#364d5a;} -.btn-inverse:active,.btn-inverse.active{background-color:#2d3f4a \9;} +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:#6c737e;} +.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 #6c737e;border-top-color:#6c737e;} .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;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 .checkbox:focus,.control-group.warning .radio:focus,.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;} -.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#e29235;background-color:#f5f3b4;border-color:#e29235;} +.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#e29235;background-color:#d47500;border-color:#e29235;} .control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#cc0000;} .control-group.error .checkbox,.control-group.error .radio,.control-group.error input,.control-group.error select,.control-group.error textarea{color:#cc0000;border-color:#cc0000;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.control-group.error .checkbox:focus,.control-group.error .radio:focus,.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#990000;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ff3333;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ff3333;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ff3333;} -.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#cc0000;background-color:#ffe9e9;border-color:#cc0000;} +.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#cc0000;background-color:#cd0200;border-color:#cc0000;} .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;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 .checkbox:focus,.control-group.success .radio:focus,.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:#bedebe;border-color:#2ba949;} -.label-important,.badge-important{background-color:#BD2C00;} -.label-warning,.badge-warning{background-color:#E3E84D;} -.label-success,.badge-success{background-color:#6CC644;} -.label-info,.badge-info{background-color:#4183C4;} +.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);} +.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-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);} .pull-right{float:right;} .pull-left{float:left;} diff --git a/spacelab/bootswatch.less b/spacelab/bootswatch.less index 068f1ed3..5654b6a6 100755 --- a/spacelab/bootswatch.less +++ b/spacelab/bootswatch.less @@ -6,6 +6,8 @@ // TYPOGRAPHY // ----------------------------------------------------- +@import url('http://fonts.googleapis.com/css?family=Muli'); + // SCAFFOLDING // ----------------------------------------------------- @@ -20,7 +22,8 @@ } .brand { - font-weight: bold; + + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.3); &:hover { color: @linkColor; @@ -29,8 +32,7 @@ .nav > li > a { padding: 11px 10px 9px; - font-weight: bold; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.3); } .navbar-text { @@ -65,12 +67,12 @@ color: @white; text-shadow: none; } - } &-inverse { + .brand { - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.5); + text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3); &:hover { color: @white; @@ -78,7 +80,7 @@ } .nav > li > a { - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.5); + text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3); } .nav li.dropdown.open > .dropdown-toggle .caret, @@ -99,7 +101,7 @@ div.subnav { .nav > li > a { - font-weight: bold; + color: @textColor; &:hover { @@ -108,6 +110,7 @@ div.subnav { } .nav > li.active > a { + color: @textColor; &:hover { @@ -120,6 +123,7 @@ div.subnav { } .nav > li.dropdown.open > .dropdown-toggle { + border-left: 1px solid whiteSmoke; border-right: 1px solid #E5E5E5; color: @textColor; @@ -153,7 +157,7 @@ div.subnav { // BUTTONS // ----------------------------------------------------- -.btn { +/*.btn { .buttonBackground(#F4F4F4, #ECECEC); color: @textColor; text-shadow: none; @@ -190,7 +194,7 @@ div.subnav { .btn-inverse { .buttonBackground(lighten(@purple, 5%), @purple); -} +}*/ // TABLES // ----------------------------------------------------- @@ -216,13 +220,38 @@ div.subnav { // ALERTS, LABELS, BADGES // ----------------------------------------------------- +.alert { + color: @white; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); +} + +.label, .badge { + + padding-top: 4px; + + &-important { + background-color: @red; + } + + &-warning { + background-color: @orange; + } + + &-success { + background-color: @green; + } + + &-info { + background-color: @blue; + } +} + // MISC // ----------------------------------------------------- -.label-important, .badge-important { background-color: #BD2C00; } -.label-warning, .badge-warning { background-color: #E3E84D; } -.label-success, .badge-success { background-color: #6CC644; } -.label-info, .badge-info { background-color: #4183C4; } +.well { + background-color: @grayLighter; +} .hero-unit { .box-shadow(inset 0 1px 1px rgba(0,0,0,.05)); diff --git a/spacelab/variables.less b/spacelab/variables.less index 587c85fa..1403edd9 100755 --- a/spacelab/variables.less +++ b/spacelab/variables.less @@ -12,22 +12,22 @@ // Grays // ------------------------- @black: #000; -@grayDarker: #222; +@grayDarker: #2D2D2D; @grayDark: #333; -@gray: #555; -@grayLight: #999; -@grayLighter: #ddd; +@gray: #777; +@grayLight: #bbb; +@grayLighter: #eee; @white: #fff; // Accent colors // ------------------------- -@blue: #4183C4; +@blue: #3399F3; @blueDark: #405A6A; -@green: #84DE81; -@red: #E5322C; +@green: #819E37; +@red: #CD0200; @yellow: #F4CA00; -@orange: #FF7D00; +@orange: #D47500; @pink: #F44B8C; @purple: #405A6A; @@ -35,28 +35,28 @@ // Scaffolding // ------------------------- @bodyBackground: @white; -@textColor: @grayDark; +@textColor: @grayDarker; // Links // ------------------------- -@linkColor: #4183C4; +@linkColor: #6C737E; @linkColorHover: @linkColor; // Typography // ------------------------- -@sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif; +@sansFontFamily: "Muli", "Helvetica Neue", Helvetica, Arial, sans-serif; @serifFontFamily: Georgia, "Times New Roman", Times, serif; @monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace; @baseFontSize: 14px; @baseFontFamily: @sansFontFamily; -@baseLineHeight: 20px; +@baseLineHeight: 21px; @altFontFamily: @serifFontFamily; @headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily -@headingsFontWeight: bold; // instead of browser default, bold +@headingsFontWeight: normal; // instead of browser default, bold @headingsColor: inherit; // empty to use BS default, @textColor @@ -71,25 +71,25 @@ // Buttons // ------------------------- @btnBackground: @white; -@btnBackgroundHighlight: darken(@white, 10%); -@btnBorder: darken(@white, 20%); +@btnBackgroundHighlight: @grayLighter; +@btnBorder: darken(@btnBackground, 20%); -@btnPrimaryBackground: @linkColor; -@btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 15%); +@btnPrimaryBackground: lighten(@linkColor, 15%); +@btnPrimaryBackgroundHighlight: @linkColor; -@btnInfoBackground: #5bc0de; -@btnInfoBackgroundHighlight: #2f96b4; +@btnInfoBackground: lighten(@blue, 15%); +@btnInfoBackgroundHighlight: @blue; -@btnSuccessBackground: #62c462; -@btnSuccessBackgroundHighlight: #51a351; +@btnSuccessBackground: lighten(@green, 15%); +@btnSuccessBackgroundHighlight: @green; @btnWarningBackground: lighten(@orange, 15%); @btnWarningBackgroundHighlight: @orange; -@btnDangerBackground: #ee5f5b; -@btnDangerBackgroundHighlight: #bd362f; +@btnDangerBackground: lighten(@red, 15%); +@btnDangerBackgroundHighlight: @red; -@btnInverseBackground: @gray; +@btnInverseBackground: lighten(@grayDarker, 15%); @btnInverseBackgroundHighlight: @grayDarker; @@ -159,9 +159,9 @@ @navbarCollapseWidth: 979px; @navbarHeight: 40px; -@navbarBackground: #EAEAEA; -@navbarBackgroundHighlight: lighten(@navbarBackground, 15%); -@navbarBorder: darken(@navbarBackground, 12%); +@navbarBackground: @grayLight; +@navbarBackgroundHighlight: #eee; +@navbarBorder: darken(@navbarBackground, 5%); @navbarText: @textColor; @navbarLinkColor: @textColor; @@ -173,9 +173,9 @@ @navbarBrandColor: @grayDark; // Inverted navbar -@navbarInverseBackground: @gray; -@navbarInverseBackgroundHighlight: lighten(@navbarInverseBackground, 5%); -@navbarInverseBorder: #252525; +@navbarInverseBackground: @linkColor; +@navbarInverseBackgroundHighlight: lighten(@navbarInverseBackground, 25%); +@navbarInverseBorder: darken(@navbarInverseBackground, 5%); @navbarInverseText: @grayLighter; @navbarInverseLinkColor: @grayLighter; @@ -208,20 +208,20 @@ // Form states and alerts // ------------------------- -@warningText: #393939; -@warningBackground: #F5F3B4; +@warningText: @white; +@warningBackground: @orange; @warningBorder: darken(spin(@warningBackground, -10), 3%); -@errorText: @warningText; -@errorBackground: #FFE9E9; +@errorText: @white; +@errorBackground: @red; @errorBorder: darken(spin(@errorBackground, -10), 3%); -@successText: #333; -@successBackground: #BEDEBE; +@successText: @white; +@successBackground: @green; @successBorder: darken(spin(@successBackground, -10), 5%); -@infoText: #1B3650; -@infoBackground: #E4F0FF; +@infoText: @white; +@infoBackground: @blue; @infoBorder: darken(spin(@infoBackground, -10), 7%); -- cgit v1.2.3