Tidy up SCSS, make header lighter

This commit is contained in:
James Brooks
2014-12-05 12:59:29 +00:00
parent 120ef54648
commit a38d0e040d
7 changed files with 45 additions and 49 deletions

View File

@@ -1,3 +1,5 @@
@import "partials/variables";
html, body {
height: 100%;
}
@@ -8,4 +10,4 @@ html, body {
@import "partials/wrapper";
@import "partials/header";
@import "partials/sidebar";
@import "partials/content";
@import "partials/content";

View File

@@ -1,31 +1,3 @@
$base-background-color: #f5f5f5;
$base-font-family: "Avenir Next W01", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
$base-font-weight: 300;
$base-letter-spacing: 1px;
$base-font-size: 16px;
$base-link-color: #ffffff;
$base-link-hover-color: #e9e9e9;
$header-background-color: #00695C;
$header-border-color: 1px solid darken(#00695C, 10%);
$sidebar-transition-speed: .2s;
$sidebar-background-color: #2c3e50;
$sidebar-border-color: 1px solid rgba(255, 255, 255, .1);
$sidebar-text-color: #d7dadc;
$sidebar-text-active-color: #ffffff;
$sidebar-normal-width: 250px;
$sidebar-phone-width: 75%;
$screen-xs-max: "(max-width: 549px)";
$screen-sm-min: "(min-width: 550px)";
$screen-sm-max: "(max-width: 991px)";
$screen-md-min: "(min-width: 992px)";
$screen-md-max: "(max-width: 1199px)";
$screen-lg-min: "(min-width: 1200px)";
body.dashboard {
font-family: $base-font-family;
font-weight: $base-font-weight;

View File

@@ -39,7 +39,7 @@ body.dashboard {
border-bottom: $sidebar-border-color;
}
&.active {
background: $header-background-color;
background: $sidebar-active-color;
a {
color: $sidebar-text-active-color;
}

View File

@@ -0,0 +1,28 @@
$base-background-color: #f5f5f5;
$base-font-family: "Avenir Next W01", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
$base-font-weight: 300;
$base-letter-spacing: 1px;
$base-font-size: 16px;
$base-link-color: #ffffff;
$base-link-hover-color: #e9e9e9;
$header-background-color: lighten(#00695C, 10%);
$header-border-color: 1px solid darken($header-background-color, 10%);
$sidebar-transition-speed: .2s;
$sidebar-background-color: #2c3e50;
$sidebar-border-color: 1px solid rgba(255, 255, 255, .1);
$sidebar-text-color: #d7dadc;
$sidebar-text-active-color: #ffffff;
$sidebar-normal-width: 250px;
$sidebar-phone-width: 75%;
$sidebar-active-color: #00695C;
$screen-xs-max: "(max-width: 549px)";
$screen-sm-min: "(min-width: 550px)";
$screen-sm-max: "(max-width: 991px)";
$screen-md-min: "(min-width: 992px)";
$screen-md-max: "(max-width: 1199px)";
$screen-lg-min: "(min-width: 1200px)";

View File

@@ -38,23 +38,21 @@ body.dashboard .wrapper {
body.dashboard .wrapper .content {
-webkit-transition: margin 0.2s;
transition: margin 0.2s;
margin-left: 250px; }
}
margin-left: 250px; } }
body.dashboard .wrapper.active .sidebar {
margin-left: 0; }
@media (min-width: 550px) {
body.dashboard .wrapper.active .content {
-webkit-transition: margin 0.2s;
transition: margin 0.2s;
margin-left: 250px; }
}
margin-left: 250px; } }
body.dashboard .navbar {
z-index: 999;
border-radius: 0px;
border: none;
border-bottom: 1px solid #00362f;
background: #00695C;
border-bottom: 1px solid #00695b;
background: #009c87;
margin: 0; }
body.dashboard .navbar a, body.dashboard .navbar a:active, body.dashboard .navbar a:visited {
color: #ffffff; }
@@ -67,7 +65,7 @@ body.dashboard .navbar {
body.dashboard .navbar .navbar-toggle.collapsed span {
background-color: #ffffff; }
body.dashboard .navbar .navbar-collapse {
background: #00695C; }
background: #009c87; }
body.dashboard .navbar a.navbar-brand {
padding: 34px 21px;
line-height: 0em;
@@ -80,8 +78,7 @@ body.dashboard .navbar {
padding-right: 10px; }
body.dashboard .navbar a.navbar-brand span:before {
font-family: FontAwesome;
content: "\f060"; }
}
content: "\f060"; } }
body.dashboard .navbar .nav li a {
height: 68px;
line-height: 35px; }

View File

@@ -38,23 +38,21 @@ body.dashboard .wrapper {
body.dashboard .wrapper .content {
-webkit-transition: margin 0.2s;
transition: margin 0.2s;
margin-left: 250px; }
}
margin-left: 250px; } }
body.dashboard .wrapper.active .sidebar {
margin-left: 0; }
@media (min-width: 550px) {
body.dashboard .wrapper.active .content {
-webkit-transition: margin 0.2s;
transition: margin 0.2s;
margin-left: 250px; }
}
margin-left: 250px; } }
body.dashboard .navbar {
z-index: 999;
border-radius: 0px;
border: none;
border-bottom: 1px solid #00362f;
background: #00695C;
border-bottom: 1px solid #00695b;
background: #009c87;
margin: 0; }
body.dashboard .navbar a, body.dashboard .navbar a:active, body.dashboard .navbar a:visited {
color: #ffffff; }
@@ -67,7 +65,7 @@ body.dashboard .navbar {
body.dashboard .navbar .navbar-toggle.collapsed span {
background-color: #ffffff; }
body.dashboard .navbar .navbar-collapse {
background: #00695C; }
background: #009c87; }
body.dashboard .navbar a.navbar-brand {
padding: 34px 21px;
line-height: 0em;
@@ -80,8 +78,7 @@ body.dashboard .navbar {
padding-right: 10px; }
body.dashboard .navbar a.navbar-brand span:before {
font-family: FontAwesome;
content: "\f060"; }
}
content: "\f060"; } }
body.dashboard .navbar .nav li a {
height: 68px;
line-height: 35px; }

View File

@@ -1,4 +1,4 @@
{
"css/all.css": "css/all-292b675b.css",
"css/all.css": "css/all-ff8e250e.css",
"js/all.js": "js/all-c84ab03b.js"
}