From 225139cb00c0910c775893d533b35748441b15c7 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 10:34:29 +0400 Subject: [PATCH 01/45] Added new dark_horizon file with gruvbox colors for testing --- lua/base46/themes/dark_horizon.lua | 66 ++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 lua/base46/themes/dark_horizon.lua diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua new file mode 100644 index 0000000..8005e31 --- /dev/null +++ b/lua/base46/themes/dark_horizon.lua @@ -0,0 +1,66 @@ +local M = {} + +M.base_30 = { + white = "#ebdbb2", + darker_black = "#222222", + black = "#282828", -- nvim bg + black2 = "#2e2e2e", + one_bg = "#323232", + one_bg2 = "#3b3b3b", + one_bg3 = "#434343", + grey = "#505050", + grey_fg = "#5a5a5a", + grey_fg2 = "#646464", + light_grey = "#6c6c6c", + red = "#ea6962", + baby_pink = "#ce8196", + pink = "#ff75a0", + line = "#373737", -- for lines like vertsplit + green = "#89b482", + vibrant_green = "#a9b665", + nord_blue = "#6f8faf", + blue = "#6d8dad", + yellow = "#d8a657", + sun = "#eab869", + purple = "#d3869b", + dark_purple = "#d3869b", + teal = "#749689", + orange = "#e78a4e", + cyan = "#89b482", + statusline_bg = "#2c2c2c", + lightbg = "#393939", + pmenu_bg = "#89b482", + folder_bg = "#6d8dad", +} + +M.base_16 = { + base0A = "#d8a657", + base04 = "#d4be98", + base07 = "#c7b89d", + base05 = "#c0b196", + base0E = "#ea6962", + base0D = "#a9b665", + base0C = "#89b482", + base0B = "#89b482", + base02 = "#323232", + base0F = "#dd8044", + base03 = "#434343", + base08 = "#7daea3", + base01 = "#2e2e2e", + base00 = "#282828", + base09 = "#e78a4e", + base06 = "#d4be98", +} + +M.polish_hl = { + Include = { fg = M.base_16.base0E }, + TSVariable = { fg = M.base_16.base08 }, + TSProperty = { fg = M.base_16.base0C }, + Repeat = { fg = M.base_16.base0E }, +} + +vim.opt.bg = "dark" + +M = require("base46").override_theme(M, "gruvbox_material") + +return M From 426e79bf5b862d746286250a75477ffb8ccaece1 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 10:42:55 +0400 Subject: [PATCH 02/45] Removed some typos within first commit --- lua/base46/themes/dark_horizon.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index 8005e31..83f8f8f 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -61,6 +61,6 @@ M.polish_hl = { vim.opt.bg = "dark" -M = require("base46").override_theme(M, "gruvbox_material") +M = require("base46").override_theme(M, "dark_horizon") return M From b306573362385ae7e237e1c23948bc2ac99b202f Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 11:07:51 +0400 Subject: [PATCH 03/45] Changed some colors for base 16 --- lua/base46/themes/dark_horizon.lua | 38 +++++++++++++++++------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index 83f8f8f..869263a 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -34,22 +34,22 @@ M.base_30 = { } M.base_16 = { - base0A = "#d8a657", - base04 = "#d4be98", - base07 = "#c7b89d", - base05 = "#c0b196", - base0E = "#ea6962", - base0D = "#a9b665", - base0C = "#89b482", - base0B = "#89b482", - base02 = "#323232", - base0F = "#dd8044", - base03 = "#434343", - base08 = "#7daea3", - base01 = "#2e2e2e", - base00 = "#282828", - base09 = "#e78a4e", - base06 = "#d4be98", + base00 = "#0B0E14", + base01 = "#1c1f25", + base02 = "#24272d", + base03 = "#2b2e34", + base04 = "#33363c", + base05 = "#93a1a1", + base06 = "#eee8d5", + base07 = "#fdf6e3", + base08 = "#dc322f", + base09 = "#cb4b16", + base0A = "#b58900", + base0B = "#859900", + base0C = "#2aa198", + base0D = "#268bd2", + base0E = "#6c71c4", + base0F = "#d33682", } M.polish_hl = { @@ -57,6 +57,12 @@ M.polish_hl = { TSVariable = { fg = M.base_16.base08 }, TSProperty = { fg = M.base_16.base0C }, Repeat = { fg = M.base_16.base0E }, + TSTagDelimiter = { fg = M.base_30.cyan }, + TSFunction = { fg = M.base_30.orange }, + luaTSField = { fg = M.base_16.base0D }, + TSParameter = { fg = M.base_16.base0F }, + TSConstructor = { fg = M.base_16.base0A }, + TSTagAttribute = { fg = M.base_30.orange }, } vim.opt.bg = "dark" From 41c11631be256c25d72b984b2d92cf3032e0b6da Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 11:13:01 +0400 Subject: [PATCH 04/45] Changed background color to darker black --- lua/base46/themes/dark_horizon.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index 869263a..a776a29 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -34,7 +34,7 @@ M.base_30 = { } M.base_16 = { - base00 = "#0B0E14", + base00 = "#151515", base01 = "#1c1f25", base02 = "#24272d", base03 = "#2b2e34", From 350a06e782e7582d4da18dcc32a12b2f84721e65 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 11:36:54 +0400 Subject: [PATCH 05/45] First completion for base16 --- lua/base46/themes/dark_horizon.lua | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index a776a29..3868edb 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -39,16 +39,16 @@ M.base_16 = { base02 = "#24272d", base03 = "#2b2e34", base04 = "#33363c", - base05 = "#93a1a1", - base06 = "#eee8d5", - base07 = "#fdf6e3", - base08 = "#dc322f", - base09 = "#cb4b16", - base0A = "#b58900", - base0B = "#859900", - base0C = "#2aa198", - base0D = "#268bd2", - base0E = "#6c71c4", + base05 = "#c9c7be", + base06 = "#E6E1CF", + base07 = "#D9D7CE", + base08 = "#b13b5f", + base09 = "#a17643", + base0A = "#E0AAFF", + base0B = "#F09483", + base0C = "#25B0BC", + base0D = "#FDB849", + base0E = "#F09483", base0F = "#d33682", } From 8648fa572e8a6e47c82562f3e8c4e3a33a17d175 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 11:41:36 +0400 Subject: [PATCH 06/45] Adjusted color for variable names --- lua/base46/themes/dark_horizon.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index 3868edb..99bf62b 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -42,7 +42,7 @@ M.base_16 = { base05 = "#c9c7be", base06 = "#E6E1CF", base07 = "#D9D7CE", - base08 = "#b13b5f", + base08 = "#E95678", base09 = "#a17643", base0A = "#E0AAFF", base0B = "#F09483", From 68658a927a7a7f36d0ac01396c618131564ae8cf Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 11:45:07 +0400 Subject: [PATCH 07/45] 2nd change to variable colors --- lua/base46/themes/dark_horizon.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index 99bf62b..7faf063 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -42,7 +42,7 @@ M.base_16 = { base05 = "#c9c7be", base06 = "#E6E1CF", base07 = "#D9D7CE", - base08 = "#E95678", + base08 = "#e45173", base09 = "#a17643", base0A = "#E0AAFF", base0B = "#F09483", From 0906d4f956fbfb1207963d73f1089ad24d8f5189 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 12:01:57 +0400 Subject: [PATCH 08/45] 3rd change to variable colors --- lua/base46/themes/dark_horizon.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index 7faf063..a7c7ce5 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -42,7 +42,7 @@ M.base_16 = { base05 = "#c9c7be", base06 = "#E6E1CF", base07 = "#D9D7CE", - base08 = "#e45173", + base08 = "#d34f4e", base09 = "#a17643", base0A = "#E0AAFF", base0B = "#F09483", From dee3709ec34b437c7f047634248751be77a300a9 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 12:07:07 +0400 Subject: [PATCH 09/45] 4th change to variable colors --- lua/base46/themes/dark_horizon.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index a7c7ce5..1d8d10c 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -42,7 +42,7 @@ M.base_16 = { base05 = "#c9c7be", base06 = "#E6E1CF", base07 = "#D9D7CE", - base08 = "#d34f4e", + base08 = "#a72e5b", base09 = "#a17643", base0A = "#E0AAFF", base0B = "#F09483", From 53be25c8ee1743644a8821516b534ce12894c6f6 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 12:09:50 +0400 Subject: [PATCH 10/45] Change to base 0B --- lua/base46/themes/dark_horizon.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index 1d8d10c..ddbc91f 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -45,7 +45,7 @@ M.base_16 = { base08 = "#a72e5b", base09 = "#a17643", base0A = "#E0AAFF", - base0B = "#F09483", + base0B = "#eaa98b", base0C = "#25B0BC", base0D = "#FDB849", base0E = "#F09483", From 3d87363b53365baca80875971986b3728ddfdef3 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 12:17:52 +0400 Subject: [PATCH 11/45] Swapped colors between escape characters and keywords --- lua/base46/themes/dark_horizon.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index ddbc91f..08d269c 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -42,14 +42,14 @@ M.base_16 = { base05 = "#c9c7be", base06 = "#E6E1CF", base07 = "#D9D7CE", - base08 = "#a72e5b", - base09 = "#a17643", - base0A = "#E0AAFF", - base0B = "#eaa98b", - base0C = "#25B0BC", - base0D = "#FDB849", - base0E = "#F09483", - base0F = "#d33682", + base08 = "#a72e5b", -- Variables + base09 = "#a17643", -- Integers, Booleans + base0A = "#E0AAFF", -- Classes + base0B = "#eaa98b", -- Strings + base0C = "#F09483", -- Escape characters, Regular expressions + base0D = "#FDB849", -- Functions, Methods + base0E = "#25B0BC", -- Keywords, Storage, Selector, Markup + base0F = "#d33682", -- Deprecated, Opening/Closing embedded language tags } M.polish_hl = { From 516d9095901e4fa8789604a43a32022c4ca4e3b4 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 18:57:24 +0400 Subject: [PATCH 12/45] Changed colors in base30 from white to line --- lua/base46/themes/dark_horizon.lua | 37 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index 08d269c..ffb897a 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -1,21 +1,22 @@ local M = {} M.base_30 = { - white = "#ebdbb2", - darker_black = "#222222", - black = "#282828", -- nvim bg - black2 = "#2e2e2e", - one_bg = "#323232", - one_bg2 = "#3b3b3b", - one_bg3 = "#434343", - grey = "#505050", - grey_fg = "#5a5a5a", - grey_fg2 = "#646464", - light_grey = "#6c6c6c", - red = "#ea6962", - baby_pink = "#ce8196", + white = "#dcac8b", + darker_black = "#080808", + black = "#0e0e0e", -- nvim bg + black2 = "#141414", + one_bg = "#181818", + one_bg2 = "#212121", + one_bg3 = "#292929", + grey = "#363636", + grey_fg = "#404040", + grey_fg2 = "#4a4a4a", + light_grey = "#525252", + -- red = "#ea6962", + red = "#dc322f", + baby_pink = "#a72e5b", pink = "#ff75a0", - line = "#373737", -- for lines like vertsplit + line = "#1d1d1d", -- for lines like vertsplit green = "#89b482", vibrant_green = "#a9b665", nord_blue = "#6f8faf", @@ -42,13 +43,13 @@ M.base_16 = { base05 = "#c9c7be", base06 = "#E6E1CF", base07 = "#D9D7CE", - base08 = "#a72e5b", -- Variables - base09 = "#a17643", -- Integers, Booleans + base08 = "#a72e5b", -- Confirmed: Variables Confirmed + base09 = "#a17643", -- Confirmed: Integers, Booleans base0A = "#E0AAFF", -- Classes - base0B = "#eaa98b", -- Strings + base0B = "#eaa98b", -- Confirmed: Strings base0C = "#F09483", -- Escape characters, Regular expressions base0D = "#FDB849", -- Functions, Methods - base0E = "#25B0BC", -- Keywords, Storage, Selector, Markup + base0E = "#25B0BC", -- Confirmed: Keywords, Storage, Selector, Markup base0F = "#d33682", -- Deprecated, Opening/Closing embedded language tags } From ff35cd9d8dc5db4abccc6bb334f016bc0bfc2dfe Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 19:00:00 +0400 Subject: [PATCH 13/45] Changed color of white --- lua/base46/themes/dark_horizon.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index ffb897a..d1570a7 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -1,7 +1,8 @@ local M = {} M.base_30 = { - white = "#dcac8b", + -- white = "#dcac8b", + white = "#1d1d1d", darker_black = "#080808", black = "#0e0e0e", -- nvim bg black2 = "#141414", From 27a0c18b650fddb8fabf2d2a54c75c91d94e61bc Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 19:01:38 +0400 Subject: [PATCH 14/45] Adjusted white color to add contrast --- lua/base46/themes/dark_horizon.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index d1570a7..dac3d9e 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -2,7 +2,7 @@ local M = {} M.base_30 = { -- white = "#dcac8b", - white = "#1d1d1d", + white = "#4a4a4a", darker_black = "#080808", black = "#0e0e0e", -- nvim bg black2 = "#141414", From 4be4c4745a9f68b905abf3831c8fcda7bfba144c Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 19:04:43 +0400 Subject: [PATCH 15/45] Changed color of Integers and booleans to lighter salmon --- lua/base46/themes/dark_horizon.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index dac3d9e..d99f0f5 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -45,7 +45,8 @@ M.base_16 = { base06 = "#E6E1CF", base07 = "#D9D7CE", base08 = "#a72e5b", -- Confirmed: Variables Confirmed - base09 = "#a17643", -- Confirmed: Integers, Booleans + -- base09 = "#a17643", -- Confirmed: Integers, Booleans + base09 = "#eaac83", -- Confirmed: Integers, Booleans base0A = "#E0AAFF", -- Classes base0B = "#eaa98b", -- Confirmed: Strings base0C = "#F09483", -- Escape characters, Regular expressions From d07fc206f661f914e309c25ae817121ec4075a83 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 19:10:39 +0400 Subject: [PATCH 16/45] Changed status_line bg and light bg --- lua/base46/themes/dark_horizon.lua | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index d99f0f5..c11c414 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -20,17 +20,17 @@ M.base_30 = { line = "#1d1d1d", -- for lines like vertsplit green = "#89b482", vibrant_green = "#a9b665", - nord_blue = "#6f8faf", - blue = "#6d8dad", - yellow = "#d8a657", - sun = "#eab869", + nord_blue = "#18a3af", + blue = "#25B0BC", + yellow = "#fdb830", + sun = "#ffc038", purple = "#d3869b", dark_purple = "#d3869b", teal = "#749689", orange = "#e78a4e", cyan = "#89b482", - statusline_bg = "#2c2c2c", - lightbg = "#393939", + statusline_bg = "#121212", + lightbg = "#1f1f1f", pmenu_bg = "#89b482", folder_bg = "#6d8dad", } @@ -46,7 +46,7 @@ M.base_16 = { base07 = "#D9D7CE", base08 = "#a72e5b", -- Confirmed: Variables Confirmed -- base09 = "#a17643", -- Confirmed: Integers, Booleans - base09 = "#eaac83", -- Confirmed: Integers, Booleans + base09 = "#eaa273", -- Confirmed: Integers, Booleans base0A = "#E0AAFF", -- Classes base0B = "#eaa98b", -- Confirmed: Strings base0C = "#F09483", -- Escape characters, Regular expressions From 1912ea1fcfeb8841a5ccfc24fe1c81666150d535 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 19:15:42 +0400 Subject: [PATCH 17/45] Changed purple colors --- lua/base46/themes/dark_horizon.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index c11c414..63b94b4 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -24,8 +24,8 @@ M.base_30 = { blue = "#25B0BC", yellow = "#fdb830", sun = "#ffc038", - purple = "#d3869b", - dark_purple = "#d3869b", + purple = "#7f6698", + dark_purple = "#72598b", teal = "#749689", orange = "#e78a4e", cyan = "#89b482", From 1241ca86fde425d9b22b20f672b4a9f1a4de5cc2 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 19:18:34 +0400 Subject: [PATCH 18/45] Updated purple colors --- lua/base46/themes/dark_horizon.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index 63b94b4..cb8f9e6 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -24,8 +24,8 @@ M.base_30 = { blue = "#25B0BC", yellow = "#fdb830", sun = "#ffc038", - purple = "#7f6698", - dark_purple = "#72598b", + purple = "#da70d6", + dark_purple = "#c65cc2", teal = "#749689", orange = "#e78a4e", cyan = "#89b482", From c742727cdf8947580a6268b0ee7a929d9ca36242 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 19:35:29 +0400 Subject: [PATCH 19/45] Corrected green, pmenu and folder bg colors --- lua/base46/themes/dark_horizon.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index cb8f9e6..5f3b3e9 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -18,7 +18,7 @@ M.base_30 = { baby_pink = "#a72e5b", pink = "#ff75a0", line = "#1d1d1d", -- for lines like vertsplit - green = "#89b482", + green = "#29D398", vibrant_green = "#a9b665", nord_blue = "#18a3af", blue = "#25B0BC", @@ -28,11 +28,11 @@ M.base_30 = { dark_purple = "#c65cc2", teal = "#749689", orange = "#e78a4e", - cyan = "#89b482", + cyan = "#6BE4E6", statusline_bg = "#121212", lightbg = "#1f1f1f", - pmenu_bg = "#89b482", - folder_bg = "#6d8dad", + pmenu_bg = "#15bf84", + folder_bg = "#07929e", } M.base_16 = { From 0d76d5a5b313b6a9f113345892044de2205fd205 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 19:39:26 +0400 Subject: [PATCH 20/45] Changed classes color --- lua/base46/themes/dark_horizon.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index 5f3b3e9..3499649 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -47,7 +47,7 @@ M.base_16 = { base08 = "#a72e5b", -- Confirmed: Variables Confirmed -- base09 = "#a17643", -- Confirmed: Integers, Booleans base09 = "#eaa273", -- Confirmed: Integers, Booleans - base0A = "#E0AAFF", -- Classes + base0A = "#4a22e6", -- Classes base0B = "#eaa98b", -- Confirmed: Strings base0C = "#F09483", -- Escape characters, Regular expressions base0D = "#FDB849", -- Functions, Methods From 7a0668f26837dc615827840cc887d66253a5d281 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 19:40:50 +0400 Subject: [PATCH 21/45] Changed class color to lighter purple --- lua/base46/themes/dark_horizon.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index 3499649..0c90fa7 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -47,7 +47,7 @@ M.base_16 = { base08 = "#a72e5b", -- Confirmed: Variables Confirmed -- base09 = "#a17643", -- Confirmed: Integers, Booleans base09 = "#eaa273", -- Confirmed: Integers, Booleans - base0A = "#4a22e6", -- Classes + base0A = "#542cf0", -- Classes base0B = "#eaa98b", -- Confirmed: Strings base0C = "#F09483", -- Escape characters, Regular expressions base0D = "#FDB849", -- Functions, Methods From f13513b52ae357f2d4e51bfda0b901cc58a18721 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 19:43:35 +0400 Subject: [PATCH 22/45] Lightened purple color by 30 % --- lua/base46/themes/dark_horizon.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index 0c90fa7..1e2ce19 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -47,7 +47,7 @@ M.base_16 = { base08 = "#a72e5b", -- Confirmed: Variables Confirmed -- base09 = "#a17643", -- Confirmed: Integers, Booleans base09 = "#eaa273", -- Confirmed: Integers, Booleans - base0A = "#542cf0", -- Classes + base0A = "#6840ff", -- Classes base0B = "#eaa98b", -- Confirmed: Strings base0C = "#F09483", -- Escape characters, Regular expressions base0D = "#FDB849", -- Functions, Methods From 8168383efba5716c0804280623cff91553641b0e Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 19:46:08 +0400 Subject: [PATCH 23/45] Darkened green color by 20% --- lua/base46/themes/dark_horizon.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index 1e2ce19..fc03c0c 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -18,7 +18,7 @@ M.base_30 = { baby_pink = "#a72e5b", pink = "#ff75a0", line = "#1d1d1d", -- for lines like vertsplit - green = "#29D398", + green = "#15bf75", vibrant_green = "#a9b665", nord_blue = "#18a3af", blue = "#25B0BC", From 5e9acd3b0e9fecb86e01bf597f751bff074ec737 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 19:50:10 +0400 Subject: [PATCH 24/45] Changed color of strings to lighter color by 50% --- lua/base46/themes/dark_horizon.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index fc03c0c..f19da31 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -48,7 +48,7 @@ M.base_16 = { -- base09 = "#a17643", -- Confirmed: Integers, Booleans base09 = "#eaa273", -- Confirmed: Integers, Booleans base0A = "#6840ff", -- Classes - base0B = "#eaa98b", -- Confirmed: Strings + base0B = "#ffdbbd", -- Confirmed: Strings base0C = "#F09483", -- Escape characters, Regular expressions base0D = "#FDB849", -- Functions, Methods base0E = "#25B0BC", -- Confirmed: Keywords, Storage, Selector, Markup From 462abbcdbf1ec4d32d250f5115bb32897cbf5b65 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 19:52:34 +0400 Subject: [PATCH 25/45] Attempted to change some variable colors --- lua/base46/themes/dark_horizon.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index f19da31..c2c4ab0 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -49,7 +49,8 @@ M.base_16 = { base09 = "#eaa273", -- Confirmed: Integers, Booleans base0A = "#6840ff", -- Classes base0B = "#ffdbbd", -- Confirmed: Strings - base0C = "#F09483", -- Escape characters, Regular expressions + -- base0C = "#F09483", -- Escape characters, Regular expressions + base0C = "#D9D7CE", -- Escape characters, Regular expressions base0D = "#FDB849", -- Functions, Methods base0E = "#25B0BC", -- Confirmed: Keywords, Storage, Selector, Markup base0F = "#d33682", -- Deprecated, Opening/Closing embedded language tags From 4ad74f8f5a91b94fb4a5a1e73af6cccb25620088 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 19:53:52 +0400 Subject: [PATCH 26/45] Changed base0F --- lua/base46/themes/dark_horizon.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index c2c4ab0..629c922 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -49,11 +49,12 @@ M.base_16 = { base09 = "#eaa273", -- Confirmed: Integers, Booleans base0A = "#6840ff", -- Classes base0B = "#ffdbbd", -- Confirmed: Strings - -- base0C = "#F09483", -- Escape characters, Regular expressions - base0C = "#D9D7CE", -- Escape characters, Regular expressions + base0C = "#F09483", -- Escape characters, Regular expressions + -- base0C = "#D9D7CE", -- Escape characters, Regular expressions base0D = "#FDB849", -- Functions, Methods base0E = "#25B0BC", -- Confirmed: Keywords, Storage, Selector, Markup - base0F = "#d33682", -- Deprecated, Opening/Closing embedded language tags + -- base0F = "#d33682", -- Deprecated, Opening/Closing embedded language tags + base0F = "#D9D7CE", -- Deprecated, Opening/Closing embedded language tags } M.polish_hl = { From 113c182296fc74b60fd0c3d5a5cf14945e1a8ced Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 19:56:22 +0400 Subject: [PATCH 27/45] Swapped colors between base0F and base08 --- lua/base46/themes/dark_horizon.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index 629c922..86411ad 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -44,7 +44,8 @@ M.base_16 = { base05 = "#c9c7be", base06 = "#E6E1CF", base07 = "#D9D7CE", - base08 = "#a72e5b", -- Confirmed: Variables Confirmed + -- base08 = "#a72e5b", -- Confirmed: Variables Confirmed + base08 = "#D9D7CE", -- Confirmed: Variables Confirmed -- base09 = "#a17643", -- Confirmed: Integers, Booleans base09 = "#eaa273", -- Confirmed: Integers, Booleans base0A = "#6840ff", -- Classes @@ -54,7 +55,7 @@ M.base_16 = { base0D = "#FDB849", -- Functions, Methods base0E = "#25B0BC", -- Confirmed: Keywords, Storage, Selector, Markup -- base0F = "#d33682", -- Deprecated, Opening/Closing embedded language tags - base0F = "#D9D7CE", -- Deprecated, Opening/Closing embedded language tags + base0F = "#a72e5b", -- Deprecated, Opening/Closing embedded language tags } M.polish_hl = { From 514a62ad41196423f4788905fc668cfaed6f95ff Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 20:01:05 +0400 Subject: [PATCH 28/45] Changed color of Base0D --- lua/base46/themes/dark_horizon.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index 86411ad..9f01ecd 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -52,7 +52,7 @@ M.base_16 = { base0B = "#ffdbbd", -- Confirmed: Strings base0C = "#F09483", -- Escape characters, Regular expressions -- base0C = "#D9D7CE", -- Escape characters, Regular expressions - base0D = "#FDB849", -- Functions, Methods + base0D = "#ffd667", -- Functions, Methods base0E = "#25B0BC", -- Confirmed: Keywords, Storage, Selector, Markup -- base0F = "#d33682", -- Deprecated, Opening/Closing embedded language tags base0F = "#a72e5b", -- Deprecated, Opening/Closing embedded language tags From 638f13a17c1e21dfca1300c281dcf4be9a6258b7 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 20:02:58 +0400 Subject: [PATCH 29/45] Darkened color of base0D --- lua/base46/themes/dark_horizon.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index 9f01ecd..47f7187 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -52,7 +52,7 @@ M.base_16 = { base0B = "#ffdbbd", -- Confirmed: Strings base0C = "#F09483", -- Escape characters, Regular expressions -- base0C = "#D9D7CE", -- Escape characters, Regular expressions - base0D = "#ffd667", -- Functions, Methods + base0D = "#ffcc5d", -- Functions, Methods base0E = "#25B0BC", -- Confirmed: Keywords, Storage, Selector, Markup -- base0F = "#d33682", -- Deprecated, Opening/Closing embedded language tags base0F = "#a72e5b", -- Deprecated, Opening/Closing embedded language tags From 78fc0b587185475a2576769ff07bda361e2efb0e Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 20:07:46 +0400 Subject: [PATCH 30/45] Tweaked color for methods --- lua/base46/themes/dark_horizon.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index 47f7187..0141810 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -52,7 +52,7 @@ M.base_16 = { base0B = "#ffdbbd", -- Confirmed: Strings base0C = "#F09483", -- Escape characters, Regular expressions -- base0C = "#D9D7CE", -- Escape characters, Regular expressions - base0D = "#ffcc5d", -- Functions, Methods + base0D = "#ffc455", -- Functions, Methods base0E = "#25B0BC", -- Confirmed: Keywords, Storage, Selector, Markup -- base0F = "#d33682", -- Deprecated, Opening/Closing embedded language tags base0F = "#a72e5b", -- Deprecated, Opening/Closing embedded language tags From 45406690d044a963f403c26cc4565d30ef617657 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 20:13:55 +0400 Subject: [PATCH 31/45] Changed color for functions --- lua/base46/themes/dark_horizon.lua | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index 0141810..e41f9cf 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -1,7 +1,6 @@ local M = {} M.base_30 = { - -- white = "#dcac8b", white = "#4a4a4a", darker_black = "#080808", black = "#0e0e0e", -- nvim bg @@ -13,7 +12,6 @@ M.base_30 = { grey_fg = "#404040", grey_fg2 = "#4a4a4a", light_grey = "#525252", - -- red = "#ea6962", red = "#dc322f", baby_pink = "#a72e5b", pink = "#ff75a0", @@ -44,17 +42,13 @@ M.base_16 = { base05 = "#c9c7be", base06 = "#E6E1CF", base07 = "#D9D7CE", - -- base08 = "#a72e5b", -- Confirmed: Variables Confirmed base08 = "#D9D7CE", -- Confirmed: Variables Confirmed - -- base09 = "#a17643", -- Confirmed: Integers, Booleans base09 = "#eaa273", -- Confirmed: Integers, Booleans base0A = "#6840ff", -- Classes base0B = "#ffdbbd", -- Confirmed: Strings base0C = "#F09483", -- Escape characters, Regular expressions - -- base0C = "#D9D7CE", -- Escape characters, Regular expressions - base0D = "#ffc455", -- Functions, Methods + base0D = "#fdb830", -- Functions, Methods base0E = "#25B0BC", -- Confirmed: Keywords, Storage, Selector, Markup - -- base0F = "#d33682", -- Deprecated, Opening/Closing embedded language tags base0F = "#a72e5b", -- Deprecated, Opening/Closing embedded language tags } From d9ec7e58839eb8ad9c7fc4ce562d3b69becb6fe5 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Wed, 5 Oct 2022 20:37:07 +0400 Subject: [PATCH 32/45] Darkened color of strings --- lua/base46/themes/dark_horizon.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index e41f9cf..4b80355 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -45,7 +45,7 @@ M.base_16 = { base08 = "#D9D7CE", -- Confirmed: Variables Confirmed base09 = "#eaa273", -- Confirmed: Integers, Booleans base0A = "#6840ff", -- Classes - base0B = "#ffdbbd", -- Confirmed: Strings + base0B = "#ebc7a9", -- Confirmed: Strings base0C = "#F09483", -- Escape characters, Regular expressions base0D = "#fdb830", -- Functions, Methods base0E = "#25B0BC", -- Confirmed: Keywords, Storage, Selector, Markup From 10e0dad4a2342b7d0ba7a1df393aaf9006d1d2d0 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Thu, 6 Oct 2022 11:47:00 +0400 Subject: [PATCH 33/45] Lightened white color to improve contrast --- lua/base46/themes/dark_horizon.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index 4b80355..94efa92 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -1,7 +1,7 @@ local M = {} M.base_30 = { - white = "#4a4a4a", + white = "#5e5e5e", darker_black = "#080808", black = "#0e0e0e", -- nvim bg black2 = "#141414", From 2af7fa075306b96cd3e55a5f4408e53894fdd144 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Thu, 6 Oct 2022 11:49:19 +0400 Subject: [PATCH 34/45] Lightened white color by 50% --- lua/base46/themes/dark_horizon.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index 94efa92..7440170 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -1,7 +1,7 @@ local M = {} M.base_30 = { - white = "#5e5e5e", + white = "#7c7c7c", darker_black = "#080808", black = "#0e0e0e", -- nvim bg black2 = "#141414", From d93257a1593a3944cf452a0474f1e9404f65b515 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Thu, 6 Oct 2022 11:50:40 +0400 Subject: [PATCH 35/45] Lightened white by 45% --- lua/base46/themes/dark_horizon.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index 7440170..ae1ac07 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -1,7 +1,7 @@ local M = {} M.base_30 = { - white = "#7c7c7c", + white = "#959595", darker_black = "#080808", black = "#0e0e0e", -- nvim bg black2 = "#141414", From 5ae4917869200aca6e6cd4d5bb1f92e53c494b56 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Thu, 6 Oct 2022 11:52:12 +0400 Subject: [PATCH 36/45] Improve contrast for highlighting --- lua/base46/themes/dark_horizon.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index ae1ac07..104716e 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -1,7 +1,7 @@ local M = {} M.base_30 = { - white = "#959595", + white = "#aeaeae", darker_black = "#080808", black = "#0e0e0e", -- nvim bg black2 = "#141414", From 323a35280331df780b45a8d49a0d60ed34caf5dd Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Thu, 6 Oct 2022 11:53:51 +0400 Subject: [PATCH 37/45] Tried changing color to complete white --- lua/base46/themes/dark_horizon.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index 104716e..d87b439 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -1,7 +1,7 @@ local M = {} M.base_30 = { - white = "#aeaeae", + white = "#FFFFFF", darker_black = "#080808", black = "#0e0e0e", -- nvim bg black2 = "#141414", From ba59ee7e4c1fb840234eb5d54623565f094587b7 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Thu, 6 Oct 2022 11:58:43 +0400 Subject: [PATCH 38/45] Changed base03 to white for better contrast when highlighting lines --- lua/base46/themes/dark_horizon.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index d87b439..df9e28e 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -37,7 +37,8 @@ M.base_16 = { base00 = "#151515", base01 = "#1c1f25", base02 = "#24272d", - base03 = "#2b2e34", + base03 = "#FFFFFF", + -- base03 = "#2b2e34", base04 = "#33363c", base05 = "#c9c7be", base06 = "#E6E1CF", From 973c456f214854168efa1d1be37c154dac9e524e Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Thu, 6 Oct 2022 12:00:07 +0400 Subject: [PATCH 39/45] Changed base02 to lighter color for better contrast --- lua/base46/themes/dark_horizon.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index df9e28e..5fc51a5 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -36,9 +36,10 @@ M.base_30 = { M.base_16 = { base00 = "#151515", base01 = "#1c1f25", - base02 = "#24272d", - base03 = "#FFFFFF", - -- base03 = "#2b2e34", + -- base02 = "#24272d", + base02 = "#FFFFFF", + -- base03 = "#FFFFFF", + base03 = "#2b2e34", base04 = "#33363c", base05 = "#c9c7be", base06 = "#E6E1CF", From 6126f9a33d341d8f9d7df8fe86463255e12f3d15 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Thu, 6 Oct 2022 12:03:18 +0400 Subject: [PATCH 40/45] Darkened base02 and lightened base03 --- lua/base46/themes/dark_horizon.lua | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index 5fc51a5..ca3af08 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -36,10 +36,8 @@ M.base_30 = { M.base_16 = { base00 = "#151515", base01 = "#1c1f25", - -- base02 = "#24272d", - base02 = "#FFFFFF", - -- base03 = "#FFFFFF", - base03 = "#2b2e34", + base02 = "#c3c3c3", + base03 = "#3f4248", base04 = "#33363c", base05 = "#c9c7be", base06 = "#E6E1CF", From a46d71c753239fd4e8ae28ec06738c56bca1817f Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Thu, 6 Oct 2022 12:05:41 +0400 Subject: [PATCH 41/45] Darkened color of base02 --- lua/base46/themes/dark_horizon.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index ca3af08..831eb9b 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -36,7 +36,7 @@ M.base_30 = { M.base_16 = { base00 = "#151515", base01 = "#1c1f25", - base02 = "#c3c3c3", + base02 = "#474a50", base03 = "#3f4248", base04 = "#33363c", base05 = "#c9c7be", From 351171ea9a433ac670747e6531f63702a20b47c4 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Thu, 6 Oct 2022 12:12:46 +0400 Subject: [PATCH 42/45] Change green color to more vibrant green --- lua/base46/themes/dark_horizon.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index 831eb9b..4d3b0fb 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -16,8 +16,10 @@ M.base_30 = { baby_pink = "#a72e5b", pink = "#ff75a0", line = "#1d1d1d", -- for lines like vertsplit - green = "#15bf75", - vibrant_green = "#a9b665", + -- green = "#15bf75", + green = "#AAD84C", + -- vibrant_green = "#a9b665", + vibrant_green = "#b9e75b", nord_blue = "#18a3af", blue = "#25B0BC", yellow = "#fdb830", From 87f041b518e126b52d2c6545bb9f1e4b6af545f8 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Thu, 6 Oct 2022 12:19:34 +0400 Subject: [PATCH 43/45] Changed function color to brighter orange --- lua/base46/themes/dark_horizon.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index 4d3b0fb..ea7e48d 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -49,7 +49,8 @@ M.base_16 = { base0A = "#6840ff", -- Classes base0B = "#ebc7a9", -- Confirmed: Strings base0C = "#F09483", -- Escape characters, Regular expressions - base0D = "#fdb830", -- Functions, Methods + -- base0D = "#fdb830", -- Functions, Methods + base0D = "#FFA500", -- Functions, Methods base0E = "#25B0BC", -- Confirmed: Keywords, Storage, Selector, Markup base0F = "#a72e5b", -- Deprecated, Opening/Closing embedded language tags } From a3cbc646bb7bd0e08cd236b4618f70c03248b4c6 Mon Sep 17 00:00:00 2001 From: derek_lee <20820343@student.curtin.edu.au> Date: Thu, 6 Oct 2022 12:23:47 +0400 Subject: [PATCH 44/45] Cleanup code --- lua/base46/themes/dark_horizon.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index ea7e48d..7e614e2 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -16,9 +16,7 @@ M.base_30 = { baby_pink = "#a72e5b", pink = "#ff75a0", line = "#1d1d1d", -- for lines like vertsplit - -- green = "#15bf75", green = "#AAD84C", - -- vibrant_green = "#a9b665", vibrant_green = "#b9e75b", nord_blue = "#18a3af", blue = "#25B0BC", @@ -49,7 +47,6 @@ M.base_16 = { base0A = "#6840ff", -- Classes base0B = "#ebc7a9", -- Confirmed: Strings base0C = "#F09483", -- Escape characters, Regular expressions - -- base0D = "#fdb830", -- Functions, Methods base0D = "#FFA500", -- Functions, Methods base0E = "#25B0BC", -- Confirmed: Keywords, Storage, Selector, Markup base0F = "#a72e5b", -- Deprecated, Opening/Closing embedded language tags From 032ea22feac4c4e5129f5d8e4e5400ab38452829 Mon Sep 17 00:00:00 2001 From: Sidhanth Rathod Date: Fri, 7 Oct 2022 06:40:51 +0530 Subject: [PATCH 45/45] improve dark_horizon theme --- lua/base46/themes/dark_horizon.lua | 38 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/lua/base46/themes/dark_horizon.lua b/lua/base46/themes/dark_horizon.lua index 7e614e2..178f38d 100644 --- a/lua/base46/themes/dark_horizon.lua +++ b/lua/base46/themes/dark_horizon.lua @@ -4,8 +4,8 @@ M.base_30 = { white = "#FFFFFF", darker_black = "#080808", black = "#0e0e0e", -- nvim bg - black2 = "#141414", - one_bg = "#181818", + black2 = "#181818", + one_bg = "#1c1c1c", one_bg2 = "#212121", one_bg3 = "#292929", grey = "#363636", @@ -25,44 +25,44 @@ M.base_30 = { purple = "#da70d6", dark_purple = "#c65cc2", teal = "#749689", - orange = "#e78a4e", + orange = "#FFA500", cyan = "#6BE4E6", - statusline_bg = "#121212", - lightbg = "#1f1f1f", + statusline_bg = "#181818", + lightbg = "#292929", pmenu_bg = "#15bf84", folder_bg = "#07929e", } M.base_16 = { - base00 = "#151515", - base01 = "#1c1f25", - base02 = "#474a50", - base03 = "#3f4248", - base04 = "#33363c", + base00 = "#0e0e0e", + base01 = "#181818", + base02 = "#292929", + base03 = "#363636", + base04 = "#3f4248", base05 = "#c9c7be", base06 = "#E6E1CF", base07 = "#D9D7CE", base08 = "#D9D7CE", -- Confirmed: Variables Confirmed base09 = "#eaa273", -- Confirmed: Integers, Booleans - base0A = "#6840ff", -- Classes - base0B = "#ebc7a9", -- Confirmed: Strings + base0A = "#825aff", -- Classes + base0B = "#E3A587", -- Confirmed: Strings base0C = "#F09483", -- Escape characters, Regular expressions base0D = "#FFA500", -- Functions, Methods - base0E = "#25B0BC", -- Confirmed: Keywords, Storage, Selector, Markup - base0F = "#a72e5b", -- Deprecated, Opening/Closing embedded language tags + base0E = "#2ca9b4", -- Confirmed: Keywords, Storage, Selector, Markup + base0F = "#d75271", -- Deprecated, Opening/Closing embedded language tags } M.polish_hl = { - Include = { fg = M.base_16.base0E }, + Include = { fg = M.base_16.base0E, bold = true }, TSVariable = { fg = M.base_16.base08 }, - TSProperty = { fg = M.base_16.base0C }, + TSProperty = { fg = M.base_16.base0E }, Repeat = { fg = M.base_16.base0E }, - TSTagDelimiter = { fg = M.base_30.cyan }, + TSTagDelimiter = { fg = M.base_16.base05 }, TSFunction = { fg = M.base_30.orange }, - luaTSField = { fg = M.base_16.base0D }, + luaTSField = { fg = M.base_16.base0E }, TSParameter = { fg = M.base_16.base0F }, TSConstructor = { fg = M.base_16.base0A }, - TSTagAttribute = { fg = M.base_30.orange }, + TSTagAttribute = { fg = M.base_16.orange }, } vim.opt.bg = "dark"