From 66ab809e0ecdf38cc5eaaab56a3f3d2f1369e1ac Mon Sep 17 00:00:00 2001 From: Shadman Date: Fri, 5 Feb 2021 14:48:05 +0600 Subject: [PATCH] Update onedark+onelight theme (#70) --- THEMES.md | 14 +++++--- lua/lualine/themes/onedark.lua | 64 +++++++++++++++++---------------- lua/lualine/themes/onelight.lua | 48 +++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 34 deletions(-) create mode 100644 lua/lualine/themes/onelight.lua diff --git a/THEMES.md b/THEMES.md index dd7af50..134f013 100644 --- a/THEMES.md +++ b/THEMES.md @@ -64,10 +64,16 @@ All available themes are only best effort ports by myself/ other users. If you f ![replace](https://user-images.githubusercontent.com/13149513/103517682-ba284c80-4e9c-11eb-9210-d3e28a05f4a2.jpg) ### onedark -![normal](https://user-images.githubusercontent.com/41551030/103468158-a83c9180-4d56-11eb-89cb-28d802f02341.png) -![insert](https://user-images.githubusercontent.com/41551030/103468174-cdc99b00-4d56-11eb-8723-fd817ff06404.png) -![visual](https://user-images.githubusercontent.com/41551030/103468184-ea65d300-4d56-11eb-99e2-73cb649ab679.png) -![replace](https://user-images.githubusercontent.com/41551030/103468213-07020b00-4d57-11eb-9b66-5061de556f44.png) +![normal](https://user-images.githubusercontent.com/13149513/104421215-4295a400-55a5-11eb-9b81-5f02889e1309.jpg) +![insert](https://user-images.githubusercontent.com/13149513/104421219-44f7fe00-55a5-11eb-8c8f-be111732cdbb.jpg) +![visual](https://user-images.githubusercontent.com/13149513/104421227-475a5800-55a5-11eb-8025-4607b24cb7ba.jpg) +![replace](https://user-images.githubusercontent.com/13149513/104421235-49bcb200-55a5-11eb-9351-7a6d63e89a13.jpg) + +### onelight +![normal](https://user-images.githubusercontent.com/13149513/104421482-999b7900-55a5-11eb-9fe1-7a10b3914e84.jpg) +![insert](https://user-images.githubusercontent.com/13149513/104421489-9c966980-55a5-11eb-97ee-2073e019f9f4.jpg) +![visual](https://user-images.githubusercontent.com/13149513/104421509-a0c28700-55a5-11eb-9c46-8b841a8cbb01.jpg) +![replace](https://user-images.githubusercontent.com/13149513/104421519-a324e100-55a5-11eb-89d1-ae690509d295.jpg) ### papercolor_dark ![normal](https://user-images.githubusercontent.com/13149513/104417232-3e668800-559f-11eb-8b85-9a09ed3078f6.jpg) diff --git a/lua/lualine/themes/onedark.lua b/lua/lualine/themes/onedark.lua index f367207..1a67675 100644 --- a/lua/lualine/themes/onedark.lua +++ b/lua/lualine/themes/onedark.lua @@ -1,44 +1,48 @@ -local onedark = {} +-- ============================================================================= +-- Filename: lua/lualine/themes/onedark.lua +-- Author: shadman +-- Credit: Zoltan Dalmadi(lightline) +-- License: MIT License +-- ============================================================================= + +local M = {} local colors = { - red = {"#E06C75", 168}, - dark_red = {"#BE5046", 131}, - green = {"#98C379", 114}, - blue = {"#61AFEF", 75 }, - purple = {"#C678DD", 176}, - white = {"#ABB2BF", 249}, - black = {"#282C34", 236}, - visual_grey = {"#3E4452", 238}, + blue = { '#61afef', 75 }, + green = { '#98c379', 76 }, + purple = { '#c678dd', 176 }, + red1 = { '#e06c75', 168 }, + red2 = { '#be5046', 168 }, + yellow = { '#e5c07b', 180 }, + fg = { '#abb2bf', 145 }, + bg = { '#282c34', 235 }, + gray1 = { '#5c6370', 241 }, + gray2 = { '#2c323d', 235 }, + gray3 = { '#3e4452', 240 }, } -onedark.normal = { - a = { fg = colors.black, bg = colors.green, gui = 'bold', }, - b = { fg = colors.white, bg = colors.visual_grey, }, - c = { fg = colors.green, bg = colors.black, }, +M.normal = { + a = { fg = colors.bg, bg = colors.green , gui = 'bold', }, + b = { fg = colors.fg, bg = colors.gray3 , }, + c = { fg = colors.fg, bg = colors.gray2 , } } -onedark.insert = { - a = { fg = colors.black, bg = colors.blue, gui = 'bold', }, - b = { fg = colors.white, bg = colors.visual_grey, }, - c = { fg = colors.blue, bg = colors.black, }, +M.insert = { + a = { fg = colors.bg, bg = colors.blue , gui = 'bold', }, } -onedark.visual = { - a = { fg = colors.black, bg = colors.purple, gui = 'bold', }, - b = { fg = colors.white, bg = colors.visual_grey, }, - c = { fg = colors.purple, bg = colors.black, }, +M.visual = { + a = { fg = colors.bg, bg = colors.purple , gui = 'bold', }, } -onedark.replace = { - a = { fg = colors.black, bg = colors.red, gui = 'bold', }, - b = { fg = colors.white, bg = colors.visual_grey, }, - c = { fg = colors.red, bg = colors.black, }, +M.replace = { + a = { fg = colors.bg, bg = colors.red1 , gui = 'bold', }, } -onedark.inactive = { - a = { fg = colors.black, bg = colors.white, gui = 'bold', }, - b = { fg = colors.white, bg = colors.visual_grey, }, - c = { fg = colors.white, bg = colors.visual_grey, }, +M.inactive = { + a = { fg = colors.gray1, bg = colors.bg , gui = 'bold', }, + b = { fg = colors.gray1, bg = colors.bg , }, + c = { fg = colors.gray1, bg = colors.gray2 , }, } -return onedark +return M diff --git a/lua/lualine/themes/onelight.lua b/lua/lualine/themes/onelight.lua new file mode 100644 index 0000000..d345a6d --- /dev/null +++ b/lua/lualine/themes/onelight.lua @@ -0,0 +1,48 @@ +-- ============================================================================= +-- Filename: lua/lualine/themes/onelight.lua +-- Author: shadman +-- Credit: Zoltan Dalmadi(lightline) +-- License: MIT License +-- ============================================================================= + +local M = {} + +local colors = { + blue = { '#61afef', 75 }, + green = { '#98c379', 35 }, + purple = { '#c678dd', 176 }, + red1 = { '#e06c75', 168 }, + red2 = { '#be5046', 168 }, + yellow = { '#e5c07b', 180 }, + fg = { '#494b53', 238 }, + bg = { '#fafafa', 255 }, + gray1 = { '#494b53', 238 }, + gray2 = { '#f0f0f0', 255 }, + gray3 = { '#d0d0d0', 250 }, +} + +M.normal = { + a = { fg = colors.bg, bg = colors.green , gui = 'bold', }, + b = { fg = colors.fg, bg = colors.gray3 , }, + c = { fg = colors.fg, bg = colors.gray2 , } +} + +M.insert = { + a = { fg = colors.bg, bg = colors.blue , gui = 'bold', }, +} + +M.visual = { + a = { fg = colors.bg, bg = colors.purple , gui = 'bold', }, +} + +M.replace = { + a = { fg = colors.bg, bg = colors.red1 , gui = 'bold', }, +} + +M.inactive = { + a = { fg = colors.bg, bg = colors.gray3 , gui = 'bold', }, + b = { fg = colors.bg, bg = colors.gray3 , }, + c = { fg = colors.gray3, bg = colors.gray2 , }, +} + +return M