From d0b8565f544a6cb72af58054679f5471514ffe28 Mon Sep 17 00:00:00 2001 From: Justin Sleep Date: Sat, 28 Dec 2019 23:52:57 -0600 Subject: [PATCH 1/3] Fix inverted diff line highlighting in dark theme Signed-off-by: Justin Sleep --- res/themes/dark/css/_dark.scss | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss index eadde4c672..d1d0e333a0 100644 --- a/res/themes/dark/css/_dark.scss +++ b/res/themes/dark/css/_dark.scss @@ -243,3 +243,12 @@ $breadcrumb-placeholder-bg-color: #272c35; } } } + +// Fixes diff color inversion by swapping add / del colors +.hljs-addition { + background: #fdd; +} + +.hljs-deletion { + background: #dfd; +} From dcdf68d7e1cb9f9eb4f18c627fe0029d7c57db67 Mon Sep 17 00:00:00 2001 From: Justin Sleep Date: Sun, 5 Jan 2020 17:35:05 -0600 Subject: [PATCH 2/3] Explicitly define diff colors in light theme Signed-off-by: Justin Sleep --- res/themes/dark/css/_dark.scss | 2 +- res/themes/light/css/_light.scss | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss index d1d0e333a0..212513347d 100644 --- a/res/themes/dark/css/_dark.scss +++ b/res/themes/dark/css/_dark.scss @@ -244,7 +244,7 @@ $breadcrumb-placeholder-bg-color: #272c35; } } -// Fixes diff color inversion by swapping add / del colors +// diff highlight colors .hljs-addition { background: #fdd; } diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss index 0a3ef812b8..f4fc459596 100644 --- a/res/themes/light/css/_light.scss +++ b/res/themes/light/css/_light.scss @@ -338,3 +338,12 @@ $breadcrumb-placeholder-bg-color: #e8eef5; color: $accent-color; text-decoration: none; } + +// diff highlight colors +.hljs-addition { + background: #dfd; +} + +.hljs-deletion { + background: #fdd; +} From 8ec8a7c01534818178259b0708681e9b3f43b50a Mon Sep 17 00:00:00 2001 From: Justin Sleep Date: Sun, 5 Jan 2020 17:58:07 -0600 Subject: [PATCH 3/3] Comment rationale for swapping dark theme colors Signed-off-by: Justin Sleep --- res/themes/dark/css/_dark.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss index 212513347d..0c47943301 100644 --- a/res/themes/dark/css/_dark.scss +++ b/res/themes/dark/css/_dark.scss @@ -245,6 +245,7 @@ $breadcrumb-placeholder-bg-color: #272c35; } // diff highlight colors +// intentionally swapped to avoid inversion .hljs-addition { background: #fdd; }