diff options
| -rw-r--r-- | simplex/bootstrap.css | 909 | ||||
| -rw-r--r-- | simplex/bootstrap.min.css | 296 | ||||
| -rwxr-xr-x | simplex/bootswatch.less | 344 | ||||
| -rwxr-xr-x | simplex/variables.less | 50 |
4 files changed, 829 insertions, 770 deletions
diff --git a/simplex/bootstrap.css b/simplex/bootstrap.css index cc4943cb..600c6e7f 100644 --- a/simplex/bootstrap.css +++ b/simplex/bootstrap.css @@ -1,3 +1,4 @@ +@import url('http://fonts.googleapis.com/css?family=Josefin+Sans:300,400,700'); /*! * Bootstrap v2.0.4 * @@ -133,18 +134,18 @@ textarea { } body { margin: 0; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; + font-family: "Josefin Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 15px; + line-height: 20px; color: #555555; - background-color: #f3f3f3; + background-color: #f7f7f7; } a { - color: #366ddc; + color: #da370f; text-decoration: none; } a:hover { - color: #1d4ba8; + color: #da370f; text-decoration: underline; } .row { @@ -342,17 +343,17 @@ a:hover { clear: both; } p { - margin: 0 0 9px; + margin: 0 0 10px; } p small { - font-size: 11px; + font-size: 13px; color: #999999; } .lead { - margin-bottom: 18px; + margin-bottom: 20px; font-size: 20px; font-weight: 200; - line-height: 27px; + line-height: 30px; } h1, h2, @@ -363,7 +364,7 @@ h6 { margin: 0; font-family: inherit; font-weight: bold; - color: #333333; + color: inherit; text-rendering: optimizelegibility; } h1 small, @@ -377,21 +378,21 @@ h6 small { } h1 { font-size: 30px; - line-height: 36px; + line-height: 40px; } h1 small { font-size: 18px; } h2 { font-size: 24px; - line-height: 36px; + line-height: 40px; } h2 small { font-size: 18px; } h3 { font-size: 18px; - line-height: 27px; + line-height: 30px; } h3 small { font-size: 14px; @@ -399,7 +400,7 @@ h3 small { h4, h5, h6 { - line-height: 18px; + line-height: 20px; } h4 { font-size: 14px; @@ -416,8 +417,8 @@ h6 { text-transform: uppercase; } .page-header { - padding-bottom: 17px; - margin: 18px 0; + padding-bottom: 19px; + margin: 20px 0; border-bottom: 1px solid #eeeeee; } .page-header h1 { @@ -426,7 +427,7 @@ h6 { ul, ol { padding: 0; - margin: 0 0 9px 25px; + margin: 0 0 10px 25px; } ul ul, ul ol, @@ -441,7 +442,7 @@ ol { list-style: decimal; } li { - line-height: 18px; + line-height: 20px; } ul.unstyled, ol.unstyled { @@ -449,18 +450,18 @@ ol.unstyled { list-style: none; } dl { - margin-bottom: 18px; + margin-bottom: 20px; } dt, dd { - line-height: 18px; + line-height: 20px; } dt { font-weight: bold; - line-height: 17px; + line-height: 19px; } dd { - margin-left: 9px; + margin-left: 10px; } .dl-horizontal dt { float: left; @@ -475,7 +476,7 @@ dd { margin-left: 130px; } hr { - margin: 18px 0; + margin: 20px 0; border: 0; border-top: 1px solid #eeeeee; border-bottom: 1px solid #ffffff; @@ -499,18 +500,18 @@ abbr.initialism { } blockquote { padding: 0 0 0 15px; - margin: 0 0 18px; + margin: 0 0 20px; border-left: 5px solid #eeeeee; } blockquote p { margin-bottom: 0; font-size: 16px; font-weight: 300; - line-height: 22.5px; + line-height: 25px; } blockquote small { display: block; - line-height: 18px; + line-height: 20px; color: #999999; } blockquote small:before { @@ -535,9 +536,9 @@ blockquote:after { } address { display: block; - margin-bottom: 18px; + margin-bottom: 20px; font-style: normal; - line-height: 18px; + line-height: 20px; } small { font-size: 100%; @@ -549,7 +550,7 @@ code, pre { padding: 0 3px 2px; font-family: Menlo, Monaco, Consolas, "Courier New", monospace; - font-size: 12px; + font-size: 14px; color: #333333; -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -563,10 +564,10 @@ code { } pre { display: block; - padding: 8.5px; - margin: 0 0 9px; - font-size: 12.025px; - line-height: 18px; + padding: 9.5px; + margin: 0 0 10px; + font-size: 13.875px; + line-height: 20px; word-break: break-all; word-wrap: break-word; white-space: pre; @@ -579,7 +580,7 @@ pre { border-radius: 4px; } pre.prettyprint { - margin-bottom: 18px; + margin-bottom: 20px; } pre code { padding: 0; @@ -592,7 +593,7 @@ pre code { overflow-y: scroll; } form { - margin: 0 0 18px; + margin: 0 0 20px; } fieldset { padding: 0; @@ -603,15 +604,15 @@ legend { display: block; width: 100%; padding: 0; - margin-bottom: 27px; - font-size: 19.5px; - line-height: 36px; + margin-bottom: 30px; + font-size: 22.5px; + line-height: 40px; color: #333333; border: 0; border-bottom: 1px solid #e5e5e5; } legend small { - font-size: 13.5px; + font-size: 15px; color: #999999; } label, @@ -619,15 +620,15 @@ input, button, select, textarea { - font-size: 13px; + font-size: 15px; font-weight: normal; - line-height: 18px; + line-height: 20px; } input, button, select, textarea { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Josefin Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; } label { display: block; @@ -651,11 +652,11 @@ input[type="tel"], input[type="color"], .uneditable-input { display: inline-block; - height: 18px; + height: 20px; padding: 4px; margin-bottom: 9px; - font-size: 13px; - line-height: 18px; + font-size: 15px; + line-height: 20px; color: #555555; } input, @@ -888,31 +889,31 @@ input[type="checkbox"][readonly] { .control-group.warning > label, .control-group.warning .help-block, .control-group.warning .help-inline { - color: #ff6600; + color: #da370f; } .control-group.warning .checkbox, .control-group.warning .radio, .control-group.warning input, .control-group.warning select, .control-group.warning textarea { - color: #ff6600; - border-color: #ff6600; + color: #da370f; + border-color: #da370f; } .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: #cc5200; - -webkit-box-shadow: 0 0 6px #ffa366; - -moz-box-shadow: 0 0 6px #ffa366; - box-shadow: 0 0 6px #ffa366; + border-color: #aa2b0c; + -webkit-box-shadow: 0 0 6px #f4795b; + -moz-box-shadow: 0 0 6px #f4795b; + box-shadow: 0 0 6px #f4795b; } .control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on { - color: #ff6600; + color: #da370f; background-color: #fcf8e3; - border-color: #ff6600; + border-color: #da370f; } .control-group.error > label, .control-group.error .help-block, @@ -987,9 +988,9 @@ select:focus:required:invalid:focus { box-shadow: 0 0 6px #f8b9b7; } .form-actions { - padding: 17px 20px 18px; - margin-top: 18px; - margin-bottom: 18px; + padding: 19px 20px 20px; + margin-top: 20px; + margin-bottom: 20px; background-color: #f5f5f5; border-top: 1px solid #e5e5e5; *zoom: 1; @@ -1027,7 +1028,7 @@ select:focus:required:invalid:focus { } .help-block { display: block; - margin-bottom: 9px; + margin-bottom: 10px; } .help-inline { display: inline-block; @@ -1072,11 +1073,11 @@ select:focus:required:invalid:focus { .input-append .add-on { display: inline-block; width: auto; - height: 18px; + height: 20px; min-width: 16px; padding: 4px 5px; font-weight: normal; - line-height: 18px; + line-height: 20px; text-align: center; text-shadow: 0 1px 0 #ffffff; vertical-align: middle; @@ -1217,14 +1218,14 @@ select:focus:required:invalid:focus { margin-left: 0; } .control-group { - margin-bottom: 9px; + margin-bottom: 10px; } legend + .control-group { - margin-top: 18px; + margin-top: 20px; -webkit-margin-top-collapse: separate; } .form-horizontal .control-group { - margin-bottom: 18px; + margin-bottom: 20px; *zoom: 1; } .form-horizontal .control-group:before, @@ -1251,7 +1252,7 @@ legend + .control-group { *padding-left: 160px; } .form-horizontal .help-block { - margin-top: 9px; + margin-top: 10px; margin-bottom: 0; } .form-horizontal .form-actions { @@ -1265,12 +1266,12 @@ table { } .table { width: 100%; - margin-bottom: 18px; + margin-bottom: 20px; } .table th, .table td { padding: 8px; - line-height: 18px; + line-height: 20px; text-align: left; vertical-align: top; border-top: 1px solid #dddddd; @@ -1979,7 +1980,7 @@ table .span24 { .dropdown-menu .divider { *width: 100%; height: 1px; - margin: 8px 1px; + margin: 9px 1px; *margin: -5px 0 5px; overflow: hidden; background-color: #e5e5e5; @@ -1990,16 +1991,16 @@ table .span24 { padding: 3px 15px; clear: both; font-weight: normal; - line-height: 18px; - color: #333333; + line-height: 20px; + color: #555555; white-space: nowrap; } .dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover { - color: #ffffff; + color: #da370f; text-decoration: none; - background-color: #366ddc; + background-color: #fbebe9; } .open { *z-index: 1000; @@ -2087,7 +2088,7 @@ table .span24 { float: right; font-size: 20px; font-weight: bold; - line-height: 18px; + line-height: 20px; color: #000000; text-shadow: 0 1px 0 #ffffff; opacity: 0.2; @@ -2115,8 +2116,8 @@ button.close { *zoom: 1; padding: 4px 10px 4px; margin-bottom: 0; - font-size: 13px; - line-height: 18px; + font-size: 15px; + line-height: 20px; *line-height: 20px; color: #333333; text-align: center; @@ -2206,7 +2207,7 @@ button.close { } .btn-large { padding: 9px 14px; - font-size: 15px; + font-size: 17px; line-height: normal; -webkit-border-radius: 5px; -moz-border-radius: 5px; @@ -2217,16 +2218,16 @@ button.close { } .btn-small { padding: 5px 9px; - font-size: 11px; - line-height: 16px; + font-size: 13px; + line-height: 18px; } .btn-small [class^="icon-"] { margin-top: -1px; } .btn-mini { padding: 2px 6px; - font-size: 11px; - line-height: 14px; + font-size: 13px; + line-height: 16px; } .btn-primary, .btn-primary:hover, @@ -2256,18 +2257,18 @@ button.close { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } .btn-primary { - background-color: #365cdc; - background-image: -moz-linear-gradient(top, #366ddc, #3644dc); - background-image: -ms-linear-gradient(top, #366ddc, #3644dc); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#366ddc), to(#3644dc)); - background-image: -webkit-linear-gradient(top, #366ddc, #3644dc); - background-image: -o-linear-gradient(top, #366ddc, #3644dc); - background-image: linear-gradient(top, #366ddc, #3644dc); + background-color: #e63c12; + background-image: -moz-linear-gradient(top, #ef3f14, #da370f); + background-image: -ms-linear-gradient(top, #ef3f14, #da370f); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ef3f14), to(#da370f)); + background-image: -webkit-linear-gradient(top, #ef3f14, #da370f); + background-image: -o-linear-gradient(top, #ef3f14, #da370f); + background-image: linear-gradient(top, #ef3f14, #da370f); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#366ddc', endColorstr='#3644dc', GradientType=0); - border-color: #3644dc #3644dc #1d29a8; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ef3f14', endColorstr='#da370f', GradientType=0); + border-color: #da370f #da370f #92250a; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #3644dc; + *background-color: #da370f; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2277,26 +2278,26 @@ button.close { .btn-primary.active, .btn-primary.disabled, .btn-primary[disabled] { - background-color: #3644dc; - *background-color: #2533d4; + background-color: #da370f; + *background-color: #c2310d; } .btn-primary:active, .btn-primary.active { - background-color: #212ebe \9; + background-color: #aa2b0c \9; } .btn-warning { - background-color: #ff822e; - background-image: -moz-linear-gradient(top, #ff944d, #ff6600); - background-image: -ms-linear-gradient(top, #ff944d, #ff6600); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ff944d), to(#ff6600)); - background-image: -webkit-linear-gradient(top, #ff944d, #ff6600); - background-image: -o-linear-gradient(top, #ff944d, #ff6600); - background-image: linear-gradient(top, #ff944d, #ff6600); + background-color: #ffce36; + background-image: -moz-linear-gradient(top, #ffd041, #ffca27); + background-image: -ms-linear-gradient(top, #ffd041, #ffca27); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffd041), to(#ffca27)); + background-image: -webkit-linear-gradient(top, #ffd041, #ffca27); + background-image: -o-linear-gradient(top, #ffd041, #ffca27); + background-image: linear-gradient(top, #ffd041, #ffca27); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff944d', endColorstr='#ff6600', GradientType=0); - border-color: #ff6600 #ff6600 #b34700; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd041', endColorstr='#ffca27', GradientType=0); + border-color: #ffca27 #ffca27 #d9a400; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #ff6600; + *background-color: #ffca27; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2306,26 +2307,26 @@ button.close { .btn-warning.active, .btn-warning.disabled, .btn-warning[disabled] { - background-color: #ff6600; - *background-color: #e65c00; + background-color: #ffca27; + *background-color: #ffc40d; } .btn-warning:active, .btn-warning.active { - background-color: #cc5200 \9; + background-color: #f3b700 \9; } .btn-danger { - background-color: #da4f49; - background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -ms-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(top, #ee5f5b, #bd362f); + background-color: #e53a48; + background-image: -moz-linear-gradient(top, #e64350, #e32c3b); + background-image: -ms-linear-gradient(top, #e64350, #e32c3b); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#e64350), to(#e32c3b)); + background-image: -webkit-linear-gradient(top, #e64350, #e32c3b); + background-image: -o-linear-gradient(top, #e64350, #e32c3b); + background-image: linear-gradient(top, #e64350, #e32c3b); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); - border-color: #bd362f #bd362f #802420; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e64350', endColorstr='#e32c3b', GradientType=0); + border-color: #e32c3b #e32c3b #ac1723; 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: #e32c3b; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2335,26 +2336,26 @@ button.close { .btn-danger.active, .btn-danger.disabled, .btn-danger[disabled] { - background-color: #bd362f; - *background-color: #a9302a; + background-color: #e32c3b; + *background-color: #d91d2c; } .btn-danger:active, .btn-danger.active { - background-color: #942a25 \9; + background-color: #c21a28 \9; } .btn-success { - background-color: #5bb75b; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-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(top, #62c462, #51a351); + background-color: #43a300; + background-image: -moz-linear-gradient(top, #48ae00, #3d9400); + background-image: -ms-linear-gradient(top, #48ae00, #3d9400); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#48ae00), to(#3d9400)); + background-image: -webkit-linear-gradient(top, #48ae00, #3d9400); + background-image: -o-linear-gradient(top, #48ae00, #3d9400); + background-image: linear-gradient(top, #48ae00, #3d9400); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); - border-color: #51a351 #51a351 #387038; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#48ae00', endColorstr='#3d9400', GradientType=0); + border-color: #3d9400 #3d9400 #1d4800; 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: #3d9400; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2364,26 +2365,26 @@ button.close { .btn-success.active, .btn-success.disabled, .btn-success[disabled] { - background-color: #51a351; - *background-color: #499249; + background-color: #3d9400; + *background-color: #327b00; } .btn-success:active, .btn-success.active { - background-color: #408140 \9; + background-color: #286100 \9; } .btn-info { - background-color: #49afcd; - background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -ms-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(top, #5bc0de, #2f96b4); + background-color: #68c5e1; + background-image: -moz-linear-gradient(top, #70c8e2, #5bc0de); + background-image: -ms-linear-gradient(top, #70c8e2, #5bc0de); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#70c8e2), to(#5bc0de)); + background-image: -webkit-linear-gradient(top, #70c8e2, #5bc0de); + background-image: -o-linear-gradient(top, #70c8e2, #5bc0de); + background-image: linear-gradient(top, #70c8e2, #5bc0de); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); - border-color: #2f96b4 #2f96b4 #1f6377; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#70c8e2', endColorstr='#5bc0de', GradientType=0); + border-color: #5bc0de #5bc0de #28a1c5; 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: #5bc0de; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -2393,12 +2394,12 @@ button.close { .btn-info.active, .btn-info.disabled, .btn-info[disabled] { - background-color: #2f96b4; - *background-color: #2a85a0; + background-color: #5bc0de; + *background-color: #46b8da; } .btn-info:active, .btn-info.active { - background-color: #24748c \9; + background-color: #31b0d5 \9; } .btn-inverse { background-color: #454545; @@ -2474,8 +2475,8 @@ input[type="submit"].btn.btn-mini { margin-left: 5px; } .btn-toolbar { - margin-top: 9px; - margin-bottom: 9px; + margin-top: 10px; + margin-bottom: 10px; } .btn-toolbar .btn-group { display: inline-block; @@ -2569,19 +2570,19 @@ input[type="submit"].btn.btn-mini { background-color: #e6e6e6; } .btn-group.open .btn-primary.dropdown-toggle { - background-color: #3644dc; + background-color: #da370f; } .btn-group.open .btn-warning.dropdown-toggle { - background-color: #ff6600; + background-color: #ffca27; } .btn-group.open .btn-danger.dropdown-toggle { - background-color: #bd362f; + background-color: #e32c3b; } .btn-group.open .btn-success.dropdown-toggle { - background-color: #51a351; + background-color: #3d9400; } .btn-group.open .btn-info.dropdown-toggle { - background-color: #2f96b4; + background-color: #5bc0de; } .btn-group.open .btn-inverse.dropdown-toggle { background-color: #2c2c2c; @@ -2624,14 +2625,14 @@ input[type="submit"].btn.btn-mini { } .alert { padding: 8px 35px 8px 14px; - margin-bottom: 18px; + margin-bottom: 20px; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); background-color: #fcf8e3; border: 1px solid #fbeed5; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - color: #ff6600; + color: #da370f; } .alert-heading { color: inherit; @@ -2656,7 +2657,7 @@ input[type="submit"].btn.btn-mini { .alert-info { background-color: #d9edf7; border-color: #bce8f1; - color: #1155cc; + color: #029acf; } .alert-block { padding-top: 14px; @@ -2671,7 +2672,7 @@ input[type="submit"].btn.btn-mini { } .nav { margin-left: 0; - margin-bottom: 18px; + margin-bottom: 20px; list-style: none; } .nav > li > a { @@ -2689,7 +2690,7 @@ input[type="submit"].btn.btn-mini { padding: 3px 15px; font-size: 11px; font-weight: bold; - line-height: 18px; + line-height: 20px; color: #999999; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); text-transform: uppercase; @@ -2715,7 +2716,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: #366ddc; + background-color: #da370f; } .nav-list [class^="icon-"] { margin-right: 2px; @@ -2723,7 +2724,7 @@ input[type="submit"].btn.btn-mini { .nav-list .divider { *width: 100%; height: 1px; - margin: 8px 1px; + margin: 9px 1px; *margin: -5px 0 5px; overflow: hidden; background-color: #e5e5e5; @@ -2764,7 +2765,7 @@ input[type="submit"].btn.btn-mini { .nav-tabs > li > a { padding-top: 8px; padding-bottom: 8px; - line-height: 18px; + line-height: 20px; border: 1px solid transparent; -webkit-border-radius: 4px 4px 0 0; -moz-border-radius: 4px 4px 0 0; @@ -2793,7 +2794,7 @@ input[type="submit"].btn.btn-mini { .nav-pills > .active > a, .nav-pills > .active > a:hover { color: #ffffff; - background-color: #366ddc; + background-color: #da370f; } .nav-stacked > li { float: none; @@ -2842,14 +2843,14 @@ input[type="submit"].btn.btn-mini { } .nav-tabs .dropdown-toggle .caret, .nav-pills .dropdown-toggle .caret { - border-top-color: #366ddc; - border-bottom-color: #366ddc; + border-top-color: #da370f; + border-bottom-color: #da370f; margin-top: 6px; } .nav-tabs .dropdown-toggle:hover .caret, .nav-pills .dropdown-toggle:hover .caret { - border-top-color: #1d4ba8; - border-bottom-color: #1d4ba8; + border-top-color: #da370f; + border-bottom-color: #da370f; } .nav-tabs .active .dropdown-toggle .caret, .nav-pills .active .dropdown-toggle .caret { @@ -2977,21 +2978,21 @@ input[type="submit"].btn.btn-mini { *position: relative; *z-index: 2; overflow: visible; - margin-bottom: 18px; + margin-bottom: 20px; } .navbar-inner { min-height: 40px; padding-left: 20px; padding-right: 20px; - background-color: #f8f8f8; - background-image: -moz-linear-gradient(top, #f8f8f8, #f8f8f8); - background-image: -ms-linear-gradient(top, #f8f8f8, #f8f8f8); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f8f8f8), to(#f8f8f8)); - background-image: -webkit-linear-gradient(top, #f8f8f8, #f8f8f8); - background-image: -o-linear-gradient(top, #f8f8f8, #f8f8f8); - background-image: linear-gradient(top, #f8f8f8, #f8f8f8); + background-color: #fefefe; + background-image: -moz-linear-gradient(top, #fefefe, #fefefe); + background-image: -ms-linear-gradient(top, #fefefe, #fefefe); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fefefe), to(#fefefe)); + background-image: -webkit-linear-gradient(top, #fefefe, #fefefe); + background-image: -o-linear-gradient(top, #fefefe, #fefefe); + background-image: linear-gradient(top, #fefefe, #fefefe); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f8f8f8', endColorstr='#f8f8f8', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fefefe', endColorstr='#fefefe', GradientType=0); -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -3019,7 +3020,7 @@ input[type="submit"].btn.btn-mini { font-size: 20px; font-weight: 200; line-height: 1; - color: #333333; + color: inherit; } .navbar .navbar-text { margin-bottom: 0; @@ -3029,7 +3030,7 @@ input[type="submit"].btn.btn-mini { color: #555555; } .navbar .navbar-link:hover { - color: #333333; + color: #da370f; } .navbar .btn, .navbar .btn-group { @@ -3083,7 +3084,7 @@ input[type="submit"].btn.btn-mini { } .navbar-search .search-query { padding: 4px 9px; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Josefin Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 1; @@ -3172,7 +3173,7 @@ input[type="submit"].btn.btn-mini { display: inline-block; padding: 4px 10px 4px; margin: 5px 5px 6px; - line-height: 18px; + line-height: 20px; } .navbar .btn-group { margin: 0; @@ -3180,22 +3181,22 @@ input[type="submit"].btn.btn-mini { } .navbar .nav > li > a:hover { background-color: transparent; - color: #333333; + color: #da370f; text-decoration: none; } .navbar .nav .active > a, .navbar .nav .active > a:hover { - color: #333333; + color: #da370f; text-decoration: none; - background-color: #f8f8f8; + background-color: #fefefe; } .navbar .divider-vertical { height: 40px; width: 1px; margin: 0 9px; overflow: hidden; - background-color: #f8f8f8; - border-right: 1px solid #f8f8f8; + background-color: #fefefe; + border-right: 1px solid #fefefe; } .navbar .nav.pull-right { margin-left: 10px; @@ -3207,18 +3208,18 @@ input[type="submit"].btn.btn-mini { padding: 7px 10px; margin-left: 5px; margin-right: 5px; - background-color: #f8f8f8; - background-image: -moz-linear-gradient(top, #f8f8f8, #f8f8f8); - background-image: -ms-linear-gradient(top, #f8f8f8, #f8f8f8); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f8f8f8), to(#f8f8f8)); - background-image: -webkit-linear-gradient(top, #f8f8f8, #f8f8f8); - background-image: -o-linear-gradient(top, #f8f8f8, #f8f8f8); - background-image: linear-gradient(top, #f8f8f8, #f8f8f8); + background-color: #fefefe; + background-image: -moz-linear-gradient(top, #fefefe, #fefefe); + background-image: -ms-linear-gradient(top, #fefefe, #fefefe); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fefefe), to(#fefefe)); + background-image: -webkit-linear-gradient(top, #fefefe, #fefefe); + background-image: -o-linear-gradient(top, #fefefe, #fefefe); + background-image: linear-gradient(top, #fefefe, #fefefe); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f8f8f8', endColorstr='#f8f8f8', GradientType=0); - border-color: #f8f8f8 #f8f8f8 #d2d2d2; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fefefe', endColorstr='#fefefe', GradientType=0); + border-color: #fefefe #fefefe #d8d8d8; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #f8f8f8; + *background-color: #fefefe; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); @@ -3231,12 +3232,12 @@ input[type="submit"].btn.btn-mini { .navbar .btn-navbar.active, .navbar .btn-navbar.disabled, .navbar .btn-navbar[disabled] { - background-color: #f8f8f8; - *background-color: #ebebeb; + background-color: #fefefe; + *background-color: #f1f1f1; } .navbar .btn-navbar:active, .navbar .btn-navbar.active { - background-color: #dfdfdf \9; + background-color: #e5e5e5 \9; } .navbar .btn-navbar .icon-bar { display: block; @@ -3321,7 +3322,7 @@ input[type="submit"].btn.btn-mini { } .breadcrumb { padding: 7px 14px; - margin: 0 0 18px; + margin: 0 0 20px; list-style: none; background-color: #fbfbfb; background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); @@ -3356,8 +3357,8 @@ input[type="submit"].btn.btn-mini { color: #333333; } .pagination { - height: 36px; - margin: 18px 0; + height: 40px; + margin: 20px 0; } .pagination ul { display: inline-block; @@ -3380,7 +3381,7 @@ input[type="submit"].btn.btn-mini { .pagination a { float: left; padding: 0 14px; - line-height: 34px; + line-height: 38px; text-decoration: none; border: 1px solid #ddd; border-left-width: 0; @@ -3419,7 +3420,7 @@ input[type="submit"].btn.btn-mini { } .pager { margin-left: 0; - margin-bottom: 18px; + margin-bottom: 20px; list-style: none; text-align: center; *zoom: 1; @@ -3754,7 +3755,7 @@ input[type="submit"].btn.btn-mini { } .thumbnails > li { float: left; - margin-bottom: 18px; + margin-bottom: 20px; margin-left: 20px; } .thumbnail { @@ -3770,7 +3771,7 @@ input[type="submit"].btn.btn-mini { box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); } a.thumbnail:hover { - border-color: #366ddc; + border-color: #da370f; -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); @@ -3786,7 +3787,7 @@ a.thumbnail:hover { } .label, .badge { - font-size: 10.998px; + font-size: 12.69px; font-weight: bold; line-height: 14px; color: #ffffff; @@ -3823,11 +3824,11 @@ a.badge:hover { } .label-warning, .badge-warning { - background-color: #ff6600; + background-color: #da370f; } .label-warning[href], .badge-warning[href] { - background-color: #cc5200; + background-color: #aa2b0c; } .label-success, .badge-success { @@ -3839,11 +3840,11 @@ a.badge:hover { } .label-info, .badge-info { - background-color: #1155cc; + background-color: #029acf; } .label-info[href], .badge-info[href] { - background-color: #0d419d; + background-color: #02749c; } .label-inverse, .badge-inverse { @@ -4023,18 +4024,18 @@ 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); } .progress-warning .bar { - background-color: #ff822e; - background-image: -moz-linear-gradient(top, #ff944d, #ff6600); - background-image: -ms-linear-gradient(top, #ff944d, #ff6600); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ff944d), to(#ff6600)); - background-image: -webkit-linear-gradient(top, #ff944d, #ff6600); - background-image: -o-linear-gradient(top, #ff944d, #ff6600); - background-image: linear-gradient(top, #ff944d, #ff6600); + background-color: #e8532e; + background-image: -moz-linear-gradient(top, #f26643, #da370f); + background-image: -ms-linear-gradient(top, #f26643, #da370f); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f26643), to(#da370f)); + background-image: -webkit-linear-gradient(top, #f26643, #da370f); + background-image: -o-linear-gradient(top, #f26643, #da370f); + background-image: linear-gradient(top, #f26643, #da370f); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff944d', endColorstr='#ff6600', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f26643', endColorstr='#da370f', GradientType=0); } .progress-warning.progress-striped .bar { - background-color: #ff944d; + background-color: #f26643; 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); @@ -4043,7 +4044,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: 18px; + margin-bottom: 20px; } .accordion-group { margin-bottom: 2px; @@ -4068,7 +4069,7 @@ a.badge:hover { } .carousel { position: relative; - margin-bottom: 18px; + margin-bottom: 20px; line-height: 1; } .carousel-inner { @@ -4180,7 +4181,7 @@ a.badge:hover { .hero-unit p { font-size: 18px; font-weight: 200; - line-height: 27px; + line-height: 30px; color: inherit; } .pull-right { @@ -4198,84 +4199,112 @@ a.badge:hover { .invisible { visibility: hidden; } -h6, -.hero-unit { - color: #333333; +h6 { + color: inherit; } .navbar .navbar-inner { -webkit-box-shadow: inset 0 -1px #cfcaca; -moz-box-shadow: inset 0 -1px #cfcaca; box-shadow: inset 0 -1px #cfcaca; - border-bottom: 1px solid #FFF; - border-bottom: none; } .navbar .brand { - padding-top: 10px; - color: #333333; + padding: 13px 20px 10px; + font-weight: bold; +} +.navbar .brand:hover { + color: #da370f; } .navbar .navbar-text { - padding: 14px 10px 11px; - text-shadow: none; - font-weight: normal; - font-size: 11px; + padding: 15px 20px 9px; line-height: 19px; + color: #999999; } .navbar .nav > li > a { - padding-top: 14px; + padding: 15px 20px 9px; text-shadow: none; - font-weight: normal; - font-size: 11px; } .navbar .nav > li > a:hover { - text-decoration: underline; + text-decoration: none; } .navbar .nav .active > a, .navbar .nav .active > a:hover { background-color: transparent; } -.navbar .nav-collapse .nav li.dropdown > .dropdown-toggle:hover { - color: #555555; +.navbar .nav li.dropdown.open > .dropdown-toggle, +.navbar .nav li.dropdown.active > .dropdown-toggle:hover { + color: #da370f; } -.navbar .nav li.dropdown .dropdown-toggle .caret, -.navbar .nav li.open.dropdown .dropdown-toggle .caret { +.navbar .nav li.dropdown .dropdown-toggle .caret { border-top-color: #555555; + border-bottom-color: #555555; + opacity: 1; } -.navbar .nav-collapse .nav li > a { - color: #333333; - font-weight: normal; +.navbar .nav li.dropdown:hover .dropdown-toggle .caret, +.navbar .nav li.dropdown.active > .dropdown-toggle .caret, +.navbar .nav li.dropdown.open .dropdown-toggle .caret { + border-top-color: #da370f; + border-bottom-color: #da370f; } -.navbar .nav-collapse .nav li > a:hover { - background-color: transparent; - color: #000000; - text-decoration: underline; +.navbar .nav-collapse.collapse .nav li > a { + color: #555555; +} +.navbar .nav-collapse.collapse .nav li > a:hover { + background-color: #eeeeee; } div.subnav { background-image: none; - background-color: #f8f8f8; + background-color: #fefefe; border-bottom: 1px solid transparent; - -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.3); - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.3); + -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2); + box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2); } div.subnav.subnav-fixed { - -webkit-box-shadow: inset 0 5px #ffffff , 0 1px 1px rgba(0, 0, 0, 0.3); - -moz-box-shadow: inset 0 5px #ffffff , 0 1px 1px rgba(0, 0, 0, 0.3); - box-shadow: inset 0 5px #ffffff , 0 1px 1px rgba(0, 0, 0, 0.3); + -webkit-box-shadow: inset 0 5px #ffffff , 1px 1px 1px rgba(0, 0, 0, 0.2); + -moz-box-shadow: inset 0 5px #ffffff , 1px 1px 1px rgba(0, 0, 0, 0.2); + box-shadow: inset 0 5px #ffffff , 1px 1px 1px rgba(0, 0, 0, 0.2); } div.subnav .nav > li > a { - padding-top: 12px; + padding: 14px 12px 10px; color: #555555; - font-weight: normal; - font-size: 11px; + border-left-color: transparent; + border-right-color: transparent; } div.subnav .nav > li > a:hover { - text-decoration: underline; + background-color: transparent; + color: #da370f; +} +div.subnav .nav > li.active > a, +div.subnav .nav > li.active > a:hover { + border-left-color: transparent; + border-right-color: transparent; + background-color: transparent; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + color: #da370f; } -div.subnav .nav > li.open > a, -div.subnav .nav > li.open > a:hover { +div.subnav .nav > li.dropdown.open > a, +div.subnav .nav > li.dropdown.open > a:hover { + border-left-color: transparent; + border-right-color: transparent; background-color: transparent; - border-left: 1px solid whiteSmoke; - border-right: 1px solid #E5E5E5; + color: #da370f; +} +div.subnav .nav li.dropdown .dropdown-toggle .caret { + border-top-color: #555555; + border-bottom-color: #555555; + opacity: 1; +} +div.subnav .nav li.dropdown:hover .dropdown-toggle .caret, +div.subnav .nav li.dropdown.active .dropdown-toggle .caret, +div.subnav .nav li.dropdown.open .dropdown-toggle .caret { + border-top-color: #da370f; + border-bottom-color: #da370f; + opacity: 1; +} +div.subnav .dropdown-menu a:hover { + background-color: #fbebe9; } @media (max-width: 979px) { form.navbar-form, @@ -4285,30 +4314,57 @@ div.subnav .nav > li.open > a:hover { } } .nav .nav-header { + font-size: 13px; font-weight: normal; text-transform: none; } -.nav > li > a { - font-size: 11px; - border-width: 1px; +.nav-tabs > li > a { + background-color: #efefef; + border: 1px solid #ccc; + color: #555555; } -.dropdown-menu { +.nav-tabs > li > a:hover { + border: 1px solid #ccc; + background-color: #fbebe9; + color: #da370f; +} +.nav-tabs > li.active > a, +.nav-tabs > li.active > a:hover { + background-color: #f7f7f7; +} +.nav-tabs .dropdown .dropdown-toggle .caret { + border-top-color: #555555; + border-bottom-color: #555555; + opacity: 1; +} +.nav-tabs .dropdown:hover .dropdown-toggle .caret { + border-top-color: #da370f; + border-bottom-color: #da370f; +} +.nav-tabs .dropdown.open .dropdown-toggle { + background-color: #fbebe9; + border-color: #ccc; + color: #da370f; +} +.nav-tabs .dropdown.open .dropdown-toggle .caret, +.nav-tabs .dropdown.open .dropdown-toggle:hover .caret { + border-top-color: #da370f; + border-bottom-color: #da370f; + opacity: 1; +} +.nav-tabs .dropdown-menu { -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; - font-size: 11px; } -.dropdown.open .dropdown-toggle { - color: #333333; +.nav-tabs .dropdown-menu a { + padding: 8px 15px 3px; } -.nav-tabs > li > a, -.nav-tabs > li > a:hover, -.tabbable > .nav-tabs > li > a, -.tabbable > .nav-tabs > li > a:hover { - background-color: #ebebeb; +.tabbable .nav-tabs > li > a, +.tabbable .nav-tabs > li > a:hover { border: 1px solid #ccc; } -.tabbable > .nav-tabs > li.active > a { +.tabbable .nav-tabs > li.active > a { border-bottom: 1px solid transparent; } .tabbable.tabs-below > .nav-tabs > li.active > a, @@ -4316,12 +4372,48 @@ div.subnav .nav > li.open > a:hover { .tabbable.tabs-right > .nav-tabs > li.active > a { border-bottom: 1px solid #ccc; } -.nav-pills > li > a:hover { - background-color: transparent; +.nav-pills li > a { + color: #555555; +} +.nav-pills li > a:hover { + background-color: #fbebe9; + color: #da370f; +} +.nav-pills li.active > a, +.nav-pills li.active > a:hover { + background-color: #fbebe9; + color: #da370f; +} +.nav-pills .dropdown .dropdown-toggle .caret { + border-top-color: #555555; + border-bottom-color: #555555; + opacity: 1; +} +.nav-pills .dropdown:hover .dropdown-toggle .caret { + border-top-color: #da370f; + border-bottom-color: #da370f; +} +.nav-pills .dropdown.open .dropdown-toggle, +.nav-pills .dropdown.open:hover .dropdown-toggle { + background-color: #fbebe9; + color: #da370f; +} +.nav-pills .dropdown.open .dropdown-toggle .caret, +.nav-pills .dropdown.open:hover .dropdown-toggle .caret { + border-top-color: #da370f; + border-bottom-color: #da370f; +} +.nav-list li > a { + color: #555555; +} +.nav-list li > a:hover { + background-color: #fbebe9; + color: #da370f; } -.nav-tabs > li.active > a, -.nav-tabs > li.active > a:hover { - background-color: #f3f3f3; +.nav-list li.active > a, +.nav-list li.active > a:hover { + background-color: #fbebe9; + color: #da370f; } legend { border-bottom: 1px solid #ddd; @@ -4331,228 +4423,39 @@ legend { -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; - background-color: #f3f3f3; + background-color: #f7f7f7; color: #555555; } .help-inline, .help-block { - font-size: 11px; + font-size: 13px; } .btn { - -webkit-border-radius: 2px; - -moz-border-radius: 2px; - border-radius: 2px; - font-weight: bold; - background-color: #fafafa; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6); - background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-repeat: no-repeat; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); -} -.btn-primary { - background-color: #4376de; - background-image: -moz-linear-gradient(top, #4c7de0, #366ddc); - background-image: -ms-linear-gradient(top, #4c7de0, #366ddc); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#4c7de0), to(#366ddc)); - background-image: -webkit-linear-gradient(top, #4c7de0, #366ddc); - background-image: -o-linear-gradient(top, #4c7de0, #366ddc); - background-image: linear-gradient(top, #4c7de0, #366ddc); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#4c7de0', endColorstr='#366ddc', GradientType=0); - border-color: #366ddc #366ddc #1d4ba8; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #366ddc; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -} -.btn-primary:hover, -.btn-primary:active, -.btn-primary.active, -.btn-primary.disabled, -.btn-primary[disabled] { - background-color: #366ddc; - *background-color: #255fd4; -} -.btn-primary:active, -.btn-primary.active { - background-color: #2155be \9; -} -.btn-warning { - background-color: #ff6f0f; - background-image: -moz-linear-gradient(top, #ff751a, #ff6600); - background-image: -ms-linear-gradient(top, #ff751a, #ff6600); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ff751a), to(#ff6600)); - background-image: -webkit-linear-gradient(top, #ff751a, #ff6600); - background-image: -o-linear-gradient(top, #ff751a, #ff6600); - background-image: linear-gradient(top, #ff751a, #ff6600); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff751a', endColorstr='#ff6600', GradientType=0); - border-color: #ff6600 #ff6600 #b34700; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #ff6600; - /* 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] { - background-color: #ff6600; - *background-color: #e65c00; -} -.btn-warning:active, -.btn-warning.active { - background-color: #cc5200 \9; -} -.btn-danger { - background-color: #e53a48; - background-image: -moz-linear-gradient(top, #e64350, #e32c3b); - background-image: -ms-linear-gradient(top, #e64350, #e32c3b); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#e64350), to(#e32c3b)); - background-image: -webkit-linear-gradient(top, #e64350, #e32c3b); - background-image: -o-linear-gradient(top, #e64350, #e32c3b); - background-image: linear-gradient(top, #e64350, #e32c3b); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e64350', endColorstr='#e32c3b', GradientType=0); - border-color: #e32c3b #e32c3b #ac1723; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #e32c3b; - /* 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] { - background-color: #e32c3b; - *background-color: #d91d2c; -} -.btn-danger:active, -.btn-danger.active { - background-color: #c21a28 \9; -} -.btn-success { - background-color: #43a300; - background-image: -moz-linear-gradient(top, #48ae00, #3d9400); - background-image: -ms-linear-gradient(top, #48ae00, #3d9400); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#48ae00), to(#3d9400)); - background-image: -webkit-linear-gradient(top, #48ae00, #3d9400); - background-image: -o-linear-gradient(top, #48ae00, #3d9400); - background-image: linear-gradient(top, #48ae00, #3d9400); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#48ae00', endColorstr='#3d9400', GradientType=0); - border-color: #3d9400 #3d9400 #1d4800; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #3d9400; - /* 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] { - background-color: #3d9400; - *background-color: #327b00; -} -.btn-success:active, -.btn-success.active { - background-color: #286100 \9; -} -.btn-info { - background-color: #68c5e1; - background-image: -moz-linear-gradient(top, #70c8e2, #5bc0de); - background-image: -ms-linear-gradient(top, #70c8e2, #5bc0de); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#70c8e2), to(#5bc0de)); - background-image: -webkit-linear-gradient(top, #70c8e2, #5bc0de); - background-image: -o-linear-gradient(top, #70c8e2, #5bc0de); - background-image: linear-gradient(top, #70c8e2, #5bc0de); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#70c8e2', endColorstr='#5bc0de', GradientType=0); - border-color: #5bc0de #5bc0de #28a1c5; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #5bc0de; - /* 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] { - background-color: #5bc0de; - *background-color: #46b8da; -} -.btn-info:active, -.btn-info.active { - background-color: #31b0d5 \9; -} -.btn-inverse { - background-color: #a54ca9; - background-image: -moz-linear-gradient(top, #ac4fb0, #9b479f); - background-image: -ms-linear-gradient(top, #ac4fb0, #9b479f); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ac4fb0), to(#9b479f)); - background-image: -webkit-linear-gradient(top, #ac4fb0, #9b479f); - background-image: -o-linear-gradient(top, #ac4fb0, #9b479f); - background-image: linear-gradient(top, #ac4fb0, #9b479f); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ac4fb0', endColorstr='#9b479f', GradientType=0); - border-color: #9b479f #9b479f #672f6a; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - *background-color: #9b479f; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + padding: 6px 10px 2px; } -.btn-inverse:hover, -.btn-inverse:active, -.btn-inverse.active, -.btn-inverse.disabled, -.btn-inverse[disabled] { - background-color: #9b479f; - *background-color: #8a3f8d; +.btn-large { + padding: 11px 14px 8px; } -.btn-inverse:active, -.btn-inverse.active { - background-color: #79377c \9; +.btn-small { + padding: 5px 9px 3px; } -.modal, -.modal-header, -.modal-footer { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; +.btn-micro { + padding: 3px 6px 1px; } .modal-header { border-bottom: none; } .modal-header, .modal-body { - background-color: #f8f8f8; + background-color: #fefefe; } .modal-footer { - background-color: #f3f3f3; + background-color: #f7f7f7; } i[class^="icon-"] { - opacity: 0.6; + opacity: 0.5; vertical-align: -2px; } -.alert, -.alert p, -.alert-heading { - font-size: 11px; -} .progress { background-color: #e3e3e3; background-image: -moz-linear-gradient(top, #e0e0e0, #e8e8e8); @@ -4565,31 +4468,49 @@ i[class^="icon-"] { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e0e0e0', endColorstr='#e8e8e8', GradientType=0); } .label { - font-size: 11px; + padding: 4px 4px 3px; font-weight: normal; } .hero-unit { - background-color: #ffffff; - -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.3); - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.3); + background-color: #fefefe; + -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1); + -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1); + box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1); } .well { - -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.3); - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.3); + -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1); + -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1); + box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1); background-color: #ffffff; border: none; } .breadcrumb { - -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.3); - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.3); + -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1); + -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1); + box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1); border: 0px solid transparent; - font-size: 11px; } -footer.footer p { - font-size: 11px; +.breadcrumb li { + padding-top: 5px; + text-shadow: none; +} +.breadcrumb a { + text-shadow: none; +} +.breadcrumb a:hover { + text-decoration: none; +} +.pagination li > a { + padding: 4px 14px 0; + color: #555555; +} +.pagination li > a:hover { + background-color: #fbebe9; + color: #da370f; +} +.pagination li.active > a { + background-color: #fbebe9; + color: #da370f; } .pull-right { float: right; diff --git a/simplex/bootstrap.min.css b/simplex/bootstrap.min.css index 26bcb622..da12c9d1 100644 --- a/simplex/bootstrap.min.css +++ b/simplex/bootstrap.min.css @@ -1,3 +1,4 @@ +@import url('http://fonts.googleapis.com/css?family=Josefin+Sans:300,400,700'); article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;} audio,canvas,video{display:inline-block;*display:inline;*zoom:1;} audio:not([controls]){display:none;} @@ -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:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;} -body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;color:#555555;background-color:#f3f3f3;} -a{color:#366ddc;text-decoration:none;} -a:hover{color:#1d4ba8;text-decoration:underline;} +body{margin:0;font-family:"Josefin Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:15px;line-height:20px;color:#555555;background-color:#f7f7f7;} +a{color:#da370f;text-decoration:none;} +a:hover{color:#da370f;text-decoration:underline;} .row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";} .row:after{clear:both;} [class*="span"]{float:left;margin-left:20px;} @@ -71,55 +72,55 @@ a:hover{color:#1d4ba8;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:"";} .container-fluid:after{clear:both;} -p{margin:0 0 9px;}p small{font-size:11px;color:#999999;} -.lead{margin-bottom:18px;font-size:20px;font-weight:200;line-height:27px;} -h1,h2,h3,h4,h5,h6{margin:0;font-family:inherit;font-weight:bold;color:#333333;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;color:#999999;} -h1{font-size:30px;line-height:36px;}h1 small{font-size:18px;} -h2{font-size:24px;line-height:36px;}h2 small{font-size:18px;} -h3{font-size:18px;line-height:27px;}h3 small{font-size:14px;} -h4,h5,h6{line-height:18px;} +p{margin:0 0 10px;}p small{font-size:13px;color:#999999;} +.lead{margin-bottom:20px;font-size:20px;font-weight:200;line-height:30px;} +h1,h2,h3,h4,h5,h6{margin:0;font-family:inherit;font-weight:bold;color:inherit;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;color:#999999;} +h1{font-size:30px;line-height:40px;}h1 small{font-size:18px;} +h2{font-size:24px;line-height:40px;}h2 small{font-size:18px;} +h3{font-size:18px;line-height:30px;}h3 small{font-size:14px;} +h4,h5,h6{line-height:20px;} h4{font-size:14px;}h4 small{font-size:12px;} h5{font-size:12px;} h6{font-size:11px;color:#999999;text-transform:uppercase;} -.page-header{padding-bottom:17px;margin:18px 0;border-bottom:1px solid #eeeeee;} +.page-header{padding-bottom:19px;margin:20px 0;border-bottom:1px solid #eeeeee;} .page-header h1{line-height:1;} -ul,ol{padding:0;margin:0 0 9px 25px;} +ul,ol{padding:0;margin:0 0 10px 25px;} ul ul,ul ol,ol ol,ol ul{margin-bottom:0;} ul{list-style:disc;} ol{list-style:decimal;} -li{line-height:18px;} +li{line-height:20px;} ul.unstyled,ol.unstyled{margin-left:0;list-style:none;} -dl{margin-bottom:18px;} -dt,dd{line-height:18px;} -dt{font-weight:bold;line-height:17px;} -dd{margin-left:9px;} +dl{margin-bottom:20px;} +dt,dd{line-height:20px;} +dt{font-weight:bold;line-height:19px;} +dd{margin-left:10px;} .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:18px 0;border:0;border-top:1px solid #eeeeee;border-bottom:1px solid #ffffff;} +hr{margin:20px 0;border:0;border-top:1px solid #eeeeee;border-bottom:1px solid #ffffff;} strong{font-weight:bold;} em{font-style:italic;} .muted{color:#999999;} abbr[title]{cursor:help;border-bottom:1px dotted #999999;} abbr.initialism{font-size:90%;text-transform:uppercase;} -blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;} -blockquote small{display:block;line-height:18px;color:#999999;}blockquote small:before{content:'\2014 \00A0';} +blockquote{padding:0 0 0 15px;margin:0 0 20px;border-left:5px solid #eeeeee;}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 #eeeeee;border-left:0;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;} q:before,q:after,blockquote:before,blockquote:after{content:"";} -address{display:block;margin-bottom:18px;font-style:normal;line-height:18px;} +address{display:block;margin-bottom:20px;font-style:normal;line-height:20px;} small{font-size:100%;} cite{font-style:normal;} -code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,Consolas,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,Consolas,"Courier New",monospace;font-size:14px;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:8.5px;margin:0 0 9px;font-size:12.025px;line-height:18px;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:18px;} +pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13.875px;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 code{padding:0;color:inherit;background-color:transparent;border:0;} .pre-scrollable{max-height:340px;overflow-y:scroll;} -form{margin:0 0 18px;} +form{margin:0 0 20px;} fieldset{padding:0;margin:0;border:0;} -legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #e5e5e5;}legend small{font-size:13.5px;color:#999999;} -label,input,button,select,textarea{font-size:13px;font-weight:normal;line-height:18px;} -input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;} +legend{display:block;width:100%;padding:0;margin-bottom:30px;font-size:22.5px;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:15px;font-weight:normal;line-height:20px;} +input,button,select,textarea{font-family:"Josefin Sans","Helvetica Neue",Helvetica,Arial,sans-serif;} label{display:block;margin-bottom:5px;} -select,textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{display:inline-block;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;} +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;margin-bottom:9px;font-size:15px;line-height:20px;color:#555555;} 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-border-radius:0;-moz-border-radius:0;border-radius:0;-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 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.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);} @@ -158,9 +159,9 @@ input.span2, textarea.span2, .uneditable-input.span2{width:130px;} input.span1, textarea.span1, .uneditable-input.span1{width:50px;} input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#eeeeee;border-color:#ddd;} 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:#ff6600;} -.control-group.warning .checkbox,.control-group.warning .radio,.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#ff6600;border-color:#ff6600;}.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:#cc5200;-webkit-box-shadow:0 0 6px #ffa366;-moz-box-shadow:0 0 6px #ffa366;box-shadow:0 0 6px #ffa366;} -.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#ff6600;background-color:#fcf8e3;border-color:#ff6600;} +.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#da370f;} +.control-group.warning .checkbox,.control-group.warning .radio,.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#da370f;border-color:#da370f;}.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:#aa2b0c;-webkit-box-shadow:0 0 6px #f4795b;-moz-box-shadow:0 0 6px #f4795b;box-shadow:0 0 6px #f4795b;} +.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#da370f;background-color:#fcf8e3;border-color:#da370f;} .control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#e32c3b;} .control-group.error .checkbox,.control-group.error .radio,.control-group.error input,.control-group.error select,.control-group.error textarea{color:#e32c3b;border-color:#e32c3b;}.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:#c21a28;-webkit-box-shadow:0 0 6px #ef868f;-moz-box-shadow:0 0 6px #ef868f;box-shadow:0 0 6px #ef868f;} .control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#e32c3b;background-color:#f2dede;border-color:#e32c3b;} @@ -168,18 +169,18 @@ input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio .control-group.success .checkbox,.control-group.success .radio,.control-group.success input,.control-group.success select,.control-group.success textarea{color:#3d9400;border-color:#3d9400;}.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:#286100;-webkit-box-shadow:0 0 6px #67fa00;-moz-box-shadow:0 0 6px #67fa00;box-shadow:0 0 6px #67fa00;} .control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#3d9400;background-color:#dff0d8;border-color:#3d9400;} 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:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #e5e5e5;*zoom:1;}.form-actions:before,.form-actions:after{display:table;content:"";} +.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:"";} .form-actions:after{clear:both;} .uneditable-input{overflow:hidden;white-space:nowrap;cursor:not-allowed;background-color:#ffffff;border-color:#eee;-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);} :-moz-placeholder{color:#555555;} :-ms-input-placeholder{color:#555555;} ::-webkit-input-placeholder{color:#555555;} .help-block,.help-inline{color:#555555;} -.help-block{display:block;margin-bottom:9px;} +.help-block{display:block;margin-bottom:10px;} .help-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;padding-left:5px;} .input-prepend,.input-append{margin-bottom:5px;}.input-prepend input,.input-append input,.input-prepend select,.input-append select,.input-prepend .uneditable-input,.input-append .uneditable-input{position:relative;margin-bottom:0;*margin-left:0;vertical-align:middle;-webkit-border-radius:0 0 0 0;-moz-border-radius:0 0 0 0;border-radius:0 0 0 0;}.input-prepend input:focus,.input-append input:focus,.input-prepend select:focus,.input-append select:focus,.input-prepend .uneditable-input:focus,.input-append .uneditable-input:focus{z-index:2;} .input-prepend .uneditable-input,.input-append .uneditable-input{border-left-color:#ccc;} -.input-prepend .add-on,.input-append .add-on{display:inline-block;width:auto;height:18px;min-width:16px;padding:4px 5px;font-weight:normal;line-height:18px;text-align:center;text-shadow:0 1px 0 #ffffff;vertical-align:middle;background-color:#eeeeee;border:1px solid #ccc;} +.input-prepend .add-on,.input-append .add-on{display:inline-block;width:auto;height:20px;min-width:16px;padding:4px 5px;font-weight:normal;line-height:20px;text-align:center;text-shadow:0 1px 0 #ffffff;vertical-align:middle;background-color:#eeeeee;border:1px solid #ccc;} .input-prepend .add-on,.input-append .add-on,.input-prepend .btn,.input-append .btn{margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} .input-prepend .active,.input-append .active{background-color:#84ff2e;border-color:#3d9400;} .input-prepend .add-on,.input-prepend .btn{margin-right:-1px;} @@ -197,16 +198,16 @@ input:focus:required:invalid,textarea:focus:required:invalid,select:focus:requir .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:9px;} -legend+.control-group{margin-top:18px;-webkit-margin-top-collapse:separate;} -.form-horizontal .control-group{margin-bottom:18px;*zoom:1;}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;content:"";} +.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:"";} .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:9px;margin-bottom:0;} +.form-horizontal .help-block{margin-top:10px;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:18px;}.table th,.table td{padding:8px;line-height:18px;text-align:left;vertical-align:top;border-top:1px solid #dddddd;} +.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 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;} @@ -393,9 +394,9 @@ table .span24{float:none;width:1884px;margin-left:0;} .dropdown .caret{margin-top:8px;margin-left:2px;} .dropdown:hover .caret,.open .caret{opacity:1;filter:alpha(opacity=100);} .dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:4px 0;margin:1px 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:5px;-moz-border-radius:5px;border-radius:5px;-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:8px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;} -.dropdown-menu a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:18px;color:#333333;white-space:nowrap;} -.dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;background-color:#366ddc;} +.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 15px;clear:both;font-weight:normal;line-height:20px;color:#555555;white-space:nowrap;} +.dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#da370f;text-decoration:none;background-color:#fbebe9;} .open{*z-index:1000;}.open >.dropdown-menu{display:block;} .pull-right>.dropdown-menu{right:0;left:auto;} .dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000000;content:"\2191";} @@ -406,33 +407,33 @@ 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;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;}.fade.in{opacity:1;} .collapse{position:relative;height:0;overflow:hidden;-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-ms-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:18px;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: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);} button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none;} -.btn{display:inline-block;*display:inline;*zoom:1;padding:4px 10px 4px;margin-bottom:0;font-size:13px;line-height:18px;*line-height:20px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);vertical-align:middle;cursor:pointer;background-color:#f5f5f5;background-image:-moz-linear-gradient(top, #ffffff, #e6e6e6);background-image:-ms-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(top, #ffffff, #e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', 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]{background-color:#e6e6e6;*background-color:#d9d9d9;} +.btn{display:inline-block;*display:inline;*zoom:1;padding:4px 10px 4px;margin-bottom:0;font-size:15px;line-height:20px;*line-height:20px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);vertical-align:middle;cursor:pointer;background-color:#f5f5f5;background-image:-moz-linear-gradient(top, #ffffff, #e6e6e6);background-image:-ms-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(top, #ffffff, #e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', 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]{background-color:#e6e6e6;*background-color:#d9d9d9;} .btn:active,.btn.active{background-color:#cccccc \9;} .btn:first-child{*margin-left:0;} .btn:hover{color:#333333;text-decoration:none;background-color:#e6e6e6;*background-color:#d9d9d9;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-ms-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;} .btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} .btn.active,.btn:active{background-color:#e6e6e6;background-color:#d9d9d9 \9;background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);} .btn.disabled,.btn[disabled]{cursor:default;background-color:#e6e6e6;background-image:none;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.btn-large{padding:9px 14px;font-size:15px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} +.btn-large{padding:9px 14px;font-size:17px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} .btn-large [class^="icon-"]{margin-top:1px;} -.btn-small{padding:5px 9px;font-size:11px;line-height:16px;} +.btn-small{padding:5px 9px;font-size:13px;line-height:18px;} .btn-small [class^="icon-"]{margin-top:-1px;} -.btn-mini{padding:2px 6px;font-size:11px;line-height:14px;} +.btn-mini{padding:2px 6px;font-size:13px;line-height:16px;} .btn-primary,.btn-primary:hover,.btn-warning,.btn-warning:hover,.btn-danger,.btn-danger:hover,.btn-success,.btn-success:hover,.btn-info,.btn-info:hover,.btn-inverse,.btn-inverse:hover{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} .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:#ccc;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} -.btn-primary{background-color:#365cdc;background-image:-moz-linear-gradient(top, #366ddc, #3644dc);background-image:-ms-linear-gradient(top, #366ddc, #3644dc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#366ddc), to(#3644dc));background-image:-webkit-linear-gradient(top, #366ddc, #3644dc);background-image:-o-linear-gradient(top, #366ddc, #3644dc);background-image:linear-gradient(top, #366ddc, #3644dc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#366ddc', endColorstr='#3644dc', GradientType=0);border-color:#3644dc #3644dc #1d29a8;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#3644dc;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#3644dc;*background-color:#2533d4;} -.btn-primary:active,.btn-primary.active{background-color:#212ebe \9;} -.btn-warning{background-color:#ff822e;background-image:-moz-linear-gradient(top, #ff944d, #ff6600);background-image:-ms-linear-gradient(top, #ff944d, #ff6600);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ff944d), to(#ff6600));background-image:-webkit-linear-gradient(top, #ff944d, #ff6600);background-image:-o-linear-gradient(top, #ff944d, #ff6600);background-image:linear-gradient(top, #ff944d, #ff6600);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff944d', endColorstr='#ff6600', GradientType=0);border-color:#ff6600 #ff6600 #b34700;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#ff6600;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#ff6600;*background-color:#e65c00;} -.btn-warning:active,.btn-warning.active{background-color:#cc5200 \9;} -.btn-danger{background-color:#da4f49;background-image:-moz-linear-gradient(top, #ee5f5b, #bd362f);background-image:-ms-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(top, #ee5f5b, #bd362f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', 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]{background-color:#bd362f;*background-color:#a9302a;} -.btn-danger:active,.btn-danger.active{background-color:#942a25 \9;} -.btn-success{background-color:#5bb75b;background-image:-moz-linear-gradient(top, #62c462, #51a351);background-image:-ms-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(top, #62c462, #51a351);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', 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]{background-color:#51a351;*background-color:#499249;} -.btn-success:active,.btn-success.active{background-color:#408140 \9;} -.btn-info{background-color:#49afcd;background-image:-moz-linear-gradient(top, #5bc0de, #2f96b4);background-image:-ms-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(top, #5bc0de, #2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', 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]{background-color:#2f96b4;*background-color:#2a85a0;} -.btn-info:active,.btn-info.active{background-color:#24748c \9;} +.btn-primary{background-color:#e63c12;background-image:-moz-linear-gradient(top, #ef3f14, #da370f);background-image:-ms-linear-gradient(top, #ef3f14, #da370f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ef3f14), to(#da370f));background-image:-webkit-linear-gradient(top, #ef3f14, #da370f);background-image:-o-linear-gradient(top, #ef3f14, #da370f);background-image:linear-gradient(top, #ef3f14, #da370f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ef3f14', endColorstr='#da370f', GradientType=0);border-color:#da370f #da370f #92250a;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#da370f;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#da370f;*background-color:#c2310d;} +.btn-primary:active,.btn-primary.active{background-color:#aa2b0c \9;} +.btn-warning{background-color:#ffce36;background-image:-moz-linear-gradient(top, #ffd041, #ffca27);background-image:-ms-linear-gradient(top, #ffd041, #ffca27);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffd041), to(#ffca27));background-image:-webkit-linear-gradient(top, #ffd041, #ffca27);background-image:-o-linear-gradient(top, #ffd041, #ffca27);background-image:linear-gradient(top, #ffd041, #ffca27);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd041', endColorstr='#ffca27', GradientType=0);border-color:#ffca27 #ffca27 #d9a400;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#ffca27;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#ffca27;*background-color:#ffc40d;} +.btn-warning:active,.btn-warning.active{background-color:#f3b700 \9;} +.btn-danger{background-color:#e53a48;background-image:-moz-linear-gradient(top, #e64350, #e32c3b);background-image:-ms-linear-gradient(top, #e64350, #e32c3b);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#e64350), to(#e32c3b));background-image:-webkit-linear-gradient(top, #e64350, #e32c3b);background-image:-o-linear-gradient(top, #e64350, #e32c3b);background-image:linear-gradient(top, #e64350, #e32c3b);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#e64350', endColorstr='#e32c3b', GradientType=0);border-color:#e32c3b #e32c3b #ac1723;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#e32c3b;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{background-color:#e32c3b;*background-color:#d91d2c;} +.btn-danger:active,.btn-danger.active{background-color:#c21a28 \9;} +.btn-success{background-color:#43a300;background-image:-moz-linear-gradient(top, #48ae00, #3d9400);background-image:-ms-linear-gradient(top, #48ae00, #3d9400);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#48ae00), to(#3d9400));background-image:-webkit-linear-gradient(top, #48ae00, #3d9400);background-image:-o-linear-gradient(top, #48ae00, #3d9400);background-image:linear-gradient(top, #48ae00, #3d9400);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#48ae00', endColorstr='#3d9400', GradientType=0);border-color:#3d9400 #3d9400 #1d4800;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#3d9400;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{background-color:#3d9400;*background-color:#327b00;} +.btn-success:active,.btn-success.active{background-color:#286100 \9;} +.btn-info{background-color:#68c5e1;background-image:-moz-linear-gradient(top, #70c8e2, #5bc0de);background-image:-ms-linear-gradient(top, #70c8e2, #5bc0de);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#70c8e2), to(#5bc0de));background-image:-webkit-linear-gradient(top, #70c8e2, #5bc0de);background-image:-o-linear-gradient(top, #70c8e2, #5bc0de);background-image:linear-gradient(top, #70c8e2, #5bc0de);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#70c8e2', endColorstr='#5bc0de', GradientType=0);border-color:#5bc0de #5bc0de #28a1c5;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#5bc0de;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{background-color:#5bc0de;*background-color:#46b8da;} +.btn-info:active,.btn-info.active{background-color:#31b0d5 \9;} .btn-inverse{background-color:#454545;background-image:-moz-linear-gradient(top, #555555, #2c2c2c);background-image:-ms-linear-gradient(top, #555555, #2c2c2c);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#2c2c2c));background-image:-webkit-linear-gradient(top, #555555, #2c2c2c);background-image:-o-linear-gradient(top, #555555, #2c2c2c);background-image:linear-gradient(top, #555555, #2c2c2c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#2c2c2c', GradientType=0);border-color:#2c2c2c #2c2c2c #060606;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#2c2c2c;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{background-color:#2c2c2c;*background-color:#1f1f1f;} .btn-inverse:active,.btn-inverse.active{background-color:#121212 \9;} button.btn,input[type="submit"].btn{*padding-top:2px;*padding-bottom:2px;}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0;} @@ -443,7 +444,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .btn-group:after{clear:both;} .btn-group:first-child{*margin-left:0;} .btn-group+.btn-group{margin-left:5px;} -.btn-toolbar{margin-top:9px;margin-bottom:9px;}.btn-toolbar .btn-group{display:inline-block;*display:inline;*zoom:1;} +.btn-toolbar{margin-top:10px;margin-bottom:10px;}.btn-toolbar .btn-group{display:inline-block;*display:inline;*zoom:1;} .btn-group>.btn{position:relative;float:left;margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} .btn-group>.btn:first-child{margin-left:0;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;} .btn-group>.btn:last-child,.btn-group>.dropdown-toggle{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;} @@ -457,11 +458,11 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .btn-group>.btn-large.dropdown-toggle{padding-left:12px;padding-right:12px;} .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:#3644dc;} -.btn-group.open .btn-warning.dropdown-toggle{background-color:#ff6600;} -.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-primary.dropdown-toggle{background-color:#da370f;} +.btn-group.open .btn-warning.dropdown-toggle{background-color:#ffca27;} +.btn-group.open .btn-danger.dropdown-toggle{background-color:#e32c3b;} +.btn-group.open .btn-success.dropdown-toggle{background-color:#3d9400;} +.btn-group.open .btn-info.dropdown-toggle{background-color:#5bc0de;} .btn-group.open .btn-inverse.dropdown-toggle{background-color:#2c2c2c;} .btn .caret{margin-top:7px;margin-left:0;} .btn:hover .caret,.open.btn-group .caret{opacity:1;filter:alpha(opacity=100);} @@ -470,37 +471,37 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .btn-large .caret{margin-top:6px;border-left-width:5px;border-right-width:5px;border-top-width:5px;} .dropup .btn-large .caret{border-bottom:5px solid #000000;border-top:0;} .btn-primary .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret,.btn-inverse .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;opacity:0.75;filter:alpha(opacity=75);} -.alert{padding:8px 35px 8px 14px;margin-bottom:18px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#ff6600;} +.alert{padding:8px 35px 8px 14px;margin-bottom:20px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#da370f;} .alert-heading{color:inherit;} .alert .close{position:relative;top:-2px;right:-21px;line-height:18px;} .alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#3d9400;} .alert-danger,.alert-error{background-color:#f2dede;border-color:#eed3d7;color:#e32c3b;} -.alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#1155cc;} +.alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#029acf;} .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:18px;list-style:none;} +.nav{margin-left:0;margin-bottom:20px;list-style:none;} .nav>li>a{display:block;} .nav>li>a:hover{text-decoration:none;background-color:#eeeeee;} .nav>.pull-right{float:right;} -.nav .nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:18px;color:#999999;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);text-transform:uppercase;} +.nav .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 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:#366ddc;} +.nav-list>.active>a,.nav-list>.active>a:hover{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#da370f;} .nav-list [class^="icon-"]{margin-right:2px;} -.nav-list .divider{*width:100%;height:1px;margin:8px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;} +.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-tabs,.nav-pills{*zoom:1;}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;content:"";} .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:18px;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>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:#eeeeee #eeeeee #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-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:#366ddc;} +.nav-pills>.active>a,.nav-pills>.active>a:hover{color:#ffffff;background-color:#da370f;} .nav-stacked>li{float:none;} .nav-stacked>li>a{margin-right:0;} .nav-tabs.nav-stacked{border-bottom:0;} @@ -512,8 +513,8 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px;} .nav-tabs .dropdown-menu{-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;} .nav-pills .dropdown-menu{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.nav-tabs .dropdown-toggle .caret,.nav-pills .dropdown-toggle .caret{border-top-color:#366ddc;border-bottom-color:#366ddc;margin-top:6px;} -.nav-tabs .dropdown-toggle:hover .caret,.nav-pills .dropdown-toggle:hover .caret{border-top-color:#1d4ba8;border-bottom-color:#1d4ba8;} +.nav-tabs .dropdown-toggle .caret,.nav-pills .dropdown-toggle .caret{border-top-color:#da370f;border-bottom-color:#da370f;margin-top:6px;} +.nav-tabs .dropdown-toggle:hover .caret,.nav-pills .dropdown-toggle:hover .caret{border-top-color:#da370f;border-bottom-color:#da370f;} .nav-tabs .active .dropdown-toggle .caret,.nav-pills .active .dropdown-toggle .caret{border-top-color:#333333;border-bottom-color:#333333;} .nav>.dropdown.active>a:hover{color:#000000;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;} @@ -539,14 +540,14 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .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:#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;} -.navbar{*position:relative;*z-index:2;overflow:visible;margin-bottom:18px;} -.navbar-inner{min-height:40px;padding-left:20px;padding-right:20px;background-color:#f8f8f8;background-image:-moz-linear-gradient(top, #f8f8f8, #f8f8f8);background-image:-ms-linear-gradient(top, #f8f8f8, #f8f8f8);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f8f8f8), to(#f8f8f8));background-image:-webkit-linear-gradient(top, #f8f8f8, #f8f8f8);background-image:-o-linear-gradient(top, #f8f8f8, #f8f8f8);background-image:linear-gradient(top, #f8f8f8, #f8f8f8);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f8f8f8', endColorstr='#f8f8f8', GradientType=0);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);-moz-box-shadow:0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);} +.navbar{*position:relative;*z-index:2;overflow:visible;margin-bottom:20px;} +.navbar-inner{min-height:40px;padding-left:20px;padding-right:20px;background-color:#fefefe;background-image:-moz-linear-gradient(top, #fefefe, #fefefe);background-image:-ms-linear-gradient(top, #fefefe, #fefefe);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fefefe), to(#fefefe));background-image:-webkit-linear-gradient(top, #fefefe, #fefefe);background-image:-o-linear-gradient(top, #fefefe, #fefefe);background-image:linear-gradient(top, #fefefe, #fefefe);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fefefe', endColorstr='#fefefe', GradientType=0);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);-moz-box-shadow:0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);box-shadow:0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);} .navbar .container{width:auto;} .nav-collapse.collapse{height:auto;} .navbar{color:#555555;}.navbar .brand:hover{text-decoration:none;} -.navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#333333;} +.navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:inherit;} .navbar .navbar-text{margin-bottom:0;line-height:40px;} -.navbar .navbar-link{color:#555555;}.navbar .navbar-link:hover{color:#333333;} +.navbar .navbar-link{color:#555555;}.navbar .navbar-link:hover{color:#da370f;} .navbar .btn,.navbar .btn-group{margin-top:5px;} .navbar .btn-group .btn{margin:0;} .navbar-form{margin-bottom:0;*zoom:1;}.navbar-form:before,.navbar-form:after{display:table;content:"";} @@ -555,7 +556,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .navbar-form input,.navbar-form select{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:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;background-color:#ffffff;border:1px solid #b3b3b3;-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;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query:-moz-placeholder{color:#cccccc;} +.navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Josefin Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;background-color:#ffffff;border:1px solid #b3b3b3;-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;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query:-moz-placeholder{color:#cccccc;} .navbar-search .search-query:-ms-input-placeholder{color:#cccccc;} .navbar-search .search-query::-webkit-input-placeholder{color:#cccccc;} .navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;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;} @@ -568,14 +569,14 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .navbar .nav.pull-right{float:right;} .navbar .nav>li{display:block;float:left;} .navbar .nav>li>a{float:none;padding:9px 10px 11px;line-height:19px;color:#555555;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} -.navbar .btn{display:inline-block;padding:4px 10px 4px;margin:5px 5px 6px;line-height:18px;} +.navbar .btn{display:inline-block;padding:4px 10px 4px;margin:5px 5px 6px;line-height:20px;} .navbar .btn-group{margin:0;padding:5px 5px 6px;} -.navbar .nav>li>a:hover{background-color:transparent;color:#333333;text-decoration:none;} -.navbar .nav .active>a,.navbar .nav .active>a:hover{color:#333333;text-decoration:none;background-color:#f8f8f8;} -.navbar .divider-vertical{height:40px;width:1px;margin:0 9px;overflow:hidden;background-color:#f8f8f8;border-right:1px solid #f8f8f8;} +.navbar .nav>li>a:hover{background-color:transparent;color:#da370f;text-decoration:none;} +.navbar .nav .active>a,.navbar .nav .active>a:hover{color:#da370f;text-decoration:none;background-color:#fefefe;} +.navbar .divider-vertical{height:40px;width:1px;margin:0 9px;overflow:hidden;background-color:#fefefe;border-right:1px solid #fefefe;} .navbar .nav.pull-right{margin-left:10px;margin-right:0;} -.navbar .btn-navbar{display:none;float:right;padding:7px 10px;margin-left:5px;margin-right:5px;background-color:#f8f8f8;background-image:-moz-linear-gradient(top, #f8f8f8, #f8f8f8);background-image:-ms-linear-gradient(top, #f8f8f8, #f8f8f8);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f8f8f8), to(#f8f8f8));background-image:-webkit-linear-gradient(top, #f8f8f8, #f8f8f8);background-image:-o-linear-gradient(top, #f8f8f8, #f8f8f8);background-image:linear-gradient(top, #f8f8f8, #f8f8f8);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f8f8f8', endColorstr='#f8f8f8', GradientType=0);border-color:#f8f8f8 #f8f8f8 #d2d2d2;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#f8f8f8;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]{background-color:#f8f8f8;*background-color:#ebebeb;} -.navbar .btn-navbar:active,.navbar .btn-navbar.active{background-color:#dfdfdf \9;} +.navbar .btn-navbar{display:none;float:right;padding:7px 10px;margin-left:5px;margin-right:5px;background-color:#fefefe;background-image:-moz-linear-gradient(top, #fefefe, #fefefe);background-image:-ms-linear-gradient(top, #fefefe, #fefefe);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fefefe), to(#fefefe));background-image:-webkit-linear-gradient(top, #fefefe, #fefefe);background-image:-o-linear-gradient(top, #fefefe, #fefefe);background-image:linear-gradient(top, #fefefe, #fefefe);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fefefe', endColorstr='#fefefe', GradientType=0);border-color:#fefefe #fefefe #d8d8d8;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#fefefe;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]{background-color:#fefefe;*background-color:#f1f1f1;} +.navbar .btn-navbar:active,.navbar .btn-navbar.active{background-color:#e5e5e5 \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 .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;} @@ -588,13 +589,13 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .navbar .nav li.dropdown.active>.dropdown-toggle:hover{color:#ffffff;} .navbar .pull-right .dropdown-menu,.navbar .dropdown-menu.pull-right{left:auto;right:0;}.navbar .pull-right .dropdown-menu:before,.navbar .dropdown-menu.pull-right:before{left:auto;right:12px;} .navbar .pull-right .dropdown-menu:after,.navbar .dropdown-menu.pull-right:after{left:auto;right:13px;} -.breadcrumb{padding:7px 14px;margin:0 0 18px;list-style:none;background-color:#fbfbfb;background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 0 #ffffff;} +.breadcrumb{padding:7px 14px;margin:0 0 20px;list-style:none;background-color:#fbfbfb;background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 0 #ffffff;} .breadcrumb .divider{padding:0 5px;color:#999999;} .breadcrumb .active a{color:#333333;} -.pagination{height:36px;margin:18px 0;} +.pagination{height:40px;margin:20px 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{float:left;padding:0 14px;line-height:34px;text-decoration:none;border:1px solid #ddd;border-left-width:0;} +.pagination a{float:left;padding:0 14px;line-height:38px;text-decoration:none;border:1px solid #ddd;border-left-width:0;} .pagination a:hover,.pagination .active a{background-color:#f5f5f5;} .pagination .active a{color:#999999;cursor:default;} .pagination .disabled span,.pagination .disabled a,.pagination .disabled a:hover{color:#999999;background-color:transparent;cursor:default;} @@ -602,7 +603,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .pagination li:last-child a{-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-left:0;margin-bottom:18px;list-style:none;text-align:center;*zoom:1;}.pager:before,.pager:after{display:table;content:"";} +.pager{margin-left:0;margin-bottom:20px;list-style:none;text-align:center;*zoom:1;}.pager:before,.pager:after{display:table;content:"";} .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;} @@ -651,23 +652,23 @@ 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:"";} .thumbnails:after{clear:both;} .row-fluid .thumbnails{margin-left:0;} -.thumbnails>li{float:left;margin-bottom:18px;margin-left:20px;} +.thumbnails>li{float:left;margin-bottom:20px;margin-left:20px;} .thumbnail{display:block;padding:4px;line-height:1;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);} -a.thumbnail:hover{border-color:#366ddc;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} +a.thumbnail:hover{border-color:#da370f;-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;} -.label,.badge{font-size:10.998px;font-weight:bold;line-height:14px;color:#ffffff;vertical-align:baseline;white-space:nowrap;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#999999;} +.label,.badge{font-size:12.69px;font-weight:bold;line-height:14px;color:#ffffff;vertical-align:baseline;white-space:nowrap;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#999999;} .label{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:#e32c3b;} .label-important[href],.badge-important[href]{background-color:#c21a28;} -.label-warning,.badge-warning{background-color:#ff6600;} -.label-warning[href],.badge-warning[href]{background-color:#cc5200;} +.label-warning,.badge-warning{background-color:#da370f;} +.label-warning[href],.badge-warning[href]{background-color:#aa2b0c;} .label-success,.badge-success{background-color:#3d9400;} .label-success[href],.badge-success[href]{background-color:#286100;} -.label-info,.badge-info{background-color:#1155cc;} -.label-info[href],.badge-info[href]{background-color:#0d419d;} +.label-info,.badge-info{background-color:#029acf;} +.label-info[href],.badge-info[href]{background-color:#02749c;} .label-inverse,.badge-inverse{background-color:#333333;} .label-inverse[href],.badge-inverse[href]{background-color:#1a1a1a;} @-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:18px;margin-bottom:18px;background-color:#f7f7f7;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} @@ -680,15 +681,15 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} .progress-success.progress-striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} .progress-info .bar{background-color:#4bb1cf;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-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(top, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);} .progress-info.progress-striped .bar{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:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} -.progress-warning .bar{background-color:#ff822e;background-image:-moz-linear-gradient(top, #ff944d, #ff6600);background-image:-ms-linear-gradient(top, #ff944d, #ff6600);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ff944d), to(#ff6600));background-image:-webkit-linear-gradient(top, #ff944d, #ff6600);background-image:-o-linear-gradient(top, #ff944d, #ff6600);background-image:linear-gradient(top, #ff944d, #ff6600);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff944d', endColorstr='#ff6600', GradientType=0);} -.progress-warning.progress-striped .bar{background-color:#ff944d;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} -.accordion{margin-bottom:18px;} +.progress-warning .bar{background-color:#e8532e;background-image:-moz-linear-gradient(top, #f26643, #da370f);background-image:-ms-linear-gradient(top, #f26643, #da370f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f26643), to(#da370f));background-image:-webkit-linear-gradient(top, #f26643, #da370f);background-image:-o-linear-gradient(top, #f26643, #da370f);background-image:linear-gradient(top, #f26643, #da370f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f26643', endColorstr='#da370f', GradientType=0);} +.progress-warning.progress-striped .bar{background-color:#f26643;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} +.accordion{margin-bottom:20px;} .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:18px;line-height:1;} +.carousel{position:relative;margin-bottom:20px;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;-ms-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;} @@ -705,63 +706,66 @@ a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} .carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#333333;background:rgba(0, 0, 0, 0.75);} .carousel-caption h4,.carousel-caption p{color:#ffffff;} .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:27px;color:inherit;} +.hero-unit p{font-size:18px;font-weight:200;line-height:30px;color:inherit;} .pull-right{float:right;} .pull-left{float:left;} .hide{display:none;} .show{display:block;} .invisible{visibility:hidden;} -h6,.hero-unit{color:#333333;} -.navbar .navbar-inner{-webkit-box-shadow:inset 0 -1px #cfcaca;-moz-box-shadow:inset 0 -1px #cfcaca;box-shadow:inset 0 -1px #cfcaca;border-bottom:1px solid #FFF;border-bottom:none;} -.navbar .brand{padding-top:10px;color:#333333;} -.navbar .navbar-text{padding:14px 10px 11px;text-shadow:none;font-weight:normal;font-size:11px;line-height:19px;} -.navbar .nav>li>a{padding-top:14px;text-shadow:none;font-weight:normal;font-size:11px;} -.navbar .nav>li>a:hover{text-decoration:underline;} +h6{color:inherit;} +.navbar .navbar-inner{-webkit-box-shadow:inset 0 -1px #cfcaca;-moz-box-shadow:inset 0 -1px #cfcaca;box-shadow:inset 0 -1px #cfcaca;} +.navbar .brand{padding:13px 20px 10px;font-weight:bold;}.navbar .brand:hover{color:#da370f;} +.navbar .navbar-text{padding:15px 20px 9px;line-height:19px;color:#999999;} +.navbar .nav>li>a{padding:15px 20px 9px;text-shadow:none;}.navbar .nav>li>a:hover{text-decoration:none;} .navbar .nav .active>a,.navbar .nav .active>a:hover{background-color:transparent;} -.navbar .nav-collapse .nav li.dropdown>.dropdown-toggle:hover{color:#555555;} -.navbar .nav li.dropdown .dropdown-toggle .caret,.navbar .nav li.open.dropdown .dropdown-toggle .caret{border-top-color:#555555;} -.navbar .nav-collapse .nav li>a{color:#333333;font-weight:normal;} -.navbar .nav-collapse .nav li>a:hover{background-color:transparent;color:#000000;text-decoration:underline;} -div.subnav{background-image:none;background-color:#f8f8f8;border-bottom:1px solid transparent;-webkit-box-shadow:0 1px 1px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.3);box-shadow:0 1px 1px rgba(0, 0, 0, 0.3);}div.subnav.subnav-fixed{-webkit-box-shadow:inset 0 5px #ffffff , 0 1px 1px rgba(0, 0, 0, 0.3);-moz-box-shadow:inset 0 5px #ffffff , 0 1px 1px rgba(0, 0, 0, 0.3);box-shadow:inset 0 5px #ffffff , 0 1px 1px rgba(0, 0, 0, 0.3);} -div.subnav .nav>li>a{padding-top:12px;color:#555555;font-weight:normal;font-size:11px;}div.subnav .nav>li>a:hover{text-decoration:underline;} -div.subnav .nav>li.open>a,div.subnav .nav>li.open>a:hover{background-color:transparent;border-left:1px solid whiteSmoke;border-right:1px solid #E5E5E5;} -@media (max-width:979px){form.navbar-form,form.navbar-search{border-top:1px solid #ccc;border-bottom:1px solid #ccc;}}.nav .nav-header{font-weight:normal;text-transform:none;} -.nav>li>a{font-size:11px;border-width:1px;} -.dropdown-menu{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;font-size:11px;} -.dropdown.open .dropdown-toggle{color:#333333;} -.nav-tabs>li>a,.nav-tabs>li>a:hover,.tabbable>.nav-tabs>li>a,.tabbable>.nav-tabs>li>a:hover{background-color:#ebebeb;border:1px solid #ccc;} -.tabbable>.nav-tabs>li.active>a{border-bottom:1px solid transparent;} +.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle:hover{color:#da370f;} +.navbar .nav li.dropdown .dropdown-toggle .caret{border-top-color:#555555;border-bottom-color:#555555;opacity:1;} +.navbar .nav li.dropdown:hover .dropdown-toggle .caret,.navbar .nav li.dropdown.active>.dropdown-toggle .caret,.navbar .nav li.dropdown.open .dropdown-toggle .caret{border-top-color:#da370f;border-bottom-color:#da370f;} +.navbar .nav-collapse.collapse .nav li>a{color:#555555;}.navbar .nav-collapse.collapse .nav li>a:hover{background-color:#eeeeee;} +div.subnav{background-image:none;background-color:#fefefe;border-bottom:1px solid transparent;-webkit-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2);-moz-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2);box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2);}div.subnav.subnav-fixed{-webkit-box-shadow:inset 0 5px #ffffff , 1px 1px 1px rgba(0, 0, 0, 0.2);-moz-box-shadow:inset 0 5px #ffffff , 1px 1px 1px rgba(0, 0, 0, 0.2);box-shadow:inset 0 5px #ffffff , 1px 1px 1px rgba(0, 0, 0, 0.2);} +div.subnav .nav>li>a{padding:14px 12px 10px;color:#555555;border-left-color:transparent;border-right-color:transparent;}div.subnav .nav>li>a:hover{background-color:transparent;color:#da370f;} +div.subnav .nav>li.active>a,div.subnav .nav>li.active>a:hover{border-left-color:transparent;border-right-color:transparent;background-color:transparent;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;color:#da370f;} +div.subnav .nav>li.dropdown.open>a,div.subnav .nav>li.dropdown.open>a:hover{border-left-color:transparent;border-right-color:transparent;background-color:transparent;color:#da370f;} +div.subnav .nav li.dropdown .dropdown-toggle .caret{border-top-color:#555555;border-bottom-color:#555555;opacity:1;} +div.subnav .nav li.dropdown:hover .dropdown-toggle .caret,div.subnav .nav li.dropdown.active .dropdown-toggle .caret,div.subnav .nav li.dropdown.open .dropdown-toggle .caret{border-top-color:#da370f;border-bottom-color:#da370f;opacity:1;} +div.subnav .dropdown-menu a:hover{background-color:#fbebe9;} +@media (max-width:979px){form.navbar-form,form.navbar-search{border-top:1px solid #ccc;border-bottom:1px solid #ccc;}}.nav .nav-header{font-size:13px;font-weight:normal;text-transform:none;} +.nav-tabs >li>a{background-color:#efefef;border:1px solid #ccc;color:#555555;}.nav-tabs >li>a:hover{border:1px solid #ccc;background-color:#fbebe9;color:#da370f;} +.nav-tabs >li.active>a,.nav-tabs >li.active>a:hover{background-color:#f7f7f7;} +.nav-tabs .dropdown .dropdown-toggle .caret{border-top-color:#555555;border-bottom-color:#555555;opacity:1;} +.nav-tabs .dropdown:hover .dropdown-toggle .caret{border-top-color:#da370f;border-bottom-color:#da370f;} +.nav-tabs .dropdown.open .dropdown-toggle{background-color:#fbebe9;border-color:#ccc;color:#da370f;}.nav-tabs .dropdown.open .dropdown-toggle .caret,.nav-tabs .dropdown.open .dropdown-toggle:hover .caret{border-top-color:#da370f;border-bottom-color:#da370f;opacity:1;} +.nav-tabs .dropdown-menu{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}.nav-tabs .dropdown-menu a{padding:8px 15px 3px;} +.tabbable .nav-tabs>li>a,.tabbable .nav-tabs>li>a:hover{border:1px solid #ccc;} +.tabbable .nav-tabs>li.active>a{border-bottom:1px solid transparent;} .tabbable.tabs-below>.nav-tabs>li.active>a,.tabbable.tabs-left>.nav-tabs>li.active>a,.tabbable.tabs-right>.nav-tabs>li.active>a{border-bottom:1px solid #ccc;} -.nav-pills>li>a:hover{background-color:transparent;} -.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover{background-color:#f3f3f3;} +.nav-pills li>a{color:#555555;}.nav-pills li>a:hover{background-color:#fbebe9;color:#da370f;} +.nav-pills li.active>a,.nav-pills li.active>a:hover{background-color:#fbebe9;color:#da370f;} +.nav-pills .dropdown .dropdown-toggle .caret{border-top-color:#555555;border-bottom-color:#555555;opacity:1;} +.nav-pills .dropdown:hover .dropdown-toggle .caret{border-top-color:#da370f;border-bottom-color:#da370f;} +.nav-pills .dropdown.open .dropdown-toggle,.nav-pills .dropdown.open:hover .dropdown-toggle{background-color:#fbebe9;color:#da370f;}.nav-pills .dropdown.open .dropdown-toggle .caret,.nav-pills .dropdown.open:hover .dropdown-toggle .caret{border-top-color:#da370f;border-bottom-color:#da370f;} +.nav-list li>a{color:#555555;}.nav-list li>a:hover{background-color:#fbebe9;color:#da370f;} +.nav-list li.active>a,.nav-list li.active>a:hover{background-color:#fbebe9;color:#da370f;} legend{border-bottom:1px solid #ddd;} -.navbar-search .search-query{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;background-color:#f3f3f3;color:#555555;} -.help-inline,.help-block{font-size:11px;} -.btn{-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;font-weight:bold;background-color:#fafafa;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);} -.btn-primary{background-color:#4376de;background-image:-moz-linear-gradient(top, #4c7de0, #366ddc);background-image:-ms-linear-gradient(top, #4c7de0, #366ddc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#4c7de0), to(#366ddc));background-image:-webkit-linear-gradient(top, #4c7de0, #366ddc);background-image:-o-linear-gradient(top, #4c7de0, #366ddc);background-image:linear-gradient(top, #4c7de0, #366ddc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4c7de0', endColorstr='#366ddc', GradientType=0);border-color:#366ddc #366ddc #1d4ba8;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#366ddc;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#366ddc;*background-color:#255fd4;} -.btn-primary:active,.btn-primary.active{background-color:#2155be \9;} -.btn-warning{background-color:#ff6f0f;background-image:-moz-linear-gradient(top, #ff751a, #ff6600);background-image:-ms-linear-gradient(top, #ff751a, #ff6600);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ff751a), to(#ff6600));background-image:-webkit-linear-gradient(top, #ff751a, #ff6600);background-image:-o-linear-gradient(top, #ff751a, #ff6600);background-image:linear-gradient(top, #ff751a, #ff6600);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff751a', endColorstr='#ff6600', GradientType=0);border-color:#ff6600 #ff6600 #b34700;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#ff6600;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#ff6600;*background-color:#e65c00;} -.btn-warning:active,.btn-warning.active{background-color:#cc5200 \9;} -.btn-danger{background-color:#e53a48;background-image:-moz-linear-gradient(top, #e64350, #e32c3b);background-image:-ms-linear-gradient(top, #e64350, #e32c3b);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#e64350), to(#e32c3b));background-image:-webkit-linear-gradient(top, #e64350, #e32c3b);background-image:-o-linear-gradient(top, #e64350, #e32c3b);background-image:linear-gradient(top, #e64350, #e32c3b);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#e64350', endColorstr='#e32c3b', GradientType=0);border-color:#e32c3b #e32c3b #ac1723;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#e32c3b;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{background-color:#e32c3b;*background-color:#d91d2c;} -.btn-danger:active,.btn-danger.active{background-color:#c21a28 \9;} -.btn-success{background-color:#43a300;background-image:-moz-linear-gradient(top, #48ae00, #3d9400);background-image:-ms-linear-gradient(top, #48ae00, #3d9400);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#48ae00), to(#3d9400));background-image:-webkit-linear-gradient(top, #48ae00, #3d9400);background-image:-o-linear-gradient(top, #48ae00, #3d9400);background-image:linear-gradient(top, #48ae00, #3d9400);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#48ae00', endColorstr='#3d9400', GradientType=0);border-color:#3d9400 #3d9400 #1d4800;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#3d9400;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{background-color:#3d9400;*background-color:#327b00;} -.btn-success:active,.btn-success.active{background-color:#286100 \9;} -.btn-info{background-color:#68c5e1;background-image:-moz-linear-gradient(top, #70c8e2, #5bc0de);background-image:-ms-linear-gradient(top, #70c8e2, #5bc0de);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#70c8e2), to(#5bc0de));background-image:-webkit-linear-gradient(top, #70c8e2, #5bc0de);background-image:-o-linear-gradient(top, #70c8e2, #5bc0de);background-image:linear-gradient(top, #70c8e2, #5bc0de);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#70c8e2', endColorstr='#5bc0de', GradientType=0);border-color:#5bc0de #5bc0de #28a1c5;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#5bc0de;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{background-color:#5bc0de;*background-color:#46b8da;} -.btn-info:active,.btn-info.active{background-color:#31b0d5 \9;} -.btn-inverse{background-color:#a54ca9;background-image:-moz-linear-gradient(top, #ac4fb0, #9b479f);background-image:-ms-linear-gradient(top, #ac4fb0, #9b479f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ac4fb0), to(#9b479f));background-image:-webkit-linear-gradient(top, #ac4fb0, #9b479f);background-image:-o-linear-gradient(top, #ac4fb0, #9b479f);background-image:linear-gradient(top, #ac4fb0, #9b479f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ac4fb0', endColorstr='#9b479f', GradientType=0);border-color:#9b479f #9b479f #672f6a;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#9b479f;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{background-color:#9b479f;*background-color:#8a3f8d;} -.btn-inverse:active,.btn-inverse.active{background-color:#79377c \9;} -.modal,.modal-header,.modal-footer{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.navbar-search .search-query{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;background-color:#f7f7f7;color:#555555;} +.help-inline,.help-block{font-size:13px;} +.btn{padding:6px 10px 2px;} +.btn-large{padding:11px 14px 8px;} +.btn-small{padding:5px 9px 3px;} +.btn-micro{padding:3px 6px 1px;} .modal-header{border-bottom:none;} -.modal-header,.modal-body{background-color:#f8f8f8;} -.modal-footer{background-color:#f3f3f3;} -i[class^="icon-"]{opacity:0.6;vertical-align:-2px;} -.alert,.alert p,.alert-heading{font-size:11px;} +.modal-header,.modal-body{background-color:#fefefe;} +.modal-footer{background-color:#f7f7f7;} +i[class^="icon-"]{opacity:0.5;vertical-align:-2px;} .progress{background-color:#e3e3e3;background-image:-moz-linear-gradient(top, #e0e0e0, #e8e8e8);background-image:-ms-linear-gradient(top, #e0e0e0, #e8e8e8);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#e0e0e0), to(#e8e8e8));background-image:-webkit-linear-gradient(top, #e0e0e0, #e8e8e8);background-image:-o-linear-gradient(top, #e0e0e0, #e8e8e8);background-image:linear-gradient(top, #e0e0e0, #e8e8e8);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#e0e0e0', endColorstr='#e8e8e8', GradientType=0);} -.label{font-size:11px;font-weight:normal;} -.hero-unit{background-color:#ffffff;-webkit-box-shadow:0 1px 1px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.3);box-shadow:0 1px 1px rgba(0, 0, 0, 0.3);} -.well{-webkit-box-shadow:0 1px 1px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.3);box-shadow:0 1px 1px rgba(0, 0, 0, 0.3);background-color:#ffffff;border:none;} -.breadcrumb{-webkit-box-shadow:0 1px 1px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.3);box-shadow:0 1px 1px rgba(0, 0, 0, 0.3);border:0px solid transparent;font-size:11px;} -footer.footer p{font-size:11px;} +.label{padding:4px 4px 3px;font-weight:normal;} +.hero-unit{background-color:#fefefe;-webkit-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);} +.well{-webkit-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);background-color:#ffffff;border:none;} +.breadcrumb{-webkit-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);box-shadow:1px 1px 1px rgba(0, 0, 0, 0.2) , -1px -1px 0 rgba(0, 0, 0, 0.1);border:0px solid transparent;}.breadcrumb li{padding-top:5px;text-shadow:none;} +.breadcrumb a{text-shadow:none;} +.breadcrumb a:hover{text-decoration:none;} +.pagination li>a{padding:4px 14px 0;color:#555555;}.pagination li>a:hover{background-color:#fbebe9;color:#da370f;} +.pagination li.active>a{background-color:#fbebe9;color:#da370f;} .pull-right{float:right;} .pull-left{float:left;} .hide{display:none;} diff --git a/simplex/bootswatch.less b/simplex/bootswatch.less index eb4c4d72..39ee8b87 100755 --- a/simplex/bootswatch.less +++ b/simplex/bootswatch.less @@ -3,12 +3,14 @@ // Version: 2.0.4 // ----------------------------------------------------- -@boxShadow: 0 1px 1px rgba(0, 0, 0, 0.3); +@import url('http://fonts.googleapis.com/css?family=Josefin+Sans:300,400,700'); + +@boxShadow: 1px 1px 1px rgba(0, 0, 0, 0.2); // TYPOGRAPHY // ----------------------------------------------------- -h6, .hero-unit { +h6 { color: @headingsColor; } @@ -19,32 +21,30 @@ h6, .hero-unit { .navbar-inner { .box-shadow(inset 0 -1px #CFCACA); - border-bottom: 1px solid #FFF; - border-bottom: none; } .brand { - padding-top: 10px; - color: @headingsColor; + padding: 13px 20px 10px; + font-weight: bold; + + &:hover { + color: @orange; + } } .navbar-text { - padding: 14px 10px 11px; - text-shadow: none; - font-weight: normal; - font-size: 11px; + padding: 15px 20px 9px; line-height: 19px; + color: @grayLight; } .nav > li > a { - padding-top: 14px; + padding: 15px 20px 9px; text-shadow: none; - font-weight: normal; - font-size: 11px; - } - .nav > li > a:hover { - text-decoration: underline; + &:hover { + text-decoration: none; + } } .nav .active > a, @@ -52,24 +52,33 @@ h6, .hero-unit { background-color: transparent; } - .nav-collapse .nav li.dropdown > .dropdown-toggle:hover { - color: @textColor; + .nav li.dropdown.open > .dropdown-toggle, + .nav li.dropdown.active > .dropdown-toggle:hover { + color: @linkColor; } - .nav li.dropdown .dropdown-toggle .caret, - .nav li.open.dropdown .dropdown-toggle .caret { + .nav li.dropdown .dropdown-toggle .caret { border-top-color: @textColor; + border-bottom-color: @textColor; + opacity: 1; } - .nav-collapse .nav li > a { - color: @headingsColor; - font-weight: normal; + .nav li.dropdown:hover .dropdown-toggle .caret, + .nav li.dropdown.active > .dropdown-toggle .caret, + .nav li.dropdown.open .dropdown-toggle .caret { + border-top-color: @linkColor; + border-bottom-color: @linkColor; } - .nav-collapse .nav li > a:hover { - background-color: transparent; - color: @black; - text-decoration: underline; + .nav-collapse.collapse { + + .nav li > a { + color: @textColor; + + &:hover { + background-color: @grayLighter; + } + } } } @@ -85,21 +94,50 @@ div.subnav { } .nav > li > a { - padding-top: 12px; + padding: 14px 12px 10px; color: @navbarText; - font-weight: normal; - font-size: 11px; + border-left-color: transparent; + border-right-color: transparent; &:hover { - text-decoration: underline; + background-color: transparent; + color: @linkColor; } } - .nav > li.open > a, - .nav > li.open > a:hover { + .nav > li.active > a, + .nav > li.active > a:hover { + border-left-color: transparent; + border-right-color: transparent; + background-color: transparent; + .box-shadow(none); + color: @linkColor; + } + + .nav > li.dropdown.open > a, + .nav > li.dropdown.open > a:hover { + border-left-color: transparent; + border-right-color: transparent; background-color: transparent; - border-left: 1px solid whiteSmoke; - border-right: 1px solid #E5E5E5; + color: @linkColor; + } + + .nav li.dropdown .dropdown-toggle .caret { + border-top-color: @textColor; + border-bottom-color: @textColor; + opacity: 1; + } + + .nav li.dropdown:hover .dropdown-toggle .caret, + .nav li.dropdown.active .dropdown-toggle .caret, + .nav li.dropdown.open .dropdown-toggle .caret { + border-top-color: @linkColor; + border-bottom-color: @linkColor; + opacity: 1; + } + + .dropdown-menu a:hover { + background-color: @dropdownLinkBackgroundHover; } } @@ -114,49 +152,142 @@ div.subnav { // ----------------------------------------------------- .nav .nav-header { + font-size: 13px; font-weight: normal; text-transform: none; } -.nav > li > a { - font-size: 11px; - border-width: 1px; -} +.nav-tabs { -.dropdown-menu { - .border-radius(0); - font-size: 11px; -} + & > li > a { + background-color: darken(@bodyBackground, 3%); + border: 1px solid #ccc; + color: @textColor; -.dropdown.open .dropdown-toggle { - color: @headingsColor; -} + &:hover { + border: 1px solid #ccc; + background-color: @dropdownLinkBackgroundHover; + color: @linkColor; + } + } -.nav-tabs > li > a, -.nav-tabs > li > a:hover, -.tabbable > .nav-tabs > li > a, -.tabbable > .nav-tabs > li > a:hover { - background-color: darken(@bodyBackground, 3%); - border: 1px solid #ccc; -} + & > li.active > a, + & > li.active > a:hover { + background-color: @bodyBackground; + } -.tabbable > .nav-tabs > li.active > a { - border-bottom: 1px solid transparent; + .dropdown { + + .dropdown-toggle .caret { + border-top-color: @textColor; + border-bottom-color: @textColor; + opacity: 1; + } + + &:hover .dropdown-toggle .caret { + border-top-color: @linkColor; + border-bottom-color: @linkColor; + } + } + + .dropdown.open .dropdown-toggle { + + background-color: @dropdownLinkBackgroundHover; + border-color: #ccc; + color: @linkColor; + + .caret, + &:hover .caret { + border-top-color: @linkColor; + border-bottom-color: @linkColor; + opacity: 1; + } + } + + .dropdown-menu { + + .border-radius(0); + + a { + padding: 8px 15px 3px; + } + } } -.tabbable.tabs-below > .nav-tabs > li.active > a, -.tabbable.tabs-left > .nav-tabs > li.active > a, -.tabbable.tabs-right > .nav-tabs > li.active > a { - border-bottom: 1px solid #ccc; +.tabbable { + + .nav-tabs > li > a, + .nav-tabs > li > a:hover { + border: 1px solid #ccc; + } + + .nav-tabs > li.active > a { + border-bottom: 1px solid transparent; + } + + &.tabs-below > .nav-tabs > li.active > a, + &.tabs-left > .nav-tabs > li.active > a, + &.tabs-right > .nav-tabs > li.active > a { + border-bottom: 1px solid #ccc; + } } -.nav-pills > li > a:hover { - background-color: transparent; +.nav-pills { + + li > a { + color: @textColor; + + &:hover { + background-color: @dropdownLinkBackgroundHover; + color: @linkColor; + } + } + + li.active > a, + li.active > a:hover { + background-color: @dropdownLinkBackgroundHover; + color: @linkColor; + } + + .dropdown .dropdown-toggle .caret { + border-top-color: @textColor; + border-bottom-color: @textColor; + opacity: 1; + } + + .dropdown:hover .dropdown-toggle .caret { + border-top-color: @linkColor; + border-bottom-color: @linkColor; + } + + .dropdown.open .dropdown-toggle, + .dropdown.open:hover .dropdown-toggle { + background-color: @dropdownLinkBackgroundHover; + color: @linkColor; + + .caret { + border-top-color: @linkColor; + border-bottom-color: @linkColor; + } + } } -.nav-tabs > li.active > a, -.nav-tabs > li.active > a:hover { - background-color: @bodyBackground; +.nav-list { + + li > a { + color: @textColor; + + &:hover { + background-color: @dropdownLinkBackgroundHover; + color: @linkColor; + } + } + + li.active > a, + li.active > a:hover { + background-color: @dropdownLinkBackgroundHover; + color: @linkColor; + } } // FORMS @@ -174,7 +305,7 @@ legend { } .help-inline, .help-block { - font-size: 11px; + font-size: 13px; } // TABLES @@ -185,44 +316,24 @@ legend { // ----------------------------------------------------- .btn { - .border-radius(2px); - font-weight: bold; - #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); -} - -.btn-primary { - .buttonBackground(lighten(@btnPrimaryBackground, 5%), @btnPrimaryBackground); -} - -.btn-warning { - .buttonBackground(lighten(@orange, 5%), @orange); -} - -.btn-danger { - .buttonBackground(lighten(@red, 5%), @red); + padding: 6px 10px 2px; } -.btn-success { - .buttonBackground(lighten(@green, 5%), @green); +.btn-large { + padding: 11px 14px 8px; } -.btn-info { - .buttonBackground(lighten(#5bc0de, 5%), #5bc0de); +.btn-small { + padding: 5px 9px 3px; } -.btn-inverse { - .buttonBackground(lighten(@purple, 5%), @purple); +.btn-micro { + padding: 3px 6px 1px; } // MODALS // ----------------------------------------------------- -.modal, -.modal-header, -.modal-footer { - .border-radius(0); -} - .modal-header { border-bottom: none; } @@ -240,40 +351,63 @@ legend { // ----------------------------------------------------- i[class^="icon-"]{ - opacity: 0.6; + opacity: 0.5; vertical-align: -2px; } -.alert, .alert p, .alert-heading { - font-size: 11px; -} - .progress { #gradient > .vertical(#e0e0e0, #e8e8e8); } .label { - font-size: 11px; + padding: 4px 4px 3px; font-weight: normal; } .hero-unit { - background-color: @white; - .box-shadow(@boxShadow); + background-color: @navbarBackground; + .box-shadow(@boxShadow~", "-1px -1px 0 rgba(0, 0, 0, 0.1)); } .well { - .box-shadow(@boxShadow); + .box-shadow(@boxShadow~", "-1px -1px 0 rgba(0, 0, 0, 0.1)); background-color: @white; border: none; } .breadcrumb { - .box-shadow(@boxShadow); + .box-shadow(@boxShadow~", "-1px -1px 0 rgba(0, 0, 0, 0.1)); border: 0px solid transparent; - font-size: 11px; + + li { + padding-top: 5px; + text-shadow: none; + } + + a { + text-shadow: none; + } + + a:hover { + text-decoration: none; + } } -footer.footer p { - font-size: 11px; +.pagination { + + li > a { + padding: 4px 14px 0; + color: @textColor; + + &:hover { + background-color: @dropdownLinkBackgroundHover; + color: @linkColor; + } + } + + li.active > a { + background-color: @dropdownLinkBackgroundHover; + color: @linkColor; + } + } diff --git a/simplex/variables.less b/simplex/variables.less index 69a5ac81..6d6a914d 100755 --- a/simplex/variables.less +++ b/simplex/variables.less @@ -21,42 +21,42 @@ // Accent colors // ------------------------- -@blue: #15C; +@blue: #029ACF; @blueDark: #043755; @green: #3D9400; @red: #E32C3B; @yellow: #FFCA27; -@orange: #FF6600; +@orange: #DA370F; @pink: #ED2590; @purple: #9B479F; // Scaffolding // ------------------------- -@bodyBackground: #F3F3F3; +@bodyBackground: #F7F7F7; @textColor: @gray; // Links // ------------------------- -@linkColor: #366DDC; -@linkColorHover: darken(@linkColor, 15%); +@linkColor: @orange; +@linkColorHover: @linkColor; // Typography // ------------------------- -@sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif; +@sansFontFamily: "Josefin Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; @serifFontFamily: Georgia, "Times New Roman", Times, serif; @monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace; -@baseFontSize: 13px; +@baseFontSize: 15px; @baseFontFamily: @sansFontFamily; -@baseLineHeight: 18px; +@baseLineHeight: 20px; @altFontFamily: @serifFontFamily; @headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily @headingsFontWeight: bold; // instead of browser default, bold -@headingsColor: @grayDark; // empty to use BS default, @textColor +@headingsColor: inherit; // empty to use BS default, @textColor // Tables @@ -73,20 +73,20 @@ @btnBackgroundHighlight: darken(@white, 10%); @btnBorder: darken(@white, 20%); -@btnPrimaryBackground: @linkColor; -@btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 15%); +@btnPrimaryBackground: lighten(@linkColor, 5%); +@btnPrimaryBackgroundHighlight: @linkColor; -@btnInfoBackground: #5bc0de; -@btnInfoBackgroundHighlight: #2f96b4; +@btnInfoBackground: lighten(#5bc0de, 5%); +@btnInfoBackgroundHighlight: #5bc0de; -@btnSuccessBackground: #62c462; -@btnSuccessBackgroundHighlight: #51a351; +@btnSuccessBackground: lighten(@green, 5%); +@btnSuccessBackgroundHighlight: @green; -@btnWarningBackground: lighten(@orange, 15%); -@btnWarningBackgroundHighlight: @orange; +@btnWarningBackground: lighten(@yellow, 5%); +@btnWarningBackgroundHighlight: @yellow; -@btnDangerBackground: #ee5f5b; -@btnDangerBackgroundHighlight: #bd362f; +@btnDangerBackground: lighten(@red, 5%); +@btnDangerBackgroundHighlight: @red; @btnInverseBackground: @gray; @btnInverseBackgroundHighlight: @grayDarker; @@ -104,9 +104,9 @@ // ------------------------- @dropdownBackground: @white; @dropdownBorder: rgba(0,0,0,.2); -@dropdownLinkColor: @grayDark; -@dropdownLinkColorHover: @white; -@dropdownLinkBackgroundHover: @linkColor; +@dropdownLinkColor: @textColor; +@dropdownLinkColorHover: @linkColor; +@dropdownLinkBackgroundHover: #FBEBE9; @dropdownDividerTop: #e5e5e5; @dropdownDividerBottom: @white; @@ -146,13 +146,13 @@ // Navbar // ------------------------- @navbarHeight: 40px; -@navbarBackground: #F8F8F8; +@navbarBackground: #fefefe; @navbarBackgroundHighlight: @navbarBackground; @navbarText: @gray; @navbarLinkColor: @gray; -@navbarLinkColorHover: @grayDark; -@navbarLinkColorActive: @navbarLinkColorHover; +@navbarLinkColorHover: @orange; +@navbarLinkColorActive: @orange; @navbarLinkBackgroundHover: transparent; @navbarLinkBackgroundActive: @navbarBackground; |