commit ff485b8560d9b8e87283e784fa61e973edd88f9a
parent 9ea2b5fcf5f2bcbb67d6c128d4fddfde24ac1d0f
Author: Thomas Frössman <thomasf@jossystem.se>
Date: Wed, 20 Nov 2019 12:40:24 +0100
new solarized dark accent fb/bg pairs
They are less bright now to not pop out as much.
solarized dark high contrast theme just has the same configuration now,
2bg/fg *maybe* should be adjusted for higher contrast.
other palettes are not affected.
Diffstat:
| M | colorlab/main.go | | | 91 | +++++++++++++++++++++++++++++++++++++++++++++---------------------------------- |
| M | solarized-palettes.el | | | 102 | ++++++++++++++++++++++++++++++++++++++++---------------------------------------- |
2 files changed, 103 insertions(+), 90 deletions(-)
diff --git a/colorlab/main.go b/colorlab/main.go
@@ -48,29 +48,25 @@ func main() {
}
var palettes = []Palette{
- // {
- // Name: "solarized-dark",
- // Solarized: solarized,
- // Accent1Pair: AccentPairGenerator{
- // BlendBackgroundAmout: default1BgFg.BlendBackgroundAmout,
- // BlendForegroundAmout: default1BgFg.BlendForegroundAmout,
- // Gamma: default1BgFg.Gamma,
- // ForegroundBlendFinder: colorlab.NamedColorFinder("base1"),
- // BackgroundBlendFinder: default1BgFg.BackgroundBlendFinder,
- // },
- // Accent2Pair: AccentPairGenerator{
- // BlendBackgroundAmout: default2BgFg.BlendBackgroundAmout,
- // BlendForegroundAmout: default2BgFg.BlendForegroundAmout,
- // Gamma: default2BgFg.Gamma,
- // ForegroundBlendFinder: colorlab.NamedColorFinder("base1"),
- // BackgroundBlendFinder: default2BgFg.BackgroundBlendFinder,
- // },
- // },
{
- Name: "solarized-dark",
- Solarized: solarized,
- Accent1Pair: default1BgFg,
- Accent2Pair: default2BgFg,
+ Name: "solarized-dark",
+ Solarized: solarized,
+ Accent1Pair: AccentPairGenerator{
+ BlendBackgroundAmout: default1BgFg.BlendBackgroundAmout,
+ BlendForegroundAmout: default1BgFg.BlendForegroundAmout,
+ Gamma: default1BgFg.Gamma,
+ ForegroundBlendFinder: colorlab.NamedColorFinder("base1"),
+ BackgroundBlendFinder: default1BgFg.BackgroundBlendFinder,
+ MinimumLightnessDifference: 0.42,
+ },
+ Accent2Pair: AccentPairGenerator{
+ BlendBackgroundAmout: default2BgFg.BlendBackgroundAmout,
+ BlendForegroundAmout: default2BgFg.BlendForegroundAmout,
+ Gamma: default2BgFg.Gamma,
+ ForegroundBlendFinder: colorlab.NamedColorFinder("base1"),
+ BackgroundBlendFinder: default2BgFg.BackgroundBlendFinder,
+ MinimumLightnessDifference: 0.42,
+ },
},
{
Name: "solarized-light",
@@ -80,10 +76,24 @@ var palettes = []Palette{
Accent2Pair: default2BgFg,
},
{
- Name: "solarized-dark-high-contrast",
- Solarized: solarizedDarkHighContrast,
- Accent1Pair: default1BgFg,
- Accent2Pair: default2BgFg,
+ Name: "solarized-dark-high-contrast",
+ Solarized: solarizedDarkHighContrast,
+ Accent1Pair: AccentPairGenerator{
+ BlendBackgroundAmout: default1BgFg.BlendBackgroundAmout,
+ BlendForegroundAmout: default1BgFg.BlendForegroundAmout,
+ Gamma: default1BgFg.Gamma,
+ ForegroundBlendFinder: colorlab.NamedColorFinder("base1"),
+ BackgroundBlendFinder: default1BgFg.BackgroundBlendFinder,
+ MinimumLightnessDifference: 0.42,
+ },
+ Accent2Pair: AccentPairGenerator{
+ BlendBackgroundAmout: default2BgFg.BlendBackgroundAmout,
+ BlendForegroundAmout: default2BgFg.BlendForegroundAmout,
+ Gamma: default2BgFg.Gamma,
+ ForegroundBlendFinder: colorlab.NamedColorFinder("base1"),
+ BackgroundBlendFinder: default2BgFg.BackgroundBlendFinder,
+ MinimumLightnessDifference: 0.42,
+ },
},
{
Name: "solarized-light-high-contrast",
@@ -121,18 +131,20 @@ var palettes = []Palette{
var (
default1BgFg = AccentPairGenerator{
- BlendBackgroundAmout: 0.85,
- BlendForegroundAmout: 0.3,
- Gamma: 0.01,
- ForegroundBlendFinder: colorlab.ExtremeColorFgFinder,
- BackgroundBlendFinder: colorlab.ExtremeColorBgFinder,
+ BlendBackgroundAmout: 0.85,
+ BlendForegroundAmout: 0.3,
+ Gamma: 0.01,
+ MinimumLightnessDifference: 0.35,
+ ForegroundBlendFinder: colorlab.ExtremeColorFgFinder,
+ BackgroundBlendFinder: colorlab.ExtremeColorBgFinder,
}
default2BgFg = AccentPairGenerator{
- BlendBackgroundAmout: 0.6,
- BlendForegroundAmout: 0.45,
- Gamma: 0.04,
- ForegroundBlendFinder: colorlab.ExtremeColorFgFinder,
- BackgroundBlendFinder: colorlab.ExtremeColorBgFinder,
+ BlendBackgroundAmout: 0.6,
+ BlendForegroundAmout: 0.45,
+ Gamma: 0.04,
+ MinimumLightnessDifference: 0.35,
+ ForegroundBlendFinder: colorlab.ExtremeColorFgFinder,
+ BackgroundBlendFinder: colorlab.ExtremeColorBgFinder,
}
)
@@ -174,9 +186,10 @@ func (p Palette) Generate() colorlab.NamedColors {
// AccentPairGenerator generates paris of background and foreground colors that are meant to be used in pairs.
type AccentPairGenerator struct {
- BlendBackgroundAmout float64
- BlendForegroundAmout float64
- Gamma float64
+ BlendBackgroundAmout float64
+ BlendForegroundAmout float64
+ Gamma float64
+ MinimumLightnessDifference float64
BackgroundBlendFinder colorlab.ColorFinder
ForegroundBlendFinder colorlab.ColorFinder
diff --git a/solarized-palettes.el b/solarized-palettes.el
@@ -45,51 +45,51 @@
(cyan . "#2aa198")
(green . "#859900")
(yellow-1bg . "#273632")
- (yellow-1fg . "#cca551")
- (yellow-2bg . "#4a4527")
- (yellow-2fg . "#cfad68")
+ (yellow-1fg . "#ad8d40")
+ (yellow-2bg . "#464123")
+ (yellow-2fg . "#ab9257")
(yellow-d . "#866300")
(yellow-l . "#e1af4b")
- (orange-1bg . "#2d3031")
- (orange-1fg . "#df7d50")
- (orange-2bg . "#553325")
- (orange-2fg . "#df8f66")
+ (orange-1bg . "#2d2f31")
+ (orange-1fg . "#c26842")
+ (orange-2bg . "#502f22")
+ (orange-2fg . "#bc7656")
(orange-d . "#992700")
(orange-l . "#fb7640")
- (red-1bg . "#302f33")
- (red-1fg . "#ec745f")
- (red-2bg . "#5b2e2c")
- (red-2fg . "#e98871")
+ (red-1bg . "#2f2e33")
+ (red-1fg . "#ce5e50")
+ (red-2bg . "#562a28")
+ (red-2fg . "#c66f61")
(red-d . "#a7020a")
(red-l . "#ff6849")
- (magenta-1bg . "#2a2f3e")
- (magenta-1fg . "#e1769b")
- (magenta-2bg . "#543049")
- (magenta-2fg . "#e08aa2")
+ (magenta-1bg . "#292f3e")
+ (magenta-1fg . "#c4608a")
+ (magenta-2bg . "#4f2c45")
+ (magenta-2fg . "#bc7190")
(magenta-d . "#a00559")
(magenta-l . "#ff699e")
(violet-1bg . "#0f3347")
- (violet-1fg . "#9994cb")
- (violet-2bg . "#233d61")
- (violet-2fg . "#a6a0c8")
+ (violet-1fg . "#797eb8")
+ (violet-2bg . "#1e395d")
+ (violet-2fg . "#8186b4")
(violet-d . "#243e9b")
(violet-l . "#8d85e7")
(blue-1bg . "#003649")
- (blue-1fg . "#7ca7d5")
- (blue-2bg . "#004666")
- (blue-2fg . "#92aecf")
+ (blue-1fg . "#578fc1")
+ (blue-2bg . "#004262")
+ (blue-2fg . "#6994bb")
(blue-d . "#0061a8")
(blue-l . "#74adf5")
(cyan-1bg . "#013941")
- (cyan-1fg . "#76b8ab")
- (cyan-2bg . "#004e52")
- (cyan-2fg . "#8cbcae")
+ (cyan-1fg . "#539f98")
+ (cyan-2bg . "#00494e")
+ (cyan-2fg . "#64a09b")
(cyan-d . "#007d76")
(cyan-l . "#6ccec0")
(green-1bg . "#1d3732")
- (green-1fg . "#a8b152")
- (green-2bg . "#374a27")
- (green-2fg . "#b2b769")
+ (green-1fg . "#8b9941")
+ (green-2bg . "#334624")
+ (green-2fg . "#8f9b58")
(green-d . "#5b7300")
(green-l . "#b3c34d")
;; palette end
@@ -185,51 +185,51 @@
(cyan . "#3cafa5")
(green . "#93a61a")
(yellow-1bg . "#273430")
- (yellow-1fg . "#d7b15d")
- (yellow-2bg . "#4d4729")
- (yellow-2fg . "#d8b974")
+ (yellow-1fg . "#bb9a4c")
+ (yellow-2bg . "#4c4527")
+ (yellow-2fg . "#b3995d")
(yellow-d . "#936d00")
(yellow-l . "#f3be51")
(orange-1bg . "#2d2e2f")
- (orange-1fg . "#eb895c")
- (orange-2bg . "#583427")
- (orange-2fg . "#e99a72")
+ (orange-1fg . "#ce724b")
+ (orange-2bg . "#563225")
+ (orange-2fg . "#c57d5d")
(orange-d . "#a72e01")
(orange-l . "#ff8148")
(red-1bg . "#2f2d32")
- (red-1fg . "#f8806a")
- (red-2bg . "#5e302e")
- (red-2fg . "#f4937c")
+ (red-1fg . "#da6859")
+ (red-2bg . "#5b2e2c")
+ (red-2fg . "#cf7668")
(red-d . "#ae1212")
(red-l . "#ff7254")
(magenta-1bg . "#2a2d3d")
- (magenta-1fg . "#ed82a8")
- (magenta-2bg . "#57324c")
- (magenta-2fg . "#e995ae")
+ (magenta-1fg . "#d06b95")
+ (magenta-2bg . "#542f49")
+ (magenta-2fg . "#c47897")
(magenta-d . "#a81761")
(magenta-l . "#ff75ab")
(violet-1bg . "#113145")
- (violet-1fg . "#a2a0d8")
- (violet-2bg . "#273f63")
- (violet-2fg . "#aeabd4")
+ (violet-1fg . "#8589c4")
+ (violet-2bg . "#253d61")
+ (violet-2fg . "#888ebc")
(violet-d . "#3548a2")
(violet-l . "#9b94f2")
(blue-1bg . "#023447")
- (blue-1fg . "#85b3e2")
- (blue-2bg . "#014868")
- (blue-2fg . "#99badc")
+ (blue-1fg . "#649bce")
+ (blue-2bg . "#004666")
+ (blue-2fg . "#709bc3")
(blue-d . "#0069b0")
(blue-l . "#7ebaff")
(cyan-1bg . "#03373f")
- (cyan-1fg . "#7fc4b8")
- (cyan-2bg . "#055054")
- (cyan-2fg . "#93c8ba")
+ (cyan-1fg . "#60aca4")
+ (cyan-2bg . "#024e52")
+ (cyan-2fg . "#6ba7a1")
(cyan-d . "#008981")
(cyan-l . "#77dece")
(green-1bg . "#1e3531")
- (green-1fg . "#b3bd5f")
- (green-2bg . "#3a4c29")
- (green-2fg . "#bbc275")
+ (green-1fg . "#97a54d")
+ (green-2bg . "#384b28")
+ (green-2fg . "#96a25e")
(green-d . "#687f00")
(green-l . "#c3d255")
;; palette end
