Cleanup CSS variables

User current ENSL blue colour
This commit is contained in:
Luke Barratt 2014-04-28 00:58:11 +01:00
parent fd0e681aa2
commit 337b0c1f7d
6 changed files with 14 additions and 54 deletions

View file

@ -48,11 +48,11 @@ $base-border-radius: em(5);
$red: #de8650; $red: #de8650;
$green: darken(#68cc90, 10); $green: darken(#68cc90, 10);
$blue: darken(#0A8FC8, 10); $blue: #3379A9;
$gold: #FFD700; $gold: #FFD700;
$dark-blue: darken(#0072A6, 10); $dark-blue: darken($blue, 15);
$deep-blue: darken(#12526E, 10); $deep-blue: darken($dark-blue, 15);
$dark-gray: #21262A; $dark-gray: #21262A;
$medium-gray: #2F383D; $medium-gray: #2F383D;
@ -66,8 +66,8 @@ $light-green: #1f7f5c;
$base-body-color: white; $base-body-color: white;
$base-font-color: $dark-gray; $base-font-color: $dark-gray;
$base-accent-color: $blue; $base-accent-color: $blue;
$base-link-color: #285258; $base-link-color: $base-accent-color;
$hover-link-color: darken($base-accent-color, 15); $hover-link-color: lighten($base-accent-color, 15);
$base-border-color: $light-gray; $base-border-color: $light-gray;
$error-color: $light-red; $error-color: $light-red;
@ -75,14 +75,6 @@ $notice-color: $light-yellow;
$success-color: $light-green; $success-color: $light-green;
$background-primary: $medium-gray; $background-primary: $medium-gray;
$background-secondary: #ece9e1;
$background-tertiary: #e2dfd8;
$text-primary: #232323;
$text-secondary: #888888;
$text-tertiary: #666666;
$link-primary: #285258;
$navbar-primary: $blue; $navbar-primary: $blue;
$navbar-secondary: $light-blue; $navbar-secondary: $light-blue;
@ -104,12 +96,6 @@ $input-border-colour: darken($light-gray, 10%);
$input-padding: em(11); $input-padding: em(11);
$input-border-radius: $base-border-radius; $input-border-radius: $base-border-radius;
$input-dark-background-colour: $medium-gray;
$input-dark-border-colour: $light-gray;
$input-dark-border-width: em(2);
$input-dark-border-hover-colour: $blue;
$input-dark-border-focus-colour: $green;
$button-primary: $blue; $button-primary: $blue;
$button-secondary: $green; $button-secondary: $green;
$button-text: white; $button-text: white;
@ -118,4 +104,4 @@ $button-text: white;
Shadows Shadows
*/ */
$content-shadow: 0px 5px 20px 0px rgba(0, 0, 0, 0.1); $content-shadow: 0px 5px 20px 0px rgba(0, 0, 0, 0.1);

View file

@ -5,6 +5,7 @@
.flash { .flash {
@include span-columns(12); @include span-columns(12);
margin-bottom: em(20); margin-bottom: em(20);
font-weight: 600;
&.notice { &.notice {
@include flash; @include flash;

View file

@ -209,39 +209,6 @@ form {
} }
} }
form.dark {
.fields {
input {
color: white;
background: $input-dark-background-colour;
border: $input-dark-border-colour solid $input-dark-border-width;
&:hover {
border: $input-dark-border-width solid $input-dark-border-hover-colour;
}
&:focus {
border: $input-dark-border-width solid $input-dark-border-focus-colour;
}
&:-webkit-autofill {
-webkit-text-fill-color: white !important;
-webkit-box-shadow: 0 0 0px 1000px $input-dark-background-colour inset;
}
}
}
.controls {
margin-bottom: 20px;
button,
input {
background-color: $dark-blue;
}
}
}
form.square { form.square {
@include span-columns(12); @include span-columns(12);
margin: em(20) 0; margin: em(20) 0;

View file

@ -41,6 +41,10 @@ ul.navigation {
margin-top: - em(2); margin-top: - em(2);
} }
a {
font-weight: 400;
}
> a { > a {
width: 100%; width: 100%;
color: white; color: white;

View file

@ -22,6 +22,7 @@
padding: em(12) em(24); padding: em(12) em(24);
margin: 0 -20px; margin: 0 -20px;
margin-bottom: em(12); margin-bottom: em(12);
font-weight: 600;
a { a {
color: white; color: white;
@ -74,7 +75,7 @@
.bar { .bar {
display: block; display: block;
background: $green; background: $blue;
height: 10px; height: 10px;
} }

View file

@ -51,6 +51,7 @@ p {
a { a {
color: $base-link-color; color: $base-link-color;
text-decoration: none; text-decoration: none;
font-weight: 600;
@include transition(color 0.1s linear); @include transition(color 0.1s linear);
&:hover { &:hover {