From e05195e47adc905377c887363041720edb882e0d Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Tue, 21 Oct 2014 18:00:56 -0700 Subject: [PATCH] improve the style --- public/css/styles.less | 21 + public/css/themes/yeti.less | 1383 ++++++++++++++---------------- views/curriculum/curriculum.jade | 30 +- views/home.jade | 16 +- views/partials/challenges.jade | 2 +- views/partials/courses.jade | 2 +- views/partials/navbar.jade | 3 +- 7 files changed, 679 insertions(+), 778 deletions(-) diff --git a/public/css/styles.less b/public/css/styles.less index 283bffa5b94..99d7999a30a 100644 --- a/public/css/styles.less +++ b/public/css/styles.less @@ -109,4 +109,25 @@ ul { display:block; } +@media (min-width: 767px) { + .landing-panel-body { + padding-left: 40px; + padding-right: 40px; + } +} + +.landing-panel-heading { + font-size: 40px; +} + +.navbar-brand { + font-size: 30px; +} + +.landing-icon { + font-size: 150px; + margin-top: -20px; + margin-bottom: -20px; +} + /**/ \ No newline at end of file diff --git a/public/css/themes/yeti.less b/public/css/themes/yeti.less index 7bc28af28a9..b060c1bbe85 100644 --- a/public/css/themes/yeti.less +++ b/public/css/themes/yeti.less @@ -1,4 +1,4 @@ -@import url("//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700"); +@import url("//fonts.googleapis.com/css?family=Lato:300,400,700"); /*! * bootswatch v3.2.0 * Homepage: http://bootswatch.com @@ -889,11 +889,11 @@ html { -webkit-tap-highlight-color: rgba(0, 0, 0, 0); } body { - font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 15px; - line-height: 1.4; - color: #222222; - background-color: #ffffff; + line-height: 1.42857143; + color: #ebebeb; + background-color: #2b3e50; } input, button, @@ -904,12 +904,12 @@ textarea { line-height: inherit; } a { - color: #008cba; + color: #df691a; text-decoration: none; } a:hover, a:focus { - color: #00526e; + color: #df691a; text-decoration: underline; } a:focus { @@ -938,8 +938,8 @@ img { } .img-thumbnail { padding: 4px; - line-height: 1.4; - background-color: #ffffff; + line-height: 1.42857143; + background-color: #2b3e50; border: 1px solid #dddddd; border-radius: 0; -webkit-transition: all 0.2s ease-in-out; @@ -957,7 +957,7 @@ hr { margin-top: 21px; margin-bottom: 21px; border: 0; - border-top: 1px solid #dddddd; + border-top: 1px solid #4e5d6c; } .sr-only { position: absolute; @@ -990,7 +990,7 @@ h6, .h4, .h5, .h6 { - font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: inherit; font-weight: 300; line-height: 1.1; color: inherit; @@ -1021,7 +1021,7 @@ h6 .small, .h6 .small { font-weight: normal; line-height: 1; - color: #999999; + color: #ebebeb; } h1, .h1, @@ -1109,14 +1109,14 @@ p { } small, .small { - font-size: 80%; + font-size: 86%; } cite { font-style: normal; } mark, .mark { - background-color: #fcf8e3; + background-color: #f0ad4e; padding: .2em; } .text-left { @@ -1144,73 +1144,73 @@ mark, text-transform: capitalize; } .text-muted { - color: #999999; + color: #4e5d6c; } .text-primary { - color: #008cba; + color: #df691a; } a.text-primary:hover { - color: #006687; + color: #b15315; } .text-success { - color: #43ac6a; + color: #ebebeb; } a.text-success:hover { - color: #358753; + color: #d2d2d2; } .text-info { - color: #5bc0de; + color: #ebebeb; } a.text-info:hover { - color: #31b0d5; + color: #d2d2d2; } .text-warning { - color: #e99002; + color: #ebebeb; } a.text-warning:hover { - color: #b67102; + color: #d2d2d2; } .text-danger { - color: #f04124; + color: #ebebeb; } a.text-danger:hover { - color: #d32a0e; + color: #d2d2d2; } .bg-primary { color: #fff; - background-color: #008cba; + background-color: #df691a; } a.bg-primary:hover { - background-color: #006687; + background-color: #b15315; } .bg-success { - background-color: #dff0d8; + background-color: #5cb85c; } a.bg-success:hover { - background-color: #c1e2b3; + background-color: #449d44; } .bg-info { - background-color: #d9edf7; + background-color: #5bc0de; } a.bg-info:hover { - background-color: #afd9ee; + background-color: #31b0d5; } .bg-warning { - background-color: #fcf8e3; + background-color: #f0ad4e; } a.bg-warning:hover { - background-color: #f7ecb5; + background-color: #ec971f; } .bg-danger { - background-color: #f2dede; + background-color: #d9534f; } a.bg-danger:hover { - background-color: #e4b9b9; + background-color: #c9302c; } .page-header { padding-bottom: 9.5px; margin: 42px 0 21px; - border-bottom: 1px solid #dddddd; + border-bottom: 1px solid #ebebeb; } ul, ol { @@ -1243,7 +1243,7 @@ dl { } dt, dd { - line-height: 1.4; + line-height: 1.42857143; } dt { font-weight: bold; @@ -1268,7 +1268,7 @@ dd { abbr[title], abbr[data-original-title] { cursor: help; - border-bottom: 1px dotted #999999; + border-bottom: 1px dotted #4e5d6c; } .initialism { font-size: 90%; @@ -1278,7 +1278,7 @@ blockquote { padding: 10.5px 21px; margin: 0 0 21px; font-size: 18.75px; - border-left: 5px solid #dddddd; + border-left: 5px solid #4e5d6c; } blockquote p:last-child, blockquote ul:last-child, @@ -1290,8 +1290,8 @@ blockquote small, blockquote .small { display: block; font-size: 80%; - line-height: 1.4; - color: #6f6f6f; + line-height: 1.42857143; + color: #ebebeb; } blockquote footer:before, blockquote small:before, @@ -1302,7 +1302,7 @@ blockquote .small:before { blockquote.pull-right { padding-right: 15px; padding-left: 0; - border-right: 5px solid #dddddd; + border-right: 5px solid #4e5d6c; border-left: 0; text-align: right; } @@ -1329,7 +1329,7 @@ blockquote:after { address { margin-bottom: 21px; font-style: normal; - line-height: 1.4; + line-height: 1.42857143; } code, kbd, @@ -1362,7 +1362,7 @@ pre { padding: 10px; margin: 0 0 10.5px; font-size: 14px; - line-height: 1.4; + line-height: 1.42857143; word-break: break-all; word-wrap: break-word; color: #333333; @@ -2066,14 +2066,14 @@ th { .table > thead > tr > td, .table > tbody > tr > td, .table > tfoot > tr > td { - padding: 8px; - line-height: 1.4; + padding: 6px; + line-height: 1.42857143; vertical-align: top; - border-top: 1px solid #dddddd; + border-top: 1px solid #4e5d6c; } .table > thead > tr > th { vertical-align: bottom; - border-bottom: 2px solid #dddddd; + border-bottom: 2px solid #4e5d6c; } .table > caption + thead > tr:first-child > th, .table > colgroup + thead > tr:first-child > th, @@ -2084,10 +2084,10 @@ th { border-top: 0; } .table > tbody + tbody { - border-top: 2px solid #dddddd; + border-top: 2px solid #4e5d6c; } .table .table { - background-color: #ffffff; + background-color: #2b3e50; } .table-condensed > thead > tr > th, .table-condensed > tbody > tr > th, @@ -2095,10 +2095,10 @@ th { .table-condensed > thead > tr > td, .table-condensed > tbody > tr > td, .table-condensed > tfoot > tr > td { - padding: 5px; + padding: 3px; } .table-bordered { - border: 1px solid #dddddd; + border: 1px solid #4e5d6c; } .table-bordered > thead > tr > th, .table-bordered > tbody > tr > th, @@ -2106,7 +2106,7 @@ th { .table-bordered > thead > tr > td, .table-bordered > tbody > tr > td, .table-bordered > tfoot > tr > td { - border: 1px solid #dddddd; + border: 1px solid #4e5d6c; } .table-bordered > thead > tr > th, .table-bordered > thead > tr > td { @@ -2114,11 +2114,11 @@ th { } .table-striped > tbody > tr:nth-child(odd) > td, .table-striped > tbody > tr:nth-child(odd) > th { - background-color: #f9f9f9; + background-color: #4e5d6c; } .table-hover > tbody > tr:hover > td, .table-hover > tbody > tr:hover > th { - background-color: #f5f5f5; + background-color: #485563; } table col[class*="col-"] { position: static; @@ -2143,14 +2143,14 @@ table th[class*="col-"] { .table > thead > tr.active > th, .table > tbody > tr.active > th, .table > tfoot > tr.active > th { - background-color: #f5f5f5; + background-color: #485563; } .table-hover > tbody > tr > td.active:hover, .table-hover > tbody > tr > th.active:hover, .table-hover > tbody > tr.active:hover > td, .table-hover > tbody > tr:hover > .active, .table-hover > tbody > tr.active:hover > th { - background-color: #e8e8e8; + background-color: #3d4954; } .table > thead > tr > td.success, .table > tbody > tr > td.success, @@ -2164,14 +2164,14 @@ table th[class*="col-"] { .table > thead > tr.success > th, .table > tbody > tr.success > th, .table > tfoot > tr.success > th { - background-color: #dff0d8; + background-color: #5cb85c; } .table-hover > tbody > tr > td.success:hover, .table-hover > tbody > tr > th.success:hover, .table-hover > tbody > tr.success:hover > td, .table-hover > tbody > tr:hover > .success, .table-hover > tbody > tr.success:hover > th { - background-color: #d0e9c6; + background-color: #4cae4c; } .table > thead > tr > td.info, .table > tbody > tr > td.info, @@ -2185,14 +2185,14 @@ table th[class*="col-"] { .table > thead > tr.info > th, .table > tbody > tr.info > th, .table > tfoot > tr.info > th { - background-color: #d9edf7; + background-color: #5bc0de; } .table-hover > tbody > tr > td.info:hover, .table-hover > tbody > tr > th.info:hover, .table-hover > tbody > tr.info:hover > td, .table-hover > tbody > tr:hover > .info, .table-hover > tbody > tr.info:hover > th { - background-color: #c4e3f3; + background-color: #46b8da; } .table > thead > tr > td.warning, .table > tbody > tr > td.warning, @@ -2206,14 +2206,14 @@ table th[class*="col-"] { .table > thead > tr.warning > th, .table > tbody > tr.warning > th, .table > tfoot > tr.warning > th { - background-color: #fcf8e3; + background-color: #f0ad4e; } .table-hover > tbody > tr > td.warning:hover, .table-hover > tbody > tr > th.warning:hover, .table-hover > tbody > tr.warning:hover > td, .table-hover > tbody > tr:hover > .warning, .table-hover > tbody > tr.warning:hover > th { - background-color: #faf2cc; + background-color: #eea236; } .table > thead > tr > td.danger, .table > tbody > tr > td.danger, @@ -2227,14 +2227,14 @@ table th[class*="col-"] { .table > thead > tr.danger > th, .table > tbody > tr.danger > th, .table > tfoot > tr.danger > th { - background-color: #f2dede; + background-color: #d9534f; } .table-hover > tbody > tr > td.danger:hover, .table-hover > tbody > tr > th.danger:hover, .table-hover > tbody > tr.danger:hover > td, .table-hover > tbody > tr:hover > .danger, .table-hover > tbody > tr.danger:hover > th { - background-color: #ebcccc; + background-color: #d43f3a; } @media screen and (max-width: 767px) { .table-responsive { @@ -2243,7 +2243,7 @@ table th[class*="col-"] { overflow-y: hidden; overflow-x: auto; -ms-overflow-style: -ms-autohiding-scrollbar; - border: 1px solid #dddddd; + border: 1px solid #4e5d6c; -webkit-overflow-scrolling: touch; } .table-responsive > .table { @@ -2296,9 +2296,9 @@ legend { margin-bottom: 21px; font-size: 22.5px; line-height: inherit; - color: #333333; + color: #ebebeb; border: 0; - border-bottom: 1px solid #e5e5e5; + border-bottom: 1px solid #4e5d6c; } label { display: inline-block; @@ -2339,20 +2339,20 @@ output { display: block; padding-top: 9px; font-size: 15px; - line-height: 1.4; - color: #6f6f6f; + line-height: 1.42857143; + color: #2b3e50; } .form-control { display: block; width: 100%; height: 39px; - padding: 8px 12px; + padding: 8px 16px; font-size: 15px; - line-height: 1.4; - color: #6f6f6f; + line-height: 1.42857143; + color: #2b3e50; background-color: #ffffff; background-image: none; - border: 1px solid #cccccc; + border: 1px solid transparent; border-radius: 0; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); @@ -2361,26 +2361,26 @@ output { transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; } .form-control:focus { - border-color: #66afe9; + border-color: transparent; outline: 0; - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6); + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(0, 0, 0, 0.6); + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(0, 0, 0, 0.6); } .form-control::-moz-placeholder { - color: #999999; + color: #cccccc; opacity: 1; } .form-control:-ms-input-placeholder { - color: #999999; + color: #cccccc; } .form-control::-webkit-input-placeholder { - color: #999999; + color: #cccccc; } .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { cursor: not-allowed; - background-color: #eeeeee; + background-color: #ebebeb; opacity: 1; } textarea.form-control { @@ -2394,19 +2394,19 @@ input[type="time"], input[type="datetime-local"], input[type="month"] { line-height: 39px; - line-height: 1.4; + line-height: 1.42857143 \0; } input[type="date"].input-sm, input[type="time"].input-sm, input[type="datetime-local"].input-sm, input[type="month"].input-sm { - line-height: 36px; + line-height: 31px; } input[type="date"].input-lg, input[type="time"].input-lg, input[type="datetime-local"].input-lg, input[type="month"].input-lg { - line-height: 60px; + line-height: 52px; } .form-group { margin-bottom: 15px; @@ -2484,15 +2484,15 @@ fieldset[disabled] .checkbox label { } .input-sm, .form-horizontal .form-group-sm .form-control { - height: 36px; - padding: 8px 12px; - font-size: 12px; + height: 31px; + padding: 5px 10px; + font-size: 13px; line-height: 1.5; border-radius: 0; } select.input-sm { - height: 36px; - line-height: 36px; + height: 31px; + line-height: 31px; } textarea.input-sm, select[multiple].input-sm { @@ -2500,15 +2500,15 @@ select[multiple].input-sm { } .input-lg, .form-horizontal .form-group-lg .form-control { - height: 60px; - padding: 16px 20px; + height: 52px; + padding: 12px 24px; font-size: 19px; line-height: 1.33; border-radius: 0; } select.input-lg { - height: 60px; - line-height: 60px; + height: 52px; + line-height: 52px; } textarea.input-lg, select[multiple].input-lg { @@ -2532,14 +2532,14 @@ select[multiple].input-lg { text-align: center; } .input-lg + .form-control-feedback { - width: 60px; - height: 60px; - line-height: 60px; + width: 52px; + height: 52px; + line-height: 52px; } .input-sm + .form-control-feedback { - width: 36px; - height: 36px; - line-height: 36px; + width: 31px; + height: 31px; + line-height: 31px; } .has-success .help-block, .has-success .control-label, @@ -2547,25 +2547,25 @@ select[multiple].input-lg { .has-success .checkbox, .has-success .radio-inline, .has-success .checkbox-inline { - color: #43ac6a; + color: #ebebeb; } .has-success .form-control { - border-color: #43ac6a; + border-color: #ebebeb; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .has-success .form-control:focus { - border-color: #358753; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #85d0a1; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #85d0a1; + border-color: #d2d2d2; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff; } .has-success .input-group-addon { - color: #43ac6a; - border-color: #43ac6a; - background-color: #dff0d8; + color: #ebebeb; + border-color: #ebebeb; + background-color: #5cb85c; } .has-success .form-control-feedback { - color: #43ac6a; + color: #ebebeb; } .has-warning .help-block, .has-warning .control-label, @@ -2573,25 +2573,25 @@ select[multiple].input-lg { .has-warning .checkbox, .has-warning .radio-inline, .has-warning .checkbox-inline { - color: #e99002; + color: #ebebeb; } .has-warning .form-control { - border-color: #e99002; + border-color: #ebebeb; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .has-warning .form-control:focus { - border-color: #b67102; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #febc53; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #febc53; + border-color: #d2d2d2; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff; } .has-warning .input-group-addon { - color: #e99002; - border-color: #e99002; - background-color: #fcf8e3; + color: #ebebeb; + border-color: #ebebeb; + background-color: #f0ad4e; } .has-warning .form-control-feedback { - color: #e99002; + color: #ebebeb; } .has-error .help-block, .has-error .control-label, @@ -2599,25 +2599,25 @@ select[multiple].input-lg { .has-error .checkbox, .has-error .radio-inline, .has-error .checkbox-inline { - color: #f04124; + color: #ebebeb; } .has-error .form-control { - border-color: #f04124; + border-color: #ebebeb; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); } .has-error .form-control:focus { - border-color: #d32a0e; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #f79483; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #f79483; + border-color: #d2d2d2; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff; } .has-error .input-group-addon { - color: #f04124; - border-color: #f04124; - background-color: #f2dede; + color: #ebebeb; + border-color: #ebebeb; + background-color: #d9534f; } .has-error .form-control-feedback { - color: #f04124; + color: #ebebeb; } .has-feedback label.sr-only ~ .form-control-feedback { top: 0; @@ -2626,7 +2626,7 @@ select[multiple].input-lg { display: block; margin-top: 5px; margin-bottom: 10px; - color: #626262; + color: #ffffff; } @media (min-width: 768px) { .form-inline .form-group { @@ -2704,12 +2704,12 @@ select[multiple].input-lg { } @media (min-width: 768px) { .form-horizontal .form-group-lg .control-label { - padding-top: 22.28px; + padding-top: 16.96px; } } @media (min-width: 768px) { .form-horizontal .form-group-sm .control-label { - padding-top: 9px; + padding-top: 6px; } } .btn { @@ -2722,9 +2722,9 @@ select[multiple].input-lg { background-image: none; border: 1px solid transparent; white-space: nowrap; - padding: 8px 12px; + padding: 8px 16px; font-size: 15px; - line-height: 1.4; + line-height: 1.42857143; border-radius: 0; -webkit-user-select: none; -moz-user-select: none; @@ -2740,7 +2740,7 @@ select[multiple].input-lg { } .btn:hover, .btn:focus { - color: #333333; + color: #ffffff; text-decoration: none; } .btn:active, @@ -2761,18 +2761,18 @@ fieldset[disabled] .btn { box-shadow: none; } .btn-default { - color: #333333; - background-color: #e7e7e7; - border-color: #cccccc; + color: #ffffff; + background-color: #4e5d6c; + border-color: transparent; } .btn-default:hover, .btn-default:focus, .btn-default:active, .btn-default.active, .open > .dropdown-toggle.btn-default { - color: #333333; - background-color: #cecece; - border-color: #adadad; + color: #ffffff; + background-color: #39444e; + border-color: rgba(0, 0, 0, 0); } .btn-default:active, .btn-default.active, @@ -2794,17 +2794,17 @@ fieldset[disabled] .btn-default:active, .btn-default.disabled.active, .btn-default[disabled].active, fieldset[disabled] .btn-default.active { - background-color: #e7e7e7; - border-color: #cccccc; + background-color: #4e5d6c; + border-color: transparent; } .btn-default .badge { - color: #e7e7e7; - background-color: #333333; + color: #4e5d6c; + background-color: #ffffff; } .btn-primary { color: #ffffff; - background-color: #008cba; - border-color: #0079a1; + background-color: #df691a; + border-color: transparent; } .btn-primary:hover, .btn-primary:focus, @@ -2812,8 +2812,8 @@ fieldset[disabled] .btn-default.active { .btn-primary.active, .open > .dropdown-toggle.btn-primary { color: #ffffff; - background-color: #006687; - border-color: #004b63; + background-color: #b15315; + border-color: rgba(0, 0, 0, 0); } .btn-primary:active, .btn-primary.active, @@ -2835,17 +2835,17 @@ fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { - background-color: #008cba; - border-color: #0079a1; + background-color: #df691a; + border-color: transparent; } .btn-primary .badge { - color: #008cba; + color: #df691a; background-color: #ffffff; } .btn-success { color: #ffffff; - background-color: #43ac6a; - border-color: #3c9a5f; + background-color: #5cb85c; + border-color: transparent; } .btn-success:hover, .btn-success:focus, @@ -2853,8 +2853,8 @@ fieldset[disabled] .btn-primary.active { .btn-success.active, .open > .dropdown-toggle.btn-success { color: #ffffff; - background-color: #358753; - border-color: #2b6e44; + background-color: #449d44; + border-color: rgba(0, 0, 0, 0); } .btn-success:active, .btn-success.active, @@ -2876,17 +2876,17 @@ fieldset[disabled] .btn-success:active, .btn-success.disabled.active, .btn-success[disabled].active, fieldset[disabled] .btn-success.active { - background-color: #43ac6a; - border-color: #3c9a5f; + background-color: #5cb85c; + border-color: transparent; } .btn-success .badge { - color: #43ac6a; + color: #5cb85c; background-color: #ffffff; } .btn-info { color: #ffffff; background-color: #5bc0de; - border-color: #46b8da; + border-color: transparent; } .btn-info:hover, .btn-info:focus, @@ -2895,7 +2895,7 @@ fieldset[disabled] .btn-success.active { .open > .dropdown-toggle.btn-info { color: #ffffff; background-color: #31b0d5; - border-color: #269abc; + border-color: rgba(0, 0, 0, 0); } .btn-info:active, .btn-info.active, @@ -2918,7 +2918,7 @@ fieldset[disabled] .btn-info:active, .btn-info[disabled].active, fieldset[disabled] .btn-info.active { background-color: #5bc0de; - border-color: #46b8da; + border-color: transparent; } .btn-info .badge { color: #5bc0de; @@ -2926,8 +2926,8 @@ fieldset[disabled] .btn-info.active { } .btn-warning { color: #ffffff; - background-color: #e99002; - border-color: #d08002; + background-color: #f0ad4e; + border-color: transparent; } .btn-warning:hover, .btn-warning:focus, @@ -2935,8 +2935,8 @@ fieldset[disabled] .btn-info.active { .btn-warning.active, .open > .dropdown-toggle.btn-warning { color: #ffffff; - background-color: #b67102; - border-color: #935b01; + background-color: #ec971f; + border-color: rgba(0, 0, 0, 0); } .btn-warning:active, .btn-warning.active, @@ -2958,17 +2958,17 @@ fieldset[disabled] .btn-warning:active, .btn-warning.disabled.active, .btn-warning[disabled].active, fieldset[disabled] .btn-warning.active { - background-color: #e99002; - border-color: #d08002; + background-color: #f0ad4e; + border-color: transparent; } .btn-warning .badge { - color: #e99002; + color: #f0ad4e; background-color: #ffffff; } .btn-danger { color: #ffffff; - background-color: #f04124; - border-color: #ea2f10; + background-color: #d9534f; + border-color: transparent; } .btn-danger:hover, .btn-danger:focus, @@ -2976,8 +2976,8 @@ fieldset[disabled] .btn-warning.active { .btn-danger.active, .open > .dropdown-toggle.btn-danger { color: #ffffff; - background-color: #d32a0e; - border-color: #b1240c; + background-color: #c9302c; + border-color: rgba(0, 0, 0, 0); } .btn-danger:active, .btn-danger.active, @@ -2999,15 +2999,15 @@ fieldset[disabled] .btn-danger:active, .btn-danger.disabled.active, .btn-danger[disabled].active, fieldset[disabled] .btn-danger.active { - background-color: #f04124; - border-color: #ea2f10; + background-color: #d9534f; + border-color: transparent; } .btn-danger .badge { - color: #f04124; + color: #d9534f; background-color: #ffffff; } .btn-link { - color: #008cba; + color: #df691a; font-weight: normal; cursor: pointer; border-radius: 0; @@ -3028,7 +3028,7 @@ fieldset[disabled] .btn-link { } .btn-link:hover, .btn-link:focus { - color: #00526e; + color: #df691a; text-decoration: underline; background-color: transparent; } @@ -3036,27 +3036,27 @@ fieldset[disabled] .btn-link { fieldset[disabled] .btn-link:hover, .btn-link[disabled]:focus, fieldset[disabled] .btn-link:focus { - color: #999999; + color: #4e5d6c; text-decoration: none; } .btn-lg, .btn-group-lg > .btn { - padding: 16px 20px; + padding: 12px 24px; font-size: 19px; line-height: 1.33; border-radius: 0; } .btn-sm, .btn-group-sm > .btn { - padding: 8px 12px; - font-size: 12px; + padding: 5px 10px; + font-size: 13px; line-height: 1.5; border-radius: 0; } .btn-xs, .btn-group-xs > .btn { - padding: 4px 6px; - font-size: 12px; + padding: 1px 5px; + font-size: 13px; line-height: 1.5; border-radius: 0; } @@ -3130,9 +3130,8 @@ tbody.collapse.in { list-style: none; font-size: 15px; text-align: left; - background-color: #ffffff; - border: 1px solid #cccccc; - border: 1px solid rgba(0, 0, 0, 0.15); + background-color: #4e5d6c; + border: 1px solid transparent; border-radius: 0; -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); @@ -3146,22 +3145,22 @@ tbody.collapse.in { height: 1px; margin: 9.5px 0; overflow: hidden; - background-color: rgba(0, 0, 0, 0.2); + background-color: #2b3e50; } .dropdown-menu > li > a { display: block; padding: 3px 20px; clear: both; font-weight: normal; - line-height: 1.4; - color: #555555; + line-height: 1.42857143; + color: #ebebeb; white-space: nowrap; } .dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus { text-decoration: none; - color: #262626; - background-color: #eeeeee; + color: #ebebeb; + background-color: #485563; } .dropdown-menu > .active > a, .dropdown-menu > .active > a:hover, @@ -3169,12 +3168,12 @@ tbody.collapse.in { color: #ffffff; text-decoration: none; outline: 0; - background-color: #008cba; + background-color: #df691a; } .dropdown-menu > .disabled > a, .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus { - color: #999999; + color: #2b3e50; } .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus { @@ -3201,9 +3200,9 @@ tbody.collapse.in { .dropdown-header { display: block; padding: 3px 20px; - font-size: 12px; - line-height: 1.4; - color: #999999; + font-size: 13px; + line-height: 1.42857143; + color: #2b3e50; white-space: nowrap; } .dropdown-backdrop { @@ -3431,8 +3430,8 @@ tbody.collapse.in { .input-group-lg > .form-control, .input-group-lg > .input-group-addon, .input-group-lg > .input-group-btn > .btn { - height: 60px; - padding: 16px 20px; + height: 52px; + padding: 12px 24px; font-size: 19px; line-height: 1.33; border-radius: 0; @@ -3440,8 +3439,8 @@ tbody.collapse.in { select.input-group-lg > .form-control, select.input-group-lg > .input-group-addon, select.input-group-lg > .input-group-btn > .btn { - height: 60px; - line-height: 60px; + height: 52px; + line-height: 52px; } textarea.input-group-lg > .form-control, textarea.input-group-lg > .input-group-addon, @@ -3454,17 +3453,17 @@ select[multiple].input-group-lg > .input-group-btn > .btn { .input-group-sm > .form-control, .input-group-sm > .input-group-addon, .input-group-sm > .input-group-btn > .btn { - height: 36px; - padding: 8px 12px; - font-size: 12px; + height: 31px; + padding: 5px 10px; + font-size: 13px; line-height: 1.5; border-radius: 0; } select.input-group-sm > .form-control, select.input-group-sm > .input-group-addon, select.input-group-sm > .input-group-btn > .btn { - height: 36px; - line-height: 36px; + height: 31px; + line-height: 31px; } textarea.input-group-sm > .form-control, textarea.input-group-sm > .input-group-addon, @@ -3491,23 +3490,23 @@ select[multiple].input-group-sm > .input-group-btn > .btn { vertical-align: middle; } .input-group-addon { - padding: 8px 12px; + padding: 8px 16px; font-size: 15px; font-weight: normal; line-height: 1; - color: #6f6f6f; + color: #2b3e50; text-align: center; - background-color: #eeeeee; - border: 1px solid #cccccc; + background-color: #4e5d6c; + border: 1px solid transparent; border-radius: 0; } .input-group-addon.input-sm { - padding: 8px 12px; - font-size: 12px; + padding: 5px 10px; + font-size: 13px; border-radius: 0; } .input-group-addon.input-lg { - padding: 16px 20px; + padding: 12px 24px; font-size: 19px; border-radius: 0; } @@ -3582,14 +3581,14 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .nav > li > a:hover, .nav > li > a:focus { text-decoration: none; - background-color: #eeeeee; + background-color: #4e5d6c; } .nav > li.disabled > a { - color: #999999; + color: #4e5d6c; } .nav > li.disabled > a:hover, .nav > li.disabled > a:focus { - color: #999999; + color: #4e5d6c; text-decoration: none; background-color: transparent; cursor: not-allowed; @@ -3597,8 +3596,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .nav .open > a, .nav .open > a:hover, .nav .open > a:focus { - background-color: #eeeeee; - border-color: #008cba; + background-color: #4e5d6c; + border-color: #df691a; } .nav .nav-divider { height: 1px; @@ -3610,7 +3609,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { max-width: none; } .nav-tabs { - border-bottom: 1px solid #dddddd; + border-bottom: 1px solid transparent; } .nav-tabs > li { float: left; @@ -3618,19 +3617,19 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } .nav-tabs > li > a { margin-right: 2px; - line-height: 1.4; + line-height: 1.42857143; border: 1px solid transparent; border-radius: 0 0 0 0; } .nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #dddddd; + border-color: #4e5d6c #4e5d6c transparent; } .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus { - color: #6f6f6f; - background-color: #ffffff; - border: 1px solid #dddddd; + color: #ebebeb; + background-color: #2b3e50; + border: 1px solid #4e5d6c; border-bottom-color: transparent; cursor: default; } @@ -3665,17 +3664,17 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .nav-tabs.nav-justified > .active > a, .nav-tabs.nav-justified > .active > a:hover, .nav-tabs.nav-justified > .active > a:focus { - border: 1px solid #dddddd; + border: 1px solid #4e5d6c; } @media (min-width: 768px) { .nav-tabs.nav-justified > li > a { - border-bottom: 1px solid #dddddd; + border-bottom: 1px solid #4e5d6c; border-radius: 0 0 0 0; } .nav-tabs.nav-justified > .active > a, .nav-tabs.nav-justified > .active > a:hover, .nav-tabs.nav-justified > .active > a:focus { - border-bottom-color: #ffffff; + border-bottom-color: #4e5d6c; } } .nav-pills > li { @@ -3691,7 +3690,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus { color: #ffffff; - background-color: #008cba; + background-color: #df691a; } .nav-stacked > li { float: none; @@ -3733,17 +3732,17 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .nav-tabs-justified > .active > a, .nav-tabs-justified > .active > a:hover, .nav-tabs-justified > .active > a:focus { - border: 1px solid #dddddd; + border: 1px solid #4e5d6c; } @media (min-width: 768px) { .nav-tabs-justified > li > a { - border-bottom: 1px solid #dddddd; + border-bottom: 1px solid #4e5d6c; border-radius: 0 0 0 0; } .nav-tabs-justified > .active > a, .nav-tabs-justified > .active > a:hover, .nav-tabs-justified > .active > a:focus { - border-bottom-color: #ffffff; + border-bottom-color: #4e5d6c; } } .tab-content > .tab-pane { @@ -3759,7 +3758,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } .navbar { position: relative; - min-height: 45px; + min-height: 40px; margin-bottom: 21px; border: 1px solid transparent; } @@ -3867,10 +3866,10 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } .navbar-brand { float: left; - padding: 12px 15px; + padding: 9.5px 15px; font-size: 19px; line-height: 21px; - height: 45px; + height: 40px; } .navbar-brand:hover, .navbar-brand:focus { @@ -3887,8 +3886,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn { float: right; margin-right: 15px; padding: 9px 10px; - margin-top: 5.5px; - margin-bottom: 5.5px; + margin-top: 3px; + margin-bottom: 3px; background-color: transparent; background-image: none; border: 1px solid transparent; @@ -3912,7 +3911,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } } .navbar-nav { - margin: 6px -15px; + margin: 4.75px -15px; } .navbar-nav > li > a { padding-top: 10px; @@ -3950,8 +3949,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn { float: left; } .navbar-nav > li > a { - padding-top: 12px; - padding-bottom: 12px; + padding-top: 9.5px; + padding-bottom: 9.5px; } .navbar-nav.navbar-right:last-child { margin-right: -15px; @@ -3973,8 +3972,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn { border-bottom: 1px solid transparent; -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - margin-top: 3px; - margin-bottom: 3px; + margin-top: 0.5px; + margin-bottom: 0.5px; } @media (min-width: 768px) { .navbar-form .form-group { @@ -4053,20 +4052,20 @@ select[multiple].input-group-sm > .input-group-btn > .btn { border-bottom-left-radius: 0; } .navbar-btn { - margin-top: 3px; - margin-bottom: 3px; + margin-top: 0.5px; + margin-bottom: 0.5px; } .navbar-btn.btn-sm { margin-top: 4.5px; margin-bottom: 4.5px; } .navbar-btn.btn-xs { - margin-top: 11.5px; - margin-bottom: 11.5px; + margin-top: 9px; + margin-bottom: 9px; } .navbar-text { - margin-top: 12px; - margin-bottom: 12px; + margin-top: 9.5px; + margin-bottom: 9.5px; } @media (min-width: 768px) { .navbar-text { @@ -4079,33 +4078,33 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } } .navbar-default { - background-color: #333333; - border-color: #222222; + background-color: #4e5d6c; + border-color: transparent; } .navbar-default .navbar-brand { - color: #ffffff; + color: #ebebeb; } .navbar-default .navbar-brand:hover, .navbar-default .navbar-brand:focus { - color: #ffffff; + color: #ebebeb; background-color: transparent; } .navbar-default .navbar-text { - color: #ffffff; + color: #ebebeb; } .navbar-default .navbar-nav > li > a { - color: #ffffff; + color: #ebebeb; } .navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus { - color: #ffffff; - background-color: #272727; + color: #ebebeb; + background-color: #485563; } .navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus { - color: #ffffff; - background-color: #272727; + color: #ebebeb; + background-color: #485563; } .navbar-default .navbar-nav > .disabled > a, .navbar-default .navbar-nav > .disabled > a:hover, @@ -4118,35 +4117,35 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } .navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus { - background-color: transparent; + background-color: #485563; } .navbar-default .navbar-toggle .icon-bar { - background-color: #ffffff; + background-color: #ebebeb; } .navbar-default .navbar-collapse, .navbar-default .navbar-form { - border-color: #222222; + border-color: transparent; } .navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus { - background-color: #272727; - color: #ffffff; + background-color: #485563; + color: #ebebeb; } @media (max-width: 767px) { .navbar-default .navbar-nav .open .dropdown-menu > li > a { - color: #ffffff; + color: #ebebeb; } .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus { - color: #ffffff; - background-color: #272727; + color: #ebebeb; + background-color: #485563; } .navbar-default .navbar-nav .open .dropdown-menu > .active > a, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus { - color: #ffffff; - background-color: #272727; + color: #ebebeb; + background-color: #485563; } .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a, .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover, @@ -4156,17 +4155,17 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } } .navbar-default .navbar-link { - color: #ffffff; + color: #ebebeb; } .navbar-default .navbar-link:hover { - color: #ffffff; + color: #ebebeb; } .navbar-default .btn-link { - color: #ffffff; + color: #ebebeb; } .navbar-default .btn-link:hover, .navbar-default .btn-link:focus { - color: #ffffff; + color: #ebebeb; } .navbar-default .btn-link[disabled]:hover, fieldset[disabled] .navbar-default .btn-link:hover, @@ -4175,33 +4174,33 @@ fieldset[disabled] .navbar-default .btn-link:focus { color: #cccccc; } .navbar-inverse { - background-color: #008cba; - border-color: #006687; + background-color: #df691a; + border-color: transparent; } .navbar-inverse .navbar-brand { - color: #ffffff; + color: #ebebeb; } .navbar-inverse .navbar-brand:hover, .navbar-inverse .navbar-brand:focus { - color: #ffffff; + color: #ebebeb; background-color: transparent; } .navbar-inverse .navbar-text { - color: #ffffff; + color: #ebebeb; } .navbar-inverse .navbar-nav > li > a { - color: #ffffff; + color: #ebebeb; } .navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus { - color: #ffffff; - background-color: #006687; + color: #ebebeb; + background-color: #c85e17; } .navbar-inverse .navbar-nav > .active > a, .navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus { - color: #ffffff; - background-color: #006687; + color: #ebebeb; + background-color: #c85e17; } .navbar-inverse .navbar-nav > .disabled > a, .navbar-inverse .navbar-nav > .disabled > a:hover, @@ -4214,41 +4213,41 @@ fieldset[disabled] .navbar-default .btn-link:focus { } .navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus { - background-color: transparent; + background-color: #c85e17; } .navbar-inverse .navbar-toggle .icon-bar { - background-color: #ffffff; + background-color: #ebebeb; } .navbar-inverse .navbar-collapse, .navbar-inverse .navbar-form { - border-color: #007196; + border-color: #bf5a16; } .navbar-inverse .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .open > a:hover, .navbar-inverse .navbar-nav > .open > a:focus { - background-color: #006687; - color: #ffffff; + background-color: #c85e17; + color: #ebebeb; } @media (max-width: 767px) { .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header { - border-color: #006687; + border-color: transparent; } .navbar-inverse .navbar-nav .open .dropdown-menu .divider { - background-color: #006687; + background-color: transparent; } .navbar-inverse .navbar-nav .open .dropdown-menu > li > a { - color: #ffffff; + color: #ebebeb; } .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus { - color: #ffffff; - background-color: #006687; + color: #ebebeb; + background-color: #c85e17; } .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a, .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus { - color: #ffffff; - background-color: #006687; + color: #ebebeb; + background-color: #c85e17; } .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a, .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover, @@ -4258,17 +4257,17 @@ fieldset[disabled] .navbar-default .btn-link:focus { } } .navbar-inverse .navbar-link { - color: #ffffff; + color: #ebebeb; } .navbar-inverse .navbar-link:hover { - color: #ffffff; + color: #ebebeb; } .navbar-inverse .btn-link { - color: #ffffff; + color: #ebebeb; } .navbar-inverse .btn-link:hover, .navbar-inverse .btn-link:focus { - color: #ffffff; + color: #ebebeb; } .navbar-inverse .btn-link[disabled]:hover, fieldset[disabled] .navbar-inverse .btn-link:hover, @@ -4280,7 +4279,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { padding: 8px 15px; margin-bottom: 21px; list-style: none; - background-color: #f5f5f5; + background-color: #4e5d6c; border-radius: 0; } .breadcrumb > li { @@ -4289,10 +4288,10 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .breadcrumb > li + li:before { content: "/\00a0"; padding: 0 5px; - color: #999999; + color: #ebebeb; } .breadcrumb > .active { - color: #333333; + color: #ebebeb; } .pagination { display: inline-block; @@ -4307,11 +4306,11 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pagination > li > span { position: relative; float: left; - padding: 8px 12px; - line-height: 1.4; + padding: 8px 16px; + line-height: 1.42857143; text-decoration: none; - color: #008cba; - background-color: transparent; + color: #ebebeb; + background-color: #4e5d6c; border: 1px solid transparent; margin-left: -1px; } @@ -4330,8 +4329,8 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pagination > li > span:hover, .pagination > li > a:focus, .pagination > li > span:focus { - color: #00526e; - background-color: #eeeeee; + color: #ebebeb; + background-color: #485563; border-color: transparent; } .pagination > .active > a, @@ -4341,8 +4340,8 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pagination > .active > a:focus, .pagination > .active > span:focus { z-index: 2; - color: #ffffff; - background-color: #008cba; + color: #ebebeb; + background-color: #df691a; border-color: transparent; cursor: default; } @@ -4352,14 +4351,14 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pagination > .disabled > a, .pagination > .disabled > a:hover, .pagination > .disabled > a:focus { - color: #999999; - background-color: #ffffff; + color: #323c46; + background-color: #4e5d6c; border-color: transparent; cursor: not-allowed; } .pagination-lg > li > a, .pagination-lg > li > span { - padding: 16px 20px; + padding: 12px 24px; font-size: 19px; } .pagination-lg > li:first-child > a, @@ -4374,8 +4373,8 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { } .pagination-sm > li > a, .pagination-sm > li > span { - padding: 8px 12px; - font-size: 12px; + padding: 5px 10px; + font-size: 13px; } .pagination-sm > li:first-child > a, .pagination-sm > li:first-child > span { @@ -4400,14 +4399,14 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pager li > span { display: inline-block; padding: 5px 14px; - background-color: transparent; + background-color: #4e5d6c; border: 1px solid transparent; - border-radius: 3px; + border-radius: 15px; } .pager li > a:hover, .pager li > a:focus { text-decoration: none; - background-color: #eeeeee; + background-color: #485563; } .pager .next > a, .pager .next > span { @@ -4421,8 +4420,8 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pager .disabled > a:hover, .pager .disabled > a:focus, .pager .disabled > span { - color: #999999; - background-color: transparent; + color: #323c46; + background-color: #4e5d6c; cursor: not-allowed; } .label { @@ -4451,25 +4450,25 @@ a.label:focus { top: -1px; } .label-default { - background-color: #999999; + background-color: #4e5d6c; } .label-default[href]:hover, .label-default[href]:focus { - background-color: #808080; + background-color: #39444e; } .label-primary { - background-color: #008cba; + background-color: #df691a; } .label-primary[href]:hover, .label-primary[href]:focus { - background-color: #006687; + background-color: #b15315; } .label-success { - background-color: #43ac6a; + background-color: #5cb85c; } .label-success[href]:hover, .label-success[href]:focus { - background-color: #358753; + background-color: #449d44; } .label-info { background-color: #5bc0de; @@ -4479,31 +4478,31 @@ a.label:focus { background-color: #31b0d5; } .label-warning { - background-color: #e99002; + background-color: #f0ad4e; } .label-warning[href]:hover, .label-warning[href]:focus { - background-color: #b67102; + background-color: #ec971f; } .label-danger { - background-color: #f04124; + background-color: #d9534f; } .label-danger[href]:hover, .label-danger[href]:focus { - background-color: #d32a0e; + background-color: #c9302c; } .badge { display: inline-block; min-width: 10px; padding: 3px 7px; - font-size: 12px; - font-weight: bold; - color: #777777; + font-size: 13px; + font-weight: 300; + color: #ebebeb; line-height: 1; vertical-align: baseline; white-space: nowrap; text-align: center; - background-color: #e7e7e7; + background-color: #4e5d6c; border-radius: 10px; } .badge:empty { @@ -4525,7 +4524,7 @@ a.badge:focus { } a.list-group-item.active > .badge, .nav-pills > .active > a > .badge { - color: #008cba; + color: #df691a; background-color: #ffffff; } .nav-pills > li > a > .badge { @@ -4535,7 +4534,7 @@ a.list-group-item.active > .badge, padding: 30px; margin-bottom: 30px; color: inherit; - background-color: #fafafa; + background-color: #4e5d6c; } .jumbotron h1, .jumbotron .h1 { @@ -4547,7 +4546,7 @@ a.list-group-item.active > .badge, font-weight: 200; } .jumbotron > hr { - border-top-color: #e1e1e1; + border-top-color: #39444e; } .container .jumbotron { border-radius: 0; @@ -4573,8 +4572,8 @@ a.list-group-item.active > .badge, display: block; padding: 4px; margin-bottom: 21px; - line-height: 1.4; - background-color: #ffffff; + line-height: 1.42857143; + background-color: #2b3e50; border: 1px solid #dddddd; border-radius: 0; -webkit-transition: all 0.2s ease-in-out; @@ -4589,11 +4588,11 @@ a.list-group-item.active > .badge, a.thumbnail:hover, a.thumbnail:focus, a.thumbnail.active { - border-color: #008cba; + border-color: #df691a; } .thumbnail .caption { padding: 9px; - color: #222222; + color: #ebebeb; } .alert { padding: 15px; @@ -4627,48 +4626,48 @@ a.thumbnail.active { color: inherit; } .alert-success { - background-color: #43ac6a; - border-color: #3c9a5f; - color: #ffffff; + background-color: #5cb85c; + border-color: transparent; + color: #ebebeb; } .alert-success hr { - border-top-color: #358753; + border-top-color: rgba(0, 0, 0, 0); } .alert-success .alert-link { - color: #e6e6e6; + color: #d2d2d2; } .alert-info { background-color: #5bc0de; - border-color: #3db5d8; - color: #ffffff; + border-color: transparent; + color: #ebebeb; } .alert-info hr { - border-top-color: #2aabd2; + border-top-color: rgba(0, 0, 0, 0); } .alert-info .alert-link { - color: #e6e6e6; + color: #d2d2d2; } .alert-warning { - background-color: #e99002; - border-color: #d08002; - color: #ffffff; + background-color: #f0ad4e; + border-color: transparent; + color: #ebebeb; } .alert-warning hr { - border-top-color: #b67102; + border-top-color: rgba(0, 0, 0, 0); } .alert-warning .alert-link { - color: #e6e6e6; + color: #d2d2d2; } .alert-danger { - background-color: #f04124; - border-color: #ea2f10; - color: #ffffff; + background-color: #d9534f; + border-color: transparent; + color: #ebebeb; } .alert-danger hr { - border-top-color: #d32a0e; + border-top-color: rgba(0, 0, 0, 0); } .alert-danger .alert-link { - color: #e6e6e6; + color: #d2d2d2; } @-webkit-keyframes progress-bar-stripes { from { @@ -4690,7 +4689,7 @@ a.thumbnail.active { overflow: hidden; height: 21px; margin-bottom: 21px; - background-color: #f5f5f5; + background-color: #4e5d6c; border-radius: 0; -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); @@ -4699,11 +4698,11 @@ a.thumbnail.active { float: left; width: 0%; height: 100%; - font-size: 12px; + font-size: 13px; line-height: 21px; color: #ffffff; text-align: center; - background-color: #008cba; + background-color: #df691a; -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -webkit-transition: width 0.6s ease; @@ -4728,14 +4727,14 @@ a.thumbnail.active { min-width: 30px; } .progress-bar[aria-valuenow="0"] { - color: #999999; + color: #4e5d6c; min-width: 30px; background-color: transparent; background-image: none; box-shadow: none; } .progress-bar-success { - background-color: #43ac6a; + background-color: #5cb85c; } .progress-striped .progress-bar-success { 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); @@ -4751,7 +4750,7 @@ a.thumbnail.active { 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-bar-warning { - background-color: #e99002; + background-color: #f0ad4e; } .progress-striped .progress-bar-warning { 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); @@ -4759,7 +4758,7 @@ a.thumbnail.active { 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-bar-danger { - background-color: #f04124; + background-color: #d9534f; } .progress-striped .progress-bar-danger { 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); @@ -4803,8 +4802,8 @@ a.thumbnail.active { display: block; padding: 10px 15px; margin-bottom: -1px; - background-color: #ffffff; - border: 1px solid #dddddd; + background-color: #4e5d6c; + border: 1px solid transparent; } .list-group-item:first-child { border-top-right-radius: 0; @@ -4822,22 +4821,22 @@ a.thumbnail.active { margin-right: 5px; } a.list-group-item { - color: #555555; + color: #ebebeb; } a.list-group-item .list-group-item-heading { - color: #333333; + color: #ebebeb; } a.list-group-item:hover, a.list-group-item:focus { text-decoration: none; - color: #555555; - background-color: #f5f5f5; + color: #ebebeb; + background-color: #485563; } .list-group-item.disabled, .list-group-item.disabled:hover, .list-group-item.disabled:focus { - background-color: #eeeeee; - color: #999999; + background-color: #ebebeb; + color: #4e5d6c; } .list-group-item.disabled .list-group-item-heading, .list-group-item.disabled:hover .list-group-item-heading, @@ -4847,15 +4846,15 @@ a.list-group-item:focus { .list-group-item.disabled .list-group-item-text, .list-group-item.disabled:hover .list-group-item-text, .list-group-item.disabled:focus .list-group-item-text { - color: #999999; + color: #4e5d6c; } .list-group-item.active, .list-group-item.active:hover, .list-group-item.active:focus { z-index: 2; color: #ffffff; - background-color: #008cba; - border-color: #008cba; + background-color: #df691a; + border-color: #df691a; } .list-group-item.active .list-group-item-heading, .list-group-item.active:hover .list-group-item-heading, @@ -4871,95 +4870,95 @@ a.list-group-item:focus { .list-group-item.active .list-group-item-text, .list-group-item.active:hover .list-group-item-text, .list-group-item.active:focus .list-group-item-text { - color: #87e1ff; + color: #f9decc; } .list-group-item-success { - color: #43ac6a; - background-color: #dff0d8; + color: #ebebeb; + background-color: #5cb85c; } a.list-group-item-success { - color: #43ac6a; + color: #ebebeb; } a.list-group-item-success .list-group-item-heading { color: inherit; } a.list-group-item-success:hover, a.list-group-item-success:focus { - color: #43ac6a; - background-color: #d0e9c6; + color: #ebebeb; + background-color: #4cae4c; } a.list-group-item-success.active, a.list-group-item-success.active:hover, a.list-group-item-success.active:focus { color: #fff; - background-color: #43ac6a; - border-color: #43ac6a; + background-color: #ebebeb; + border-color: #ebebeb; } .list-group-item-info { - color: #5bc0de; - background-color: #d9edf7; + color: #ebebeb; + background-color: #5bc0de; } a.list-group-item-info { - color: #5bc0de; + color: #ebebeb; } a.list-group-item-info .list-group-item-heading { color: inherit; } a.list-group-item-info:hover, a.list-group-item-info:focus { - color: #5bc0de; - background-color: #c4e3f3; + color: #ebebeb; + background-color: #46b8da; } a.list-group-item-info.active, a.list-group-item-info.active:hover, a.list-group-item-info.active:focus { color: #fff; - background-color: #5bc0de; - border-color: #5bc0de; + background-color: #ebebeb; + border-color: #ebebeb; } .list-group-item-warning { - color: #e99002; - background-color: #fcf8e3; + color: #ebebeb; + background-color: #f0ad4e; } a.list-group-item-warning { - color: #e99002; + color: #ebebeb; } a.list-group-item-warning .list-group-item-heading { color: inherit; } a.list-group-item-warning:hover, a.list-group-item-warning:focus { - color: #e99002; - background-color: #faf2cc; + color: #ebebeb; + background-color: #eea236; } a.list-group-item-warning.active, a.list-group-item-warning.active:hover, a.list-group-item-warning.active:focus { color: #fff; - background-color: #e99002; - border-color: #e99002; + background-color: #ebebeb; + border-color: #ebebeb; } .list-group-item-danger { - color: #f04124; - background-color: #f2dede; + color: #ebebeb; + background-color: #d9534f; } a.list-group-item-danger { - color: #f04124; + color: #ebebeb; } a.list-group-item-danger .list-group-item-heading { color: inherit; } a.list-group-item-danger:hover, a.list-group-item-danger:focus { - color: #f04124; - background-color: #ebcccc; + color: #ebebeb; + background-color: #d43f3a; } a.list-group-item-danger.active, a.list-group-item-danger.active:hover, a.list-group-item-danger.active:focus { color: #fff; - background-color: #f04124; - border-color: #f04124; + background-color: #ebebeb; + border-color: #ebebeb; } .list-group-item-heading { margin-top: 0; @@ -4971,7 +4970,7 @@ a.list-group-item-danger.active:focus { } .panel { margin-bottom: 21px; - background-color: #ffffff; + background-color: #4e5d6c; border: 1px solid transparent; border-radius: 0; -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); @@ -5000,8 +4999,8 @@ a.list-group-item-danger.active:focus { } .panel-footer { padding: 10px 15px; - background-color: #f5f5f5; - border-top: 1px solid #dddddd; + background-color: #485563; + border-top: 1px solid transparent; border-bottom-right-radius: -1; border-bottom-left-radius: -1; } @@ -5085,7 +5084,7 @@ a.list-group-item-danger.active:focus { } .panel > .panel-body + .table, .panel > .panel-body + .table-responsive { - border-top: 1px solid #dddddd; + border-top: 1px solid #4e5d6c; } .panel > .table > tbody:first-child > tr:first-child th, .panel > .table > tbody:first-child > tr:first-child td { @@ -5161,121 +5160,121 @@ a.list-group-item-danger.active:focus { border-bottom: 0; } .panel-group .panel-heading + .panel-collapse > .panel-body { - border-top: 1px solid #dddddd; + border-top: 1px solid transparent; } .panel-group .panel-footer { border-top: 0; } .panel-group .panel-footer + .panel-collapse .panel-body { - border-bottom: 1px solid #dddddd; + border-bottom: 1px solid transparent; } .panel-default { - border-color: #dddddd; + border-color: transparent; } .panel-default > .panel-heading { color: #333333; background-color: #f5f5f5; - border-color: #dddddd; + border-color: transparent; } .panel-default > .panel-heading + .panel-collapse > .panel-body { - border-top-color: #dddddd; + border-top-color: transparent; } .panel-default > .panel-heading .badge { color: #f5f5f5; background-color: #333333; } .panel-default > .panel-footer + .panel-collapse > .panel-body { - border-bottom-color: #dddddd; + border-bottom-color: transparent; } .panel-primary { - border-color: #008cba; + border-color: transparent; } .panel-primary > .panel-heading { color: #ffffff; - background-color: #008cba; - border-color: #008cba; + background-color: #df691a; + border-color: transparent; } .panel-primary > .panel-heading + .panel-collapse > .panel-body { - border-top-color: #008cba; + border-top-color: transparent; } .panel-primary > .panel-heading .badge { - color: #008cba; + color: #df691a; background-color: #ffffff; } .panel-primary > .panel-footer + .panel-collapse > .panel-body { - border-bottom-color: #008cba; + border-bottom-color: transparent; } .panel-success { - border-color: #3c9a5f; + border-color: transparent; } .panel-success > .panel-heading { - color: #ffffff; - background-color: #43ac6a; - border-color: #3c9a5f; + color: #ebebeb; + background-color: #5cb85c; + border-color: transparent; } .panel-success > .panel-heading + .panel-collapse > .panel-body { - border-top-color: #3c9a5f; + border-top-color: transparent; } .panel-success > .panel-heading .badge { - color: #43ac6a; - background-color: #ffffff; + color: #5cb85c; + background-color: #ebebeb; } .panel-success > .panel-footer + .panel-collapse > .panel-body { - border-bottom-color: #3c9a5f; + border-bottom-color: transparent; } .panel-info { - border-color: #3db5d8; + border-color: transparent; } .panel-info > .panel-heading { - color: #ffffff; + color: #ebebeb; background-color: #5bc0de; - border-color: #3db5d8; + border-color: transparent; } .panel-info > .panel-heading + .panel-collapse > .panel-body { - border-top-color: #3db5d8; + border-top-color: transparent; } .panel-info > .panel-heading .badge { color: #5bc0de; - background-color: #ffffff; + background-color: #ebebeb; } .panel-info > .panel-footer + .panel-collapse > .panel-body { - border-bottom-color: #3db5d8; + border-bottom-color: transparent; } .panel-warning { - border-color: #d08002; + border-color: transparent; } .panel-warning > .panel-heading { - color: #ffffff; - background-color: #e99002; - border-color: #d08002; + color: #ebebeb; + background-color: #f0ad4e; + border-color: transparent; } .panel-warning > .panel-heading + .panel-collapse > .panel-body { - border-top-color: #d08002; + border-top-color: transparent; } .panel-warning > .panel-heading .badge { - color: #e99002; - background-color: #ffffff; + color: #f0ad4e; + background-color: #ebebeb; } .panel-warning > .panel-footer + .panel-collapse > .panel-body { - border-bottom-color: #d08002; + border-bottom-color: transparent; } .panel-danger { - border-color: #ea2f10; + border-color: transparent; } .panel-danger > .panel-heading { - color: #ffffff; - background-color: #f04124; - border-color: #ea2f10; + color: #ebebeb; + background-color: #d9534f; + border-color: transparent; } .panel-danger > .panel-heading + .panel-collapse > .panel-body { - border-top-color: #ea2f10; + border-top-color: transparent; } .panel-danger > .panel-heading .badge { - color: #f04124; - background-color: #ffffff; + color: #d9534f; + background-color: #ebebeb; } .panel-danger > .panel-footer + .panel-collapse > .panel-body { - border-bottom-color: #ea2f10; + border-bottom-color: transparent; } .embed-responsive { position: relative; @@ -5306,8 +5305,8 @@ a.list-group-item-danger.active:focus { min-height: 20px; padding: 19px; margin-bottom: 20px; - background-color: #fafafa; - border: 1px solid #e8e8e8; + background-color: #4e5d6c; + border: 1px solid transparent; border-radius: 0; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); @@ -5329,14 +5328,14 @@ a.list-group-item-danger.active:focus { font-size: 22.5px; font-weight: bold; line-height: 1; - color: #ffffff; - text-shadow: 0 1px 0 #ffffff; + color: #ebebeb; + text-shadow: none; opacity: 0.2; filter: alpha(opacity=20); } .close:hover, .close:focus { - color: #ffffff; + color: #ebebeb; text-decoration: none; cursor: pointer; opacity: 0.5; @@ -5387,9 +5386,8 @@ button.close { } .modal-content { position: relative; - background-color: #ffffff; - border: 1px solid #999999; - border: 1px solid rgba(0, 0, 0, 0.2); + background-color: #4e5d6c; + border: 1px solid transparent; border-radius: 0; -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); @@ -5415,15 +5413,15 @@ button.close { } .modal-header { padding: 15px; - border-bottom: 1px solid #e5e5e5; - min-height: 16.4px; + border-bottom: 1px solid #2b3e50; + min-height: 16.42857143px; } .modal-header .close { margin-top: -2px; } .modal-title { margin: 0; - line-height: 1.4; + line-height: 1.42857143; } .modal-body { position: relative; @@ -5432,7 +5430,7 @@ button.close { .modal-footer { padding: 20px; text-align: right; - border-top: 1px solid #e5e5e5; + border-top: 1px solid #2b3e50; } .modal-footer .btn + .btn { margin-left: 5px; @@ -5474,7 +5472,7 @@ button.close { z-index: 1070; display: block; visibility: visible; - font-size: 12px; + font-size: 13px; line-height: 1.4; opacity: 0; filter: alpha(opacity=0); @@ -5505,7 +5503,7 @@ button.close { color: #ffffff; text-align: center; text-decoration: none; - background-color: #333333; + background-color: #000000; border-radius: 0; } .tooltip-arrow { @@ -5520,52 +5518,52 @@ button.close { left: 50%; margin-left: -5px; border-width: 5px 5px 0; - border-top-color: #333333; + border-top-color: #000000; } .tooltip.top-left .tooltip-arrow { bottom: 0; left: 5px; border-width: 5px 5px 0; - border-top-color: #333333; + border-top-color: #000000; } .tooltip.top-right .tooltip-arrow { bottom: 0; right: 5px; border-width: 5px 5px 0; - border-top-color: #333333; + border-top-color: #000000; } .tooltip.right .tooltip-arrow { top: 50%; left: 0; margin-top: -5px; border-width: 5px 5px 5px 0; - border-right-color: #333333; + border-right-color: #000000; } .tooltip.left .tooltip-arrow { top: 50%; right: 0; margin-top: -5px; border-width: 5px 0 5px 5px; - border-left-color: #333333; + border-left-color: #000000; } .tooltip.bottom .tooltip-arrow { top: 0; left: 50%; margin-left: -5px; border-width: 0 5px 5px; - border-bottom-color: #333333; + border-bottom-color: #000000; } .tooltip.bottom-left .tooltip-arrow { top: 0; left: 5px; border-width: 0 5px 5px; - border-bottom-color: #333333; + border-bottom-color: #000000; } .tooltip.bottom-right .tooltip-arrow { top: 0; right: 5px; border-width: 0 5px 5px; - border-bottom-color: #333333; + border-bottom-color: #000000; } .popover { position: absolute; @@ -5576,9 +5574,8 @@ button.close { max-width: 276px; padding: 1px; text-align: left; - background-color: #333333; + background-color: #4e5d6c; background-clip: padding-box; - border: 1px solid #333333; border: 1px solid transparent; border-radius: 0; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); @@ -5603,8 +5600,8 @@ button.close { font-size: 15px; font-weight: normal; line-height: 18px; - background-color: #333333; - border-bottom: 1px solid #262626; + background-color: #485563; + border-bottom: 1px solid #3d4954; border-radius: -1 -1 0 0; } .popover-content { @@ -5630,8 +5627,7 @@ button.close { left: 50%; margin-left: -11px; border-bottom-width: 0; - border-top-color: #000000; - border-top-color: rgba(0, 0, 0, 0.05); + border-top-color: transparent; bottom: -11px; } .popover.top > .arrow:after { @@ -5639,29 +5635,27 @@ button.close { bottom: 1px; margin-left: -10px; border-bottom-width: 0; - border-top-color: #333333; + border-top-color: #4e5d6c; } .popover.right > .arrow { top: 50%; left: -11px; margin-top: -11px; border-left-width: 0; - border-right-color: #000000; - border-right-color: rgba(0, 0, 0, 0.05); + border-right-color: transparent; } .popover.right > .arrow:after { content: " "; left: 1px; bottom: -10px; border-left-width: 0; - border-right-color: #333333; + border-right-color: #4e5d6c; } .popover.bottom > .arrow { left: 50%; margin-left: -11px; border-top-width: 0; - border-bottom-color: #000000; - border-bottom-color: rgba(0, 0, 0, 0.05); + border-bottom-color: transparent; top: -11px; } .popover.bottom > .arrow:after { @@ -5669,21 +5663,20 @@ button.close { top: 1px; margin-left: -10px; border-top-width: 0; - border-bottom-color: #333333; + border-bottom-color: #4e5d6c; } .popover.left > .arrow { top: 50%; right: -11px; margin-top: -11px; border-right-width: 0; - border-left-color: #000000; - border-left-color: rgba(0, 0, 0, 0.05); + border-left-color: transparent; } .popover.left > .arrow:after { content: " "; right: 1px; border-right-width: 0; - border-left-color: #333333; + border-left-color: #4e5d6c; bottom: -10px; } .carousel { @@ -6172,177 +6165,147 @@ button.close { } } .navbar { + -webkit-box-shadow: none; + box-shadow: none; border: none; - font-size: 13px; + font-size: 12px; +} +.navbar-default .badge { + background-color: #fff; + color: #4e5d6c; +} +.navbar-inverse .badge { + background-color: #fff; + color: #df691a; +} +.btn { font-weight: 300; } -.navbar .navbar-toggle:hover .icon-bar { - background-color: #b3b3b3; +.btn-default:hover { + background-color: #485563; } -.navbar-collapse { - border-top-color: rgba(0, 0, 0, 0.2); +.btn-sm, +.btn-xs { + font-size: 12px; +} +body { + font-weight: 300; +} +.text-primary, +.text-primary:hover { + color: #df691a; +} +.text-success, +.text-success:hover { + color: #5cb85c; +} +.text-danger, +.text-danger:hover { + color: #d9534f; +} +.text-warning, +.text-warning:hover { + color: #f0ad4e; +} +.text-info, +.text-info:hover { + color: #5bc0de; +} +.page-header { + border-bottom-color: #4e5d6c; +} +.dropdown-menu { + border: none; + margin: 0; -webkit-box-shadow: none; box-shadow: none; } -.navbar .btn { - padding-top: 6px; - padding-bottom: 6px; -} -.navbar-form { - margin-top: 7px; - margin-bottom: 5px; -} -.navbar-form .form-control { - height: auto; - padding: 4px 6px; -} -.navbar .dropdown-menu { - border: none; -} -.navbar .dropdown-menu > li > a, -.navbar .dropdown-menu > li > a:focus { - background-color: transparent; - font-size: 13px; - font-weight: 300; -} -.navbar .dropdown-header { - color: rgba(255, 255, 255, 0.5); -} -.navbar-default .dropdown-menu { - background-color: #333333; -} -.navbar-default .dropdown-menu > li > a, -.navbar-default .dropdown-menu > li > a:focus { - color: #ffffff; -} -.navbar-default .dropdown-menu > li > a:hover, -.navbar-default .dropdown-menu > .active > a, -.navbar-default .dropdown-menu > .active > a:hover { - background-color: #272727; -} -.navbar-inverse .dropdown-menu { - background-color: #008cba; -} -.navbar-inverse .dropdown-menu > li > a, -.navbar-inverse .dropdown-menu > li > a:focus { - color: #ffffff; -} -.navbar-inverse .dropdown-menu > li > a:hover, -.navbar-inverse .dropdown-menu > .active > a, -.navbar-inverse .dropdown-menu > .active > a:hover { - background-color: #006687; -} -.btn { - padding: 8px 12px; -} -.btn-lg { - padding: 16px 20px; -} -.btn-sm { - padding: 8px 12px; -} -.btn-xs { - padding: 4px 6px; -} -.btn-group .btn ~ .dropdown-toggle { - padding-left: 16px; - padding-right: 16px; -} -.btn-group .dropdown-menu { - border-top-width: 0; -} -.btn-group.dropup .dropdown-menu { - border-top-width: 1px; - border-bottom-width: 0; - margin-bottom: 0; -} -.btn-group .dropdown-toggle.btn-default ~ .dropdown-menu { - background-color: #e7e7e7; - border-color: #cccccc; -} -.btn-group .dropdown-toggle.btn-default ~ .dropdown-menu > li > a { - color: #333333; -} -.btn-group .dropdown-toggle.btn-default ~ .dropdown-menu > li > a:hover { - background-color: #d3d3d3; -} -.btn-group .dropdown-toggle.btn-primary ~ .dropdown-menu { - background-color: #008cba; - border-color: #0079a1; -} -.btn-group .dropdown-toggle.btn-primary ~ .dropdown-menu > li > a { - color: #ffffff; -} -.btn-group .dropdown-toggle.btn-primary ~ .dropdown-menu > li > a:hover { - background-color: #006d91; -} -.btn-group .dropdown-toggle.btn-success ~ .dropdown-menu { - background-color: #43ac6a; - border-color: #3c9a5f; -} -.btn-group .dropdown-toggle.btn-success ~ .dropdown-menu > li > a { - color: #ffffff; -} -.btn-group .dropdown-toggle.btn-success ~ .dropdown-menu > li > a:hover { - background-color: #388f58; -} -.btn-group .dropdown-toggle.btn-info ~ .dropdown-menu { - background-color: #5bc0de; - border-color: #46b8da; -} -.btn-group .dropdown-toggle.btn-info ~ .dropdown-menu > li > a { - color: #ffffff; -} -.btn-group .dropdown-toggle.btn-info ~ .dropdown-menu > li > a:hover { - background-color: #39b3d7; -} -.btn-group .dropdown-toggle.btn-warning ~ .dropdown-menu { - background-color: #e99002; - border-color: #d08002; -} -.btn-group .dropdown-toggle.btn-warning ~ .dropdown-menu > li > a { - color: #ffffff; -} -.btn-group .dropdown-toggle.btn-warning ~ .dropdown-menu > li > a:hover { - background-color: #c17702; -} -.btn-group .dropdown-toggle.btn-danger ~ .dropdown-menu { - background-color: #f04124; - border-color: #ea2f10; -} -.btn-group .dropdown-toggle.btn-danger ~ .dropdown-menu > li > a { - color: #ffffff; -} -.btn-group .dropdown-toggle.btn-danger ~ .dropdown-menu > li > a:hover { - background-color: #dc2c0f; -} -.lead { - color: #6f6f6f; -} -cite { - font-style: italic; -} -blockquote { - border-left-width: 1px; - color: #6f6f6f; -} -blockquote.pull-right { - border-right-width: 1px; -} -blockquote small { +.dropdown-menu > li > a { font-size: 12px; font-weight: 300; } -table { +.btn-group.open .dropdown-toggle { + -webkit-box-shadow: none; + box-shadow: none; +} +.dropdown-header { font-size: 12px; } +table, +.table { + font-size: 12px; +} +table a:not(.btn), +.table a:not(.btn) { + color: #fff; + text-decoration: underline; +} +table .text-muted, +.table .text-muted { + color: #4e5d6c; +} +table > thead > tr > th, +.table > thead > tr > th, +table > tbody > tr > th, +.table > tbody > tr > th, +table > tfoot > tr > th, +.table > tfoot > tr > th, +table > thead > tr > td, +.table > thead > tr > td, +table > tbody > tr > td, +.table > tbody > tr > td, +table > tfoot > tr > td, +.table > tfoot > tr > td { + border-color: transparent; +} +input, +textarea { + color: #2b3e50; +} label, -.control-label, -.help-block, -.checkbox, -.radio { +.radio label, +.checkbox label, +.help-block { font-size: 12px; - font-weight: normal; + font-weight: 300; +} +.input-addon, +.input-group-addon { + color: #ebebeb; +} +.has-warning .help-block, +.has-warning .control-label, +.has-warning .form-control-feedback { + color: #f0ad4e; +} +.has-warning .input-group-addon { + border: none; +} +.has-error .help-block, +.has-error .control-label, +.has-error .form-control-feedback { + color: #d9534f; +} +.has-error .input-group-addon { + border: none; +} +.has-success .help-block, +.has-success .control-label, +.has-success .form-control-feedback { + color: #5cb85c; +} +.has-success .input-group-addon { + border: none; +} +.form-control:focus { + -webkit-box-shadow: none; + box-shadow: none; +} +.has-warning .form-control:focus, +.has-error .form-control:focus, +.has-success .form-control:focus { + -webkit-box-shadow: none; + box-shadow: none; } .nav .open > a, .nav .open > a:hover, @@ -6350,127 +6313,55 @@ label, border-color: transparent; } .nav-tabs > li > a { - background-color: #e7e7e7; - color: #222222; + color: #ebebeb; } -.nav-tabs .caret { - border-top-color: #222222; - border-bottom-color: #222222; +.nav-pills > li > a { + color: #ebebeb; } -.nav-pills { +.pager a { + color: #ebebeb; +} +.label { font-weight: 300; } -.breadcrumb { - border: 1px solid #dddddd; - border-radius: 3px; - font-size: 10px; - font-weight: 300; - text-transform: uppercase; -} -.pagination { - font-size: 12px; - font-weight: 300; - color: #999999; -} -.pagination > li > a, -.pagination > li > span { - margin-left: 4px; - color: #999999; -} -.pagination > .active > a, -.pagination > .active > span { +.alert { color: #fff; } -.pagination > li > a, -.pagination > li:first-child > a, -.pagination > li:last-child > a, -.pagination > li > span, -.pagination > li:first-child > span, -.pagination > li:last-child > span { - border-radius: 3px; -} -.pagination-lg > li > a { - padding-left: 22px; - padding-right: 22px; -} -.pagination-sm > li > a { - padding: 0 5px; -} -.pager { - font-size: 12px; - font-weight: 300; - color: #999999; -} -.list-group { - font-size: 12px; - font-weight: 300; +.alert a, +.alert .alert-link { + color: #fff; } .close { opacity: 0.4; - text-decoration: none; - text-shadow: none; } .close:hover, .close:focus { opacity: 1; } -.alert { - font-size: 12px; - font-weight: 300; -} -.alert .alert-link { - font-weight: normal; - color: #fff; - text-decoration: underline; -} -.label { - padding-left: 1em; - padding-right: 1em; - border-radius: 0; - font-weight: 300; -} -.label-default { - background-color: #e7e7e7; - color: #333333; -} -.badge { - font-weight: 300; -} -.progress { - height: 22px; - padding: 2px; - background-color: #f6f6f6; - border: 1px solid #ccc; +.well { -webkit-box-shadow: none; box-shadow: none; } -.dropdown-menu { +.panel { + border: none; +} +.panel-default > .panel-heading { + background-color: #485563; + color: #ebebeb; +} +.thumbnail { + background-color: #4e5d6c; + border: none; +} +.modal { padding: 0; - margin-top: 0; - font-size: 12px; } -.dropdown-menu > li > a { - padding: 12px 15px; +.modal-header, +.modal-footer { + background-color: #485563; + border: none; + border-radius: 0; } -.dropdown-header { - padding-left: 15px; - padding-right: 15px; - font-size: 9px; - text-transform: uppercase; -} -.popover { - color: #fff; - font-size: 12px; - font-weight: 300; -} -.panel-heading, -.panel-footer { - border-top-right-radius: 0; - border-top-left-radius: 0; -} -.panel-default .close { - color: #222222; -} -.modal .close { - color: #222222; +.popover-title { + border: none; } \ No newline at end of file diff --git a/views/curriculum/curriculum.jade b/views/curriculum/curriculum.jade index 62edcd485ec..23036434f51 100644 --- a/views/curriculum/curriculum.jade +++ b/views/curriculum/curriculum.jade @@ -2,26 +2,16 @@ extends ../layout block content .row .col-sm-8.col-xs-12 - h1 Welcome to Free Code Camp! - p Here are a few quick tips: - ol - li Work through our challenges in order. Many challenges are self-graded. If you want our feedback,  - a(href="https://twitter.com/intent/tweet?text=Hey%20@freecodecamp") tweet a link to your project to @freecodecamp. - li If you get stuck, try working through our recommended (free) courses. They're super helpful, but totally optional. You can pair program on them, too. - li Challenge #2 will show you how to start a pair programming session. Pair program as much as possible. It's more fun, and you'll learn better that way. - p We're working to create more challenges. If you have an idea for a challenge you'd like us to implement,  - a(href="https://twitter.com/intent/tweet?text=Hey%20@freecodecamp") tweet it to @freecodecamp. - br - br - br - br - br - br - br - br - br - br - br + .jumbotron + h1 Welcome to Free Code Camp! + p Here are a few quick tips: + ol + li Work through our challenges in order. Many challenges are self-graded. If you want our feedback,  + a(href="https://twitter.com/intent/tweet?text=Hey%20@freecodecamp") tweet a link to your project to @freecodecamp. + li If you get stuck, try working through our recommended (free) courses. They're super helpful, but totally optional. You can pair program on them, too. + li Challenge #2 will show you how to start a pair programming session. Pair program as much as possible. It's more fun, and you'll learn better that way. + p We're working to create more challenges. If you have an idea for a challenge you'd like us to implement,  + a(href="https://twitter.com/intent/tweet?text=Hey%20@freecodecamp") tweet it to @freecodecamp. .col-sm-4.col-xs-12 include ./../partials/challenges diff --git a/views/home.jade b/views/home.jade index 50c3f317ec5..4037f1d4240 100644 --- a/views/home.jade +++ b/views/home.jade @@ -7,25 +7,25 @@ block content .row .col-xs-12.col-sm-12.col-md-4 h3 Technical Mastery - img.img-center.three-by-three.img-responsive(src="https://s3.amazonaws.com/freecodecamp/tools.svg") + span.landing-icon.ion-settings p You'll learn to code by pair programming (where two people code together on one computer) on our coding challenges. .col-xs-12.col-sm-12.col-md-4 h3 Unique Portfolio Projects - img.img-center.three-by-three.img-responsive(src="https://s3.amazonaws.com/freecodecamp/portfolio.svg") + span.landing-icon.ion-briefcase p You'll apply your new coding skills by building software solutions for non-profits. .col-xs-12.col-sm-12.col-md-4 h3 Glowing References - img.img-center.three-by-three.img-responsive(src="https://s3.amazonaws.com/freecodecamp/references.svg") + span.landing-icon.ion-person-stalker p You'll gain the respect of your peers and the people you help. These connections will help you land the job. - a.btn.btn-cta.btn-warning(href="/login") Sign in now to get started (it's free) + a.btn.btn-cta.btn-primary(href="/login") Sign in now to get started (it's free) br br - a.btn.btn-success(href="/contact") I'm with a non-profit and want free help from a Software Engineer + a.btn.btn-primary(href="/contact") I'm with a non-profit and want free help from a Software Engineer br .panel.panel-primary - .panel-heading Frequently Asked Questions + .panel-heading.landing-panel-heading Frequently Asked Questions .panel-body - .text-left + .text-left.landing-panel-body h2 What will I learn, and in what sequence? ul p First, you'll learn basic web design tools like: @@ -97,4 +97,4 @@ block content p Unlike most bootcamps, anyone can study at Free Code Camp. We're not going to tell you that you can't become a software engineer. We believe the only person who should be able to tell you that is you. If you perservere, and keep working through our challenges and non-profits' projects, you will become an employable software engineer. br .text-center - a.btn.btn-cta.btn-warning(href="/login") Sign in now to get started (it's free) \ No newline at end of file + a.btn.btn-cta.btn-primary(href="/login") Sign in now to get started (it's free) \ No newline at end of file diff --git a/views/partials/challenges.jade b/views/partials/challenges.jade index 32fab1fb75b..16228e33d1a 100644 --- a/views/partials/challenges.jade +++ b/views/partials/challenges.jade @@ -1,4 +1,4 @@ -.panel.panel-info +.panel.panel-primary .panel-heading Challenges .panel-body ol diff --git a/views/partials/courses.jade b/views/partials/courses.jade index 2d9294d861c..a51699e1e9f 100644 --- a/views/partials/courses.jade +++ b/views/partials/courses.jade @@ -1,4 +1,4 @@ -.panel.panel-info +.panel.panel-primary .panel-heading Recommended (Free) Courses .panel-body ol diff --git a/views/partials/navbar.jade b/views/partials/navbar.jade index 7871db2766f..6463cf07238 100644 --- a/views/partials/navbar.jade +++ b/views/partials/navbar.jade @@ -7,8 +7,7 @@ span.icon-bar span.icon-bar a.navbar-brand(href='/') - span - img.navbar-icon(src= "https://s3.amazonaws.com/freecodecamp/fire.svg") + span.ion-bonfire | Free Code Camp .collapse.navbar-collapse ul.nav.navbar-nav.navbar-right