From 457bb213b273a9b206cc5654eb085cede4e916ad Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 16 Jan 2019 16:05:40 +0100 Subject: Refactor how we use icons Inject them in an angular component so we can easily change their color --- client/src/sass/application.scss | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'client/src/sass/application.scss') diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index 2356f9837..37837bfc0 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss @@ -23,7 +23,7 @@ body { // now beware node-sass requires interpolation // for css custom properties #{$var} --mainColor: #{$orange-color}; - --mainHoverColor: #{$orange-hoover-color}; + --mainHoverColor: #{$orange-hover-color}; --mainBackgroundColor: #{$bg-color}; --mainForegroundColor: #{$fg-color}; --menuBackgroundColor: #{$menu-background}; @@ -229,13 +229,12 @@ label { font-weight: $font-semibold; } - .close { + my-global-icon { @include icon(24px); position: relative; top: 3px; float: right; - background-image: url('../assets/images/global/cross.svg'); margin: 0; padding: 0; @@ -324,7 +323,7 @@ ngb-tabset.bootstrap { table { .action-button-edit, .action-button-delete { &:hover, &:active, &:focus, &[disabled], &.disabled { - background-color: $grey-color !important; + background-color: $grey-background-color !important; } } } @@ -389,4 +388,4 @@ table { } } } -} \ No newline at end of file +} -- cgit v1.2.3 From f2fab901df31a0e7081f4bb225f28e98798950b0 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 17 Jan 2019 11:30:47 +0100 Subject: Fix invisible things in dark mode --- client/src/sass/application.scss | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'client/src/sass/application.scss') diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index 37837bfc0..783464f86 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss @@ -290,6 +290,10 @@ ngb-tabset.bootstrap { @include disable-default-a-behaviour; color: var(--mainForegroundColor) !important; + + &.active { + color: #000 !important; + } } } } -- cgit v1.2.3 From aa87909287c4f4d38696244e32828265b040c7d5 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 17 Jan 2019 11:51:08 +0100 Subject: Fix calendar in dark mode --- client/src/sass/application.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'client/src/sass/application.scss') diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index 783464f86..478737a43 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss @@ -290,12 +290,12 @@ ngb-tabset.bootstrap { @include disable-default-a-behaviour; color: var(--mainForegroundColor) !important; - - &.active { - color: #000 !important; - } } } + + .nav-pills .nav-link.active { + color: #000 !important; + } } .nav-tabs .nav-link.active { -- cgit v1.2.3