From bc6e9041e130b9103611ff5da433b993504ff898 Mon Sep 17 00:00:00 2001 From: Dominik Date: Mon, 13 Nov 2023 11:25:42 +0100 Subject: [PATCH 1/3] exclude dark css vars when light theme is turned on --- grafana-plugin/src/assets/style/vars.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grafana-plugin/src/assets/style/vars.css b/grafana-plugin/src/assets/style/vars.css index c10443b34b..1758570348 100644 --- a/grafana-plugin/src/assets/style/vars.css +++ b/grafana-plugin/src/assets/style/vars.css @@ -71,7 +71,7 @@ --working-hours-shades-color-light: rgba(17, 18, 23, 0.04); } -.theme-dark { +.theme-dark:not(.theme-light) { --cards-background: var(--gray-9); --highlighted-row-bg: var(--gray-9); --disabled-button-color: hsla(0, 0%, 100%, 0.08); From 529b6c2fd73ab7360638ac13bf7803bba1b56bf2 Mon Sep 17 00:00:00 2001 From: Dominik Date: Mon, 13 Nov 2023 11:28:37 +0100 Subject: [PATCH 2/3] Update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index abcb3298fc..e54f14bf53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +### Fixed + +- Fix styling when light theme is turned on via system preferences by excluding dark theme css vars in this case ([#3336](https://github.com/grafana/oncall/pull/3336)) + ### Added - Added user timezone field to the users public API response ([#3311](https://github.com/grafana/oncall/pull/3311)) From 92de8de3a99012f151cf23cbb6289af10106366e Mon Sep 17 00:00:00 2001 From: Dominik Date: Mon, 13 Nov 2023 11:52:36 +0100 Subject: [PATCH 3/3] fix changelog --- CHANGELOG.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e54f14bf53..fcf6c15cab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,10 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased -### Fixed - -- Fix styling when light theme is turned on via system preferences by excluding dark theme css vars in this case ([#3336](https://github.com/grafana/oncall/pull/3336)) - ### Added - Added user timezone field to the users public API response ([#3311](https://github.com/grafana/oncall/pull/3311)) @@ -22,6 +18,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Forward headers for Amazon SNS when organizations are moved @mderynck ([#3326](https://github.com/grafana/oncall/pull/3326)) +- Fix styling when light theme is turned on via system preferences + by excluding dark theme css vars in this case ([#3336](https://github.com/grafana/oncall/pull/3336)) ## v1.3.57 (2023-11-10)