From eace0e1ddd813492c29ee679d4309613bf7c0bb4 Mon Sep 17 00:00:00 2001 From: Tyler Miller Date: Wed, 20 Sep 2023 19:15:07 -0700 Subject: [PATCH] fix(palette): get `canvas` from primitives This should also correct any issues with the `Normal` bg being off or incorrect, as this color (i.e. the `Normal` bg, the global bg) ultimately derives from `canvas.default` (found in the palette). Fixes #298 --- lua/github-theme/palette/github_dark.lua | 7 +------ lua/github-theme/palette/github_dark_colorblind.lua | 7 +------ lua/github-theme/palette/github_dark_dimmed.lua | 7 +------ lua/github-theme/palette/github_dark_high_contrast.lua | 7 +------ lua/github-theme/palette/github_dark_tritanopia.lua | 7 +------ lua/github-theme/palette/github_light.lua | 7 +------ lua/github-theme/palette/github_light_colorblind.lua | 7 +------ lua/github-theme/palette/github_light_high_contrast.lua | 7 +------ lua/github-theme/palette/github_light_tritanopia.lua | 7 +------ 9 files changed, 9 insertions(+), 54 deletions(-) diff --git a/lua/github-theme/palette/github_dark.lua b/lua/github-theme/palette/github_dark.lua index 7bf31b76..57931b61 100755 --- a/lua/github-theme/palette/github_dark.lua +++ b/lua/github-theme/palette/github_dark.lua @@ -42,12 +42,7 @@ local palette = { on_emphasis = scale.white, }, - canvas = { - default = scale.gray[7], - overlay = scale.gray[9], - inset = scale.gray[8], - subtle = scale.gray[9], - }, + canvas = primitives.canvas, border = { default = scale.gray[9], diff --git a/lua/github-theme/palette/github_dark_colorblind.lua b/lua/github-theme/palette/github_dark_colorblind.lua index cc78cfea..2aa1e399 100644 --- a/lua/github-theme/palette/github_dark_colorblind.lua +++ b/lua/github-theme/palette/github_dark_colorblind.lua @@ -42,12 +42,7 @@ local palette = { on_emphasis = scale.white, }, - canvas = { - default = scale.gray[10], - overlay = scale.gray[9], - inset = scale.black, - subtle = scale.gray[9], - }, + canvas = primitives.canvas, border = { default = scale.gray[7], diff --git a/lua/github-theme/palette/github_dark_dimmed.lua b/lua/github-theme/palette/github_dark_dimmed.lua index 69ecdcb1..b3dfdab7 100644 --- a/lua/github-theme/palette/github_dark_dimmed.lua +++ b/lua/github-theme/palette/github_dark_dimmed.lua @@ -42,12 +42,7 @@ local palette = { on_emphasis = scale.white, }, - canvas = { - default = scale.gray[10], - overlay = scale.gray[9], - inset = scale.black, - subtle = scale.gray[9], - }, + canvas = primitives.canvas, border = { default = scale.gray[7], diff --git a/lua/github-theme/palette/github_dark_high_contrast.lua b/lua/github-theme/palette/github_dark_high_contrast.lua index 66c037c9..48a0e61a 100644 --- a/lua/github-theme/palette/github_dark_high_contrast.lua +++ b/lua/github-theme/palette/github_dark_high_contrast.lua @@ -42,12 +42,7 @@ local palette = { on_emphasis = scale.gray[10], }, - canvas = { - default = scale.gray[10], - overlay = scale.gray[9], - inset = scale.black, - subtle = scale.gray[9], - }, + canvas = primitives.canvas, border = { default = scale.gray[4], diff --git a/lua/github-theme/palette/github_dark_tritanopia.lua b/lua/github-theme/palette/github_dark_tritanopia.lua index 0b9e4966..f97877ea 100644 --- a/lua/github-theme/palette/github_dark_tritanopia.lua +++ b/lua/github-theme/palette/github_dark_tritanopia.lua @@ -42,12 +42,7 @@ local palette = { on_emphasis = scale.white, }, - canvas = { - default = scale.gray[10], - overlay = scale.gray[9], - inset = scale.black, - subtle = scale.gray[9], - }, + canvas = primitives.canvas, border = { default = scale.gray[7], diff --git a/lua/github-theme/palette/github_light.lua b/lua/github-theme/palette/github_light.lua index 4de3f80c..b8ab4e3c 100644 --- a/lua/github-theme/palette/github_light.lua +++ b/lua/github-theme/palette/github_light.lua @@ -43,12 +43,7 @@ local palette = { on_emphasis = scale.white, }, - canvas = { - default = scale.white, - overlay = scale.white, - inset = scale.gray[1], - subtle = scale.gray[1], - }, + canvas = primitives.canvas, border = { default = scale.gray[3], diff --git a/lua/github-theme/palette/github_light_colorblind.lua b/lua/github-theme/palette/github_light_colorblind.lua index f88e7d0e..0a43aac2 100644 --- a/lua/github-theme/palette/github_light_colorblind.lua +++ b/lua/github-theme/palette/github_light_colorblind.lua @@ -43,12 +43,7 @@ local palette = { on_emphasis = scale.white, }, - canvas = { - default = scale.white, - overlay = scale.white, - inset = scale.gray[1], - subtle = scale.gray[1], - }, + canvas = primitives.canvas, border = { default = scale.gray[3], diff --git a/lua/github-theme/palette/github_light_high_contrast.lua b/lua/github-theme/palette/github_light_high_contrast.lua index 04769424..ca1cee98 100644 --- a/lua/github-theme/palette/github_light_high_contrast.lua +++ b/lua/github-theme/palette/github_light_high_contrast.lua @@ -43,12 +43,7 @@ local palette = { on_emphasis = scale.white, }, - canvas = { - default = scale.white, - overlay = scale.white, - inset = scale.white, - subtle = scale.gray[2], - }, + canvas = primitives.canvas, border = { default = scale.gray[9], diff --git a/lua/github-theme/palette/github_light_tritanopia.lua b/lua/github-theme/palette/github_light_tritanopia.lua index 7a174dc3..4872c944 100644 --- a/lua/github-theme/palette/github_light_tritanopia.lua +++ b/lua/github-theme/palette/github_light_tritanopia.lua @@ -43,12 +43,7 @@ local palette = { on_emphasis = scale.white, }, - canvas = { - default = scale.white, - overlay = scale.white, - inset = scale.gray[1], - subtle = scale.gray[1], - }, + canvas = primitives.canvas, border = { default = scale.gray[3],