From 32d31bc8a871f63743e608d9e573070497bec3b4 Mon Sep 17 00:00:00 2001 From: ClientCrash Date: Sun, 12 Sep 2021 22:20:29 +0200 Subject: [PATCH 01/10] #260 added theme colors --- src/app/design/_theme-colors.scss | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/app/design/_theme-colors.scss diff --git a/src/app/design/_theme-colors.scss b/src/app/design/_theme-colors.scss new file mode 100644 index 00000000..285db322 --- /dev/null +++ b/src/app/design/_theme-colors.scss @@ -0,0 +1,24 @@ +/*primary*/ +$primary-default: #2ECC70; +$primary-hover: #1F8C4C; +$primary-disabled:#2E473E; +/*success*/ +$success-default: #3ABB18; +$success-hover: #277A10; +$success-disabled:#2F5629; +/*warning*/ +$warning-default: #F1C30E; +$warning-hover: #B3910B; +$warning-disabled:#675926; +/*danger*/ +$danger-default: #F00040; +$danger-hover: #B0002F; +$danger-disabled:#671E35; +/*info*/ +$info-default: #3281F6; +$info-hover: #245EB5; +$info-disabled:#2D456C; +/*etc*/ +$logo-crypt: #27A036 +/* ISSUE : #260 */ + From 39024657d786a9d0b6cb7ac9b856f9edab62091f Mon Sep 17 00:00:00 2001 From: ClientCrash <40364569+ClientCrash@users.noreply.github.com> Date: Sat, 18 Sep 2021 14:51:12 +0200 Subject: [PATCH 02/10] Apply suggestions from Marcel Co-authored-by: Marcel <34819524+MarcelCoding@users.noreply.github.com> --- src/app/design/_theme-colors.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/design/_theme-colors.scss b/src/app/design/_theme-colors.scss index 285db322..f923211d 100644 --- a/src/app/design/_theme-colors.scss +++ b/src/app/design/_theme-colors.scss @@ -1,23 +1,23 @@ /*primary*/ $primary-default: #2ECC70; $primary-hover: #1F8C4C; -$primary-disabled:#2E473E; +$primary-disabled: #2E473E; /*success*/ $success-default: #3ABB18; $success-hover: #277A10; -$success-disabled:#2F5629; +$success-disabled: #2F5629; /*warning*/ $warning-default: #F1C30E; $warning-hover: #B3910B; -$warning-disabled:#675926; +$warning-disabled: #675926; /*danger*/ $danger-default: #F00040; $danger-hover: #B0002F; -$danger-disabled:#671E35; +$danger-disabled: #671E35; /*info*/ $info-default: #3281F6; $info-hover: #245EB5; -$info-disabled:#2D456C; +$info-disabled: #2D456C; /*etc*/ $logo-crypt: #27A036 /* ISSUE : #260 */ From 7ee1a6748c8680eddc9751ae340d0af42af0e0d8 Mon Sep 17 00:00:00 2001 From: ClientCrash Date: Sun, 19 Sep 2021 12:42:28 +0200 Subject: [PATCH 03/10] changed theme colors file location --- src/global-styles/_theme-colors.scss | 24 ++++++++++++++++++++++++ src/styles.scss | 1 + 2 files changed, 25 insertions(+) create mode 100644 src/global-styles/_theme-colors.scss diff --git a/src/global-styles/_theme-colors.scss b/src/global-styles/_theme-colors.scss new file mode 100644 index 00000000..285db322 --- /dev/null +++ b/src/global-styles/_theme-colors.scss @@ -0,0 +1,24 @@ +/*primary*/ +$primary-default: #2ECC70; +$primary-hover: #1F8C4C; +$primary-disabled:#2E473E; +/*success*/ +$success-default: #3ABB18; +$success-hover: #277A10; +$success-disabled:#2F5629; +/*warning*/ +$warning-default: #F1C30E; +$warning-hover: #B3910B; +$warning-disabled:#675926; +/*danger*/ +$danger-default: #F00040; +$danger-hover: #B0002F; +$danger-disabled:#671E35; +/*info*/ +$info-default: #3281F6; +$info-hover: #245EB5; +$info-disabled:#2D456C; +/*etc*/ +$logo-crypt: #27A036 +/* ISSUE : #260 */ + diff --git a/src/styles.scss b/src/styles.scss index 412222f6..d138c57f 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -3,6 +3,7 @@ @import "variables"; @import "controls"; @import "context-menu"; +@import "theme-colors" app-root { width: 100%; From ef8cc71fde593eb4e0738469fc03281020cf134f Mon Sep 17 00:00:00 2001 From: ClientCrash Date: Sun, 19 Sep 2021 12:49:00 +0200 Subject: [PATCH 04/10] fixed typo --- src/styles.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles.scss b/src/styles.scss index d138c57f..0a886467 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -3,7 +3,7 @@ @import "variables"; @import "controls"; @import "context-menu"; -@import "theme-colors" +@import "theme-colors"; app-root { width: 100%; From 2bdce05deb77c7cc476b4f2e4072efcb4d44496b Mon Sep 17 00:00:00 2001 From: ClientCrash Date: Sun, 19 Sep 2021 12:57:54 +0200 Subject: [PATCH 05/10] changed imports --- src/global-styles/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/global-styles/_variables.scss b/src/global-styles/_variables.scss index 0465370e..6c19f561 100644 --- a/src/global-styles/_variables.scss +++ b/src/global-styles/_variables.scss @@ -1,5 +1,5 @@ // GLOBAL COLORS // - +@import 'theme-colors' $green: #64dd17; $green-dark: darken($green, 10%); $red: #dd2c00; From 9d84ced44f377094dcc736c89cfb1ec2ef9ec469 Mon Sep 17 00:00:00 2001 From: ClientCrash Date: Sun, 19 Sep 2021 13:00:45 +0200 Subject: [PATCH 06/10] fixed import --- src/global-styles/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/global-styles/_variables.scss b/src/global-styles/_variables.scss index 6c19f561..ef9b1090 100644 --- a/src/global-styles/_variables.scss +++ b/src/global-styles/_variables.scss @@ -1,5 +1,5 @@ // GLOBAL COLORS // -@import 'theme-colors' +@import 'theme-colors'; $green: #64dd17; $green-dark: darken($green, 10%); $red: #dd2c00; From 6af968d684a259cff0dafd5be55d5edaee997cd1 Mon Sep 17 00:00:00 2001 From: ClientCrash Date: Sun, 19 Sep 2021 13:52:10 +0200 Subject: [PATCH 07/10] deleted duplicate of theme-colors scss --- src/app/design/_theme-colors.scss | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 src/app/design/_theme-colors.scss diff --git a/src/app/design/_theme-colors.scss b/src/app/design/_theme-colors.scss deleted file mode 100644 index f923211d..00000000 --- a/src/app/design/_theme-colors.scss +++ /dev/null @@ -1,24 +0,0 @@ -/*primary*/ -$primary-default: #2ECC70; -$primary-hover: #1F8C4C; -$primary-disabled: #2E473E; -/*success*/ -$success-default: #3ABB18; -$success-hover: #277A10; -$success-disabled: #2F5629; -/*warning*/ -$warning-default: #F1C30E; -$warning-hover: #B3910B; -$warning-disabled: #675926; -/*danger*/ -$danger-default: #F00040; -$danger-hover: #B0002F; -$danger-disabled: #671E35; -/*info*/ -$info-default: #3281F6; -$info-hover: #245EB5; -$info-disabled: #2D456C; -/*etc*/ -$logo-crypt: #27A036 -/* ISSUE : #260 */ - From f5ad243e0662103966a83ee7ecc3be42801bb50f Mon Sep 17 00:00:00 2001 From: ClientCrash Date: Sun, 19 Sep 2021 13:53:17 +0200 Subject: [PATCH 08/10] removed useless import --- src/global-styles/_variables.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/global-styles/_variables.scss b/src/global-styles/_variables.scss index ef9b1090..fafb17b2 100644 --- a/src/global-styles/_variables.scss +++ b/src/global-styles/_variables.scss @@ -1,5 +1,4 @@ // GLOBAL COLORS // -@import 'theme-colors'; $green: #64dd17; $green-dark: darken($green, 10%); $red: #dd2c00; From 4e677f28d144c7479ba16acdd330a2f7561aca94 Mon Sep 17 00:00:00 2001 From: ClientCrash Date: Sun, 19 Sep 2021 14:51:59 +0200 Subject: [PATCH 09/10] made theme colors import more optional --- src/styles.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/styles.scss b/src/styles.scss index 0a886467..412222f6 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -3,7 +3,6 @@ @import "variables"; @import "controls"; @import "context-menu"; -@import "theme-colors"; app-root { width: 100%; From 5f5e6261f4b378129ef3bf1d4445b0cbe2d2e6ad Mon Sep 17 00:00:00 2001 From: ClientCrash Date: Sun, 19 Sep 2021 15:01:33 +0200 Subject: [PATCH 10/10] updated styling --- src/global-styles/_theme-colors.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/global-styles/_theme-colors.scss b/src/global-styles/_theme-colors.scss index 285db322..f923211d 100644 --- a/src/global-styles/_theme-colors.scss +++ b/src/global-styles/_theme-colors.scss @@ -1,23 +1,23 @@ /*primary*/ $primary-default: #2ECC70; $primary-hover: #1F8C4C; -$primary-disabled:#2E473E; +$primary-disabled: #2E473E; /*success*/ $success-default: #3ABB18; $success-hover: #277A10; -$success-disabled:#2F5629; +$success-disabled: #2F5629; /*warning*/ $warning-default: #F1C30E; $warning-hover: #B3910B; -$warning-disabled:#675926; +$warning-disabled: #675926; /*danger*/ $danger-default: #F00040; $danger-hover: #B0002F; -$danger-disabled:#671E35; +$danger-disabled: #671E35; /*info*/ $info-default: #3281F6; $info-hover: #245EB5; -$info-disabled:#2D456C; +$info-disabled: #2D456C; /*etc*/ $logo-crypt: #27A036 /* ISSUE : #260 */