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
projekt0n · Sep 21, 2023 · eace0e1 · eace0e1
1 parent bf4cd7e
commit eace0e1
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 54 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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],