From 1dbaabffbc2df762d2393d154fa1f362c5ff40df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 20 Feb 2016 16:09:31 +0100 Subject: [PATCH 1/2] ux(): dark shade / contrast mini tweak --- public/sass/_variables.dark.scss | 16 ++++++++-------- public/sass/_variables.light.scss | 6 +++--- public/sass/components/_gf-form.scss | 3 +-- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss index ccb2c66767b..877c950e1da 100644 --- a/public/sass/_variables.dark.scss +++ b/public/sass/_variables.dark.scss @@ -8,10 +8,10 @@ $black: #000; // ------------------------- $black: #000; -$dark-1: #141414; +$dark-1: #141414; $dark-2: #1f1d1d; -$dark-3: #262626; -$dark-4: #333333; +$dark-3: #292929; +$dark-4: #373737; $dark-5: #444444; $gray-1: #555555; $gray-2: #7B7B7B; @@ -139,16 +139,16 @@ $iconContainerBackground: $black; // Forms // ------------------------- -$input-bg: lighten($dark-3,5%); -$input-bg-disabled: #555; +$input-bg: $dark-4; +$input-bg-disabled: $dark-3; $input-color: $gray-4; -$input-border-color: lighten($dark-2,5%); +$input-border-color: $dark-4; $input-box-shadow: inset 0 1px 1px rgba(0,0,0,.075) !default; $input-border-focus: $input-border-color !default; $input-box-shadow-focus: rgba(102,175,233,.6) !default; -$input-color-placeholder: #999 !default; -$input-label-bg: $dark-3; +$input-color-placeholder: $gray-1 !default; +$input-label-bg: $dark-3; // Search $searchShadow: 0 0 35px 0 $body-bg; diff --git a/public/sass/_variables.light.scss b/public/sass/_variables.light.scss index 0ea879c4114..6dfa4ea4eb0 100644 --- a/public/sass/_variables.light.scss +++ b/public/sass/_variables.light.scss @@ -13,10 +13,10 @@ $black: #000; // ------------------------- $black: #000; -$dark-1: #141414; +$dark-1: #141414; $dark-2: #1f1d1d; -$dark-3: #262626; -$dark-4: #333333; +$dark-3: #292929; +$dark-4: #373737; $dark-5: #444444; $gray-1: #555555; $gray-2: #7B7B7B; diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss index 6b74063b5b3..7da08da18a3 100644 --- a/public/sass/components/_gf-form.scss +++ b/public/sass/components/_gf-form.scss @@ -1,4 +1,4 @@ -$gf-form-margin: 0.2rem; +$gf-form-margin: 0.3rem; .gf-form { margin-bottom: $gf-form-margin; @@ -84,7 +84,6 @@ $gf-form-margin: 0.2rem; // Placeholder &::placeholder { color: $input-color-placeholder; - // Override Firefox's unusual default opacity; see https://github.com/twbs/bootstrap/pull/11526. opacity: 1; } From c77f91213c1a0aa3d040eadb47fdcb132c7ddb94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 20 Feb 2016 16:16:29 +0100 Subject: [PATCH 2/2] ux(): minor tweak --- public/sass/_variables.dark.scss | 2 +- public/sass/_variables.light.scss | 2 +- public/sass/components/_search.scss | 2 +- public/sass/layout/_page.scss | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss index 877c950e1da..7c2c9037abc 100644 --- a/public/sass/_variables.dark.scss +++ b/public/sass/_variables.dark.scss @@ -151,7 +151,7 @@ $input-color-placeholder: $gray-1 !default; $input-label-bg: $dark-3; // Search -$searchShadow: 0 0 35px 0 $body-bg; +$search-shadow: 0 0 35px 0 $body-bg; // Dropdowns // ------------------------- diff --git a/public/sass/_variables.light.scss b/public/sass/_variables.light.scss index 6dfa4ea4eb0..e9f4fb323d6 100644 --- a/public/sass/_variables.light.scss +++ b/public/sass/_variables.light.scss @@ -164,7 +164,7 @@ $side-menu-bg: $body-bg; $side-menu-item-hover-bg: $gray-6; // search -$searchShadow: 0 5px 30px 0 lighten($gray-2, 30%); +$search-shadow: 0 5px 30px 0 lighten($gray-2, 30%); // Dropdowns // ------------------------- diff --git a/public/sass/components/_search.scss b/public/sass/components/_search.scss index ced2963f414..47b713f7e1a 100644 --- a/public/sass/components/_search.scss +++ b/public/sass/components/_search.scss @@ -5,7 +5,7 @@ z-index: 1000; position: absolute; width: 700px; - box-shadow: $searchShadow; + box-shadow: $search-shadow; padding: 10px; background-color: $panel-bg; border: $panel-border; diff --git a/public/sass/layout/_page.scss b/public/sass/layout/_page.scss index e4a20793ccf..7f1c0fe234d 100644 --- a/public/sass/layout/_page.scss +++ b/public/sass/layout/_page.scss @@ -18,7 +18,6 @@ } } -$color-page-hero-bg: #2e2e2e; .page-container { background-color: $page-bg; position: relative; @@ -27,7 +26,7 @@ $color-page-hero-bg: #2e2e2e; margin-left: 0; min-height: calc(100% - 54px); padding-bottom: $spacer * 5; - background-image: linear-gradient(60deg, rgba(0, 0, 0, 0) 0%, lighten($page-bg, 5%) 98%); + background-image: linear-gradient(60deg, rgba(0, 0, 0, 0) 0%, lighten($page-bg, 4%) 98%); } .page-header {