diff --git a/app/assets/stylesheets/_variables.scss b/app/assets/stylesheets/_variables.scss index 4c10de5..f24c579 100644 --- a/app/assets/stylesheets/_variables.scss +++ b/app/assets/stylesheets/_variables.scss @@ -48,11 +48,11 @@ $base-border-radius: em(5); $red: #de8650; $green: darken(#68cc90, 10); -$blue: darken(#0A8FC8, 10); +$blue: #3379A9; $gold: #FFD700; -$dark-blue: darken(#0072A6, 10); -$deep-blue: darken(#12526E, 10); +$dark-blue: darken($blue, 15); +$deep-blue: darken($dark-blue, 15); $dark-gray: #21262A; $medium-gray: #2F383D; @@ -66,8 +66,8 @@ $light-green: #1f7f5c; $base-body-color: white; $base-font-color: $dark-gray; $base-accent-color: $blue; -$base-link-color: #285258; -$hover-link-color: darken($base-accent-color, 15); +$base-link-color: $base-accent-color; +$hover-link-color: lighten($base-accent-color, 15); $base-border-color: $light-gray; $error-color: $light-red; @@ -75,14 +75,6 @@ $notice-color: $light-yellow; $success-color: $light-green; $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-secondary: $light-blue; @@ -104,12 +96,6 @@ $input-border-colour: darken($light-gray, 10%); $input-padding: em(11); $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-secondary: $green; $button-text: white; @@ -118,4 +104,4 @@ $button-text: white; Shadows */ -$content-shadow: 0px 5px 20px 0px rgba(0, 0, 0, 0.1); \ No newline at end of file +$content-shadow: 0px 5px 20px 0px rgba(0, 0, 0, 0.1); diff --git a/app/assets/stylesheets/components/_flashes.scss b/app/assets/stylesheets/components/_flashes.scss index d290069..53658ce 100644 --- a/app/assets/stylesheets/components/_flashes.scss +++ b/app/assets/stylesheets/components/_flashes.scss @@ -5,6 +5,7 @@ .flash { @include span-columns(12); margin-bottom: em(20); + font-weight: 600; &.notice { @include flash; diff --git a/app/assets/stylesheets/components/_forms.scss b/app/assets/stylesheets/components/_forms.scss index 1fa46d2..cb991ba 100644 --- a/app/assets/stylesheets/components/_forms.scss +++ b/app/assets/stylesheets/components/_forms.scss @@ -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 { @include span-columns(12); margin: em(20) 0; diff --git a/app/assets/stylesheets/layout/_navigation.scss b/app/assets/stylesheets/layout/_navigation.scss index d2be986..6f9497c 100644 --- a/app/assets/stylesheets/layout/_navigation.scss +++ b/app/assets/stylesheets/layout/_navigation.scss @@ -41,6 +41,10 @@ ul.navigation { margin-top: - em(2); } + a { + font-weight: 400; + } + > a { width: 100%; color: white; diff --git a/app/assets/stylesheets/layout/_sidebar.scss b/app/assets/stylesheets/layout/_sidebar.scss index f51e053..5918c59 100644 --- a/app/assets/stylesheets/layout/_sidebar.scss +++ b/app/assets/stylesheets/layout/_sidebar.scss @@ -22,6 +22,7 @@ padding: em(12) em(24); margin: 0 -20px; margin-bottom: em(12); + font-weight: 600; a { color: white; @@ -74,7 +75,7 @@ .bar { display: block; - background: $green; + background: $blue; height: 10px; } diff --git a/app/assets/stylesheets/layout/_typography.scss b/app/assets/stylesheets/layout/_typography.scss index c22dd1f..c3624ce 100644 --- a/app/assets/stylesheets/layout/_typography.scss +++ b/app/assets/stylesheets/layout/_typography.scss @@ -51,6 +51,7 @@ p { a { color: $base-link-color; text-decoration: none; + font-weight: 600; @include transition(color 0.1s linear); &:hover {