From d498e0f245c48629dfea7fc1180dfe07ccba94e8 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 2 Mar 2021 14:11:41 +0530 Subject: [PATCH 1/4] fix: Primary button text color --- frappe/public/scss/common/buttons.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/public/scss/common/buttons.scss b/frappe/public/scss/common/buttons.scss index c8cd374937..591dc5bba6 100644 --- a/frappe/public/scss/common/buttons.scss +++ b/frappe/public/scss/common/buttons.scss @@ -78,8 +78,9 @@ .btn.btn-primary { background-color: var(--primary-color); + color: var(--white); white-space: nowrap; - --icon-stroke: white; + --icon-stroke: currentColor; --icon-fill-bg: var(--primary-color); } From ba2a85965c61a3b6b3b0228cfecc32018192f828 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 2 Mar 2021 14:16:03 +0530 Subject: [PATCH 2/4] fix: Reduce btn-focus-outline width --- frappe/public/scss/desk/variables.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/public/scss/desk/variables.scss b/frappe/public/scss/desk/variables.scss index 4f43f22b9d..633d10b524 100644 --- a/frappe/public/scss/desk/variables.scss +++ b/frappe/public/scss/desk/variables.scss @@ -65,6 +65,7 @@ $input-color: var(--text-color); $input-box-shadow: none; $input-focus-border-color: var(--gray-500); $input-border-radius: var(--border-radius); +$input-btn-focus-width: 2px; // dropdown $dropdown-color: var(--text-color); From 0ef74e3681e1818aa2b83cab09b1104a088d61c3 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 2 Mar 2021 15:38:27 +0530 Subject: [PATCH 3/4] fix: Breadcrumb arrow color in dark theme --- frappe/public/icons/timeless/icon-right-arrow.svg | 3 --- frappe/public/scss/desk/breadcrumb.scss | 2 +- frappe/public/scss/desk/css_variables.scss | 3 +++ frappe/public/scss/desk/dark.scss | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 frappe/public/icons/timeless/icon-right-arrow.svg diff --git a/frappe/public/icons/timeless/icon-right-arrow.svg b/frappe/public/icons/timeless/icon-right-arrow.svg deleted file mode 100644 index 1e044d0e4d..0000000000 --- a/frappe/public/icons/timeless/icon-right-arrow.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/frappe/public/scss/desk/breadcrumb.scss b/frappe/public/scss/desk/breadcrumb.scss index 9bccb4b5a9..6324e6f012 100644 --- a/frappe/public/scss/desk/breadcrumb.scss +++ b/frappe/public/scss/desk/breadcrumb.scss @@ -12,7 +12,7 @@ font-size: var(--text-md); margin-right: 10px; &:before { - content: url('/assets/frappe/icons/timeless/icon-right-arrow.svg'); + content: var(--right-arrow-svg); display: inline-block; margin-right: 10px; } diff --git a/frappe/public/scss/desk/css_variables.scss b/frappe/public/scss/desk/css_variables.scss index 735165ba6f..21b4ac6c1d 100644 --- a/frappe/public/scss/desk/css_variables.scss +++ b/frappe/public/scss/desk/css_variables.scss @@ -50,6 +50,7 @@ $input-height: 28px !default; // input --input-height: #{$input-height}; + --input-disabled-bg: var(--gray-200); // timeline --timeline-item-icon-size: 34px; @@ -60,4 +61,6 @@ $input-height: 28px !default; // skeleton --skeleton-bg: var(--gray-100); + + --right-arrow-svg: url("data: image/svg+xml;utf8, "); } diff --git a/frappe/public/scss/desk/dark.scss b/frappe/public/scss/desk/dark.scss index 3639a07664..e86505fcae 100644 --- a/frappe/public/scss/desk/dark.scss +++ b/frappe/public/scss/desk/dark.scss @@ -142,4 +142,6 @@ // skeleton --skeleton-bg: var(--gray-800); + + --right-arrow-svg: url("data: image/svg+xml;utf8, "); } From 8eddd49ea7bb9fcd691b0a6045e86e7f8c45e4b0 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 2 Mar 2021 15:38:55 +0530 Subject: [PATCH 4/4] fix: Disabled input color in dark mode --- frappe/public/scss/desk/dark.scss | 3 +++ frappe/public/scss/desk/variables.scss | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/frappe/public/scss/desk/dark.scss b/frappe/public/scss/desk/dark.scss index e86505fcae..7bbf582af0 100644 --- a/frappe/public/scss/desk/dark.scss +++ b/frappe/public/scss/desk/dark.scss @@ -72,6 +72,9 @@ --highlight-color: var(--gray-700); --yellow-highlight-color: var(--yellow-700); + // input + --input-disabled-bg: none; + .frappe-card { .btn-default { background-color: var(--bg-color); diff --git a/frappe/public/scss/desk/variables.scss b/frappe/public/scss/desk/variables.scss index 633d10b524..57a117cd31 100644 --- a/frappe/public/scss/desk/variables.scss +++ b/frappe/public/scss/desk/variables.scss @@ -60,7 +60,7 @@ $link-color: var(--text-color); // input $input-bg: var(--control-bg); $input-placeholder-color: var(--gray-500); -$input-disabled-bg: var(--gray-200); +$input-disabled-bg: var(--input-disabled-bg); $input-color: var(--text-color); $input-box-shadow: none; $input-focus-border-color: var(--gray-500); @@ -135,9 +135,9 @@ $grid-breakpoints: ( 2xl: 1440px ) !default; -@import 'dark'; @import 'typography'; @import '~bootstrap/scss/functions'; @import '~bootstrap/scss/variables'; @import "~bootstrap/scss/mixins"; @import 'css_variables'; +@import 'dark';