commit 2d4cecc06dbd946b5917a236a9d9f679a4b98df6
parent ff485b8560d9b8e87283e784fa61e973edd88f9a
Author: Thomas Frössman <thomasf@jossystem.se>
Date: Wed, 20 Nov 2019 13:06:20 +0100
solarized-dark: lightness diff fix
Diffstat:
2 files changed, 60 insertions(+), 62 deletions(-)
diff --git a/colorlab/main.go b/colorlab/main.go
@@ -57,7 +57,7 @@ var palettes = []Palette{
Gamma: default1BgFg.Gamma,
ForegroundBlendFinder: colorlab.NamedColorFinder("base1"),
BackgroundBlendFinder: default1BgFg.BackgroundBlendFinder,
- MinimumLightnessDifference: 0.42,
+ MinimumLightnessDifference: 0.4,
},
Accent2Pair: AccentPairGenerator{
BlendBackgroundAmout: default2BgFg.BlendBackgroundAmout,
@@ -65,7 +65,7 @@ var palettes = []Palette{
Gamma: default2BgFg.Gamma,
ForegroundBlendFinder: colorlab.NamedColorFinder("base1"),
BackgroundBlendFinder: default2BgFg.BackgroundBlendFinder,
- MinimumLightnessDifference: 0.42,
+ MinimumLightnessDifference: 0.4,
},
},
{
@@ -84,7 +84,7 @@ var palettes = []Palette{
Gamma: default1BgFg.Gamma,
ForegroundBlendFinder: colorlab.NamedColorFinder("base1"),
BackgroundBlendFinder: default1BgFg.BackgroundBlendFinder,
- MinimumLightnessDifference: 0.42,
+ MinimumLightnessDifference: 0.4,
},
Accent2Pair: AccentPairGenerator{
BlendBackgroundAmout: default2BgFg.BlendBackgroundAmout,
@@ -92,7 +92,7 @@ var palettes = []Palette{
Gamma: default2BgFg.Gamma,
ForegroundBlendFinder: colorlab.NamedColorFinder("base1"),
BackgroundBlendFinder: default2BgFg.BackgroundBlendFinder,
- MinimumLightnessDifference: 0.42,
+ MinimumLightnessDifference: 0.4,
},
},
{
@@ -256,10 +256,8 @@ func (g *AccentPairGenerator) Generate(sol colorlab.Solarized) (backgrounds, for
nlf = nlf + g.Gamma
}
- const minimumLightnessDiff = 0.35
- // const minimumLightnessDiff = 0.45
- if (math.Max(nlf, nlb) - math.Min(nlf, nlb)) < minimumLightnessDiff {
- diff := (minimumLightnessDiff - (math.Max(math.Abs(nlf), math.Abs(nlb)) - math.Min(math.Abs(nlf), math.Abs(nlb))))
+ if (math.Max(nlf, nlb) - math.Min(nlf, nlb)) < g.MinimumLightnessDifference {
+ diff := (g.MinimumLightnessDifference - (math.Max(math.Abs(nlf), math.Abs(nlb)) - math.Min(math.Abs(nlf), math.Abs(nlb))))
m := 1.0
if bl > fl {
m = -1
diff --git a/solarized-palettes.el b/solarized-palettes.el
@@ -44,52 +44,52 @@
(blue . "#268bd2")
(cyan . "#2aa198")
(green . "#859900")
- (yellow-1bg . "#273632")
- (yellow-1fg . "#ad8d40")
- (yellow-2bg . "#464123")
- (yellow-2fg . "#ab9257")
+ (yellow-1bg . "#273532")
+ (yellow-1fg . "#af8f41")
+ (yellow-2bg . "#433e20")
+ (yellow-2fg . "#b39a5e")
(yellow-d . "#866300")
(yellow-l . "#e1af4b")
- (orange-1bg . "#2d2f31")
- (orange-1fg . "#c26842")
- (orange-2bg . "#502f22")
- (orange-2fg . "#bc7656")
+ (orange-1bg . "#2b2d2e")
+ (orange-1fg . "#ca6f48")
+ (orange-2bg . "#4d2c1f")
+ (orange-2fg . "#c47c5d")
(orange-d . "#992700")
(orange-l . "#fb7640")
- (red-1bg . "#2f2e33")
- (red-1fg . "#ce5e50")
- (red-2bg . "#562a28")
- (red-2fg . "#c66f61")
+ (red-1bg . "#2d2c31")
+ (red-1fg . "#d66556")
+ (red-2bg . "#532725")
+ (red-2fg . "#ce7667")
(red-d . "#a7020a")
(red-l . "#ff6849")
- (magenta-1bg . "#292f3e")
- (magenta-1fg . "#c4608a")
- (magenta-2bg . "#4f2c45")
- (magenta-2fg . "#bc7190")
+ (magenta-1bg . "#272d3c")
+ (magenta-1fg . "#cc6791")
+ (magenta-2bg . "#4c2942")
+ (magenta-2fg . "#c47896")
(magenta-d . "#a00559")
(magenta-l . "#ff699e")
- (violet-1bg . "#0f3347")
- (violet-1fg . "#797eb8")
- (violet-2bg . "#1e395d")
- (violet-2fg . "#8186b4")
+ (violet-1bg . "#0c3144")
+ (violet-1fg . "#8085c0")
+ (violet-2bg . "#1a365a")
+ (violet-2fg . "#888dbc")
(violet-d . "#243e9b")
(violet-l . "#8d85e7")
- (blue-1bg . "#003649")
- (blue-1fg . "#578fc1")
- (blue-2bg . "#004262")
- (blue-2fg . "#6994bb")
+ (blue-1bg . "#003547")
+ (blue-1fg . "#5c93c5")
+ (blue-2bg . "#003f5e")
+ (blue-2fg . "#709bc3")
(blue-d . "#0061a8")
(blue-l . "#74adf5")
- (cyan-1bg . "#013941")
- (cyan-1fg . "#539f98")
- (cyan-2bg . "#00494e")
- (cyan-2fg . "#64a09b")
+ (cyan-1bg . "#013841")
+ (cyan-1fg . "#54a099")
+ (cyan-2bg . "#00464a")
+ (cyan-2fg . "#6ba8a2")
(cyan-d . "#007d76")
(cyan-l . "#6ccec0")
(green-1bg . "#1d3732")
- (green-1fg . "#8b9941")
- (green-2bg . "#334624")
- (green-2fg . "#8f9b58")
+ (green-1fg . "#8c9a43")
+ (green-2bg . "#2f4321")
+ (green-2fg . "#97a35f")
(green-d . "#5b7300")
(green-l . "#b3c34d")
;; palette end
@@ -186,50 +186,50 @@
(green . "#93a61a")
(yellow-1bg . "#273430")
(yellow-1fg . "#bb9a4c")
- (yellow-2bg . "#4c4527")
- (yellow-2fg . "#b3995d")
+ (yellow-2bg . "#484224")
+ (yellow-2fg . "#bba165")
(yellow-d . "#936d00")
(yellow-l . "#f3be51")
- (orange-1bg . "#2d2e2f")
- (orange-1fg . "#ce724b")
- (orange-2bg . "#563225")
- (orange-2fg . "#c57d5d")
+ (orange-1bg . "#2d2d2f")
+ (orange-1fg . "#d0744d")
+ (orange-2bg . "#522f22")
+ (orange-2fg . "#cd8464")
(orange-d . "#a72e01")
(orange-l . "#ff8148")
- (red-1bg . "#2f2d32")
- (red-1fg . "#da6859")
- (red-2bg . "#5b2e2c")
- (red-2fg . "#cf7668")
+ (red-1bg . "#2f2c31")
+ (red-1fg . "#dc6a5a")
+ (red-2bg . "#582b29")
+ (red-2fg . "#d77e6f")
(red-d . "#ae1212")
(red-l . "#ff7254")
- (magenta-1bg . "#2a2d3d")
- (magenta-1fg . "#d06b95")
- (magenta-2bg . "#542f49")
- (magenta-2fg . "#c47897")
+ (magenta-1bg . "#292d3c")
+ (magenta-1fg . "#d16c96")
+ (magenta-2bg . "#512c46")
+ (magenta-2fg . "#cd809f")
(magenta-d . "#a81761")
(magenta-l . "#ff75ab")
- (violet-1bg . "#113145")
+ (violet-1bg . "#103145")
(violet-1fg . "#8589c4")
- (violet-2bg . "#253d61")
- (violet-2fg . "#888ebc")
+ (violet-2bg . "#213a5e")
+ (violet-2fg . "#9095c4")
(violet-d . "#3548a2")
(violet-l . "#9b94f2")
(blue-1bg . "#023447")
(blue-1fg . "#649bce")
- (blue-2bg . "#004666")
- (blue-2fg . "#709bc3")
+ (blue-2bg . "#004363")
+ (blue-2fg . "#78a3cb")
(blue-d . "#0069b0")
(blue-l . "#7ebaff")
(cyan-1bg . "#03373f")
(cyan-1fg . "#60aca4")
- (cyan-2bg . "#024e52")
- (cyan-2fg . "#6ba7a1")
+ (cyan-2bg . "#004b4f")
+ (cyan-2fg . "#73b0aa")
(cyan-d . "#008981")
(cyan-l . "#77dece")
(green-1bg . "#1e3531")
(green-1fg . "#97a54d")
- (green-2bg . "#384b28")
- (green-2fg . "#96a25e")
+ (green-2bg . "#354725")
+ (green-2fg . "#9eaa66")
(green-d . "#687f00")
(green-l . "#c3d255")
;; palette end
