From ab7188ec4f8fee505f4a82c125ac9fffc12a35bd Mon Sep 17 00:00:00 2001 From: jb Date: Wed, 20 Apr 2022 09:59:37 +0200 Subject: [PATCH 1/5] Add Pop-Dark Theme --- runtime/themes/pop-dark.toml | 152 +++++++++++++++++++++++++++++++++++ 1 file changed, 152 insertions(+) create mode 100644 runtime/themes/pop-dark.toml diff --git a/runtime/themes/pop-dark.toml b/runtime/themes/pop-dark.toml new file mode 100644 index 000000000000..b16695a308bd --- /dev/null +++ b/runtime/themes/pop-dark.toml @@ -0,0 +1,152 @@ +# Pop Dark theme for the Helix Editor +# Author: workingj +# Repo: https://github.com/workingJ/helix-pop-theme +# License: MIT License +# Version: 1.0 +# This theme is based on Nathaniel Webb's VSCodePopTheme + +info = { fg = 'yellowH', bg = 'brownD' } +hint = { fg = 'brownD', bg = 'yellowH', modifiers = ['bold'] } +warning = { fg = 'brownD', bg = 'orangeW', modifiers = ['bold'] } +error = { fg = 'brownD', bg = 'redE', modifiers = ['bold'] } +diagnostic = { fg = 'greyT', bg = 'redD' } +'ui.background' = { bg = 'brownN' } +# 'ui.window' = { bg = '#FF00FF', fg = 'black' } # ? +'ui.gutter' = { bg = 'brownH' } +'ui.text' = { fg = 'greyT' } +'ui.text.focus' = { fg = 'orangeN' } +'ui.text.info' = { fg = 'orangeH', bg = 'brownH' } +'ui.cursor' = { fg = 'greyD', bg = 'orangeY' } +'ui.cursor.insert' = { fg = 'black', bg = 'orangeN' } +'ui.cursor.select' = { fg = 'black', bg = 'orangeN' } +'ui.cursor.match' = { fg = 'black', bg = 'blueD' } +'ui.cursor.primary' = { fg = 'black', bg = 'orangeN' } +'ui.selection' = { bg = 'blueH', fg = 'white' } +'ui.selection.primary' = { bg = 'blueD', fg = 'white' } +'ui.linenr' = { bg = "brownN", fg = 'greyL' } +'ui.linenr.selected' = { bg = 'brownH', fg = 'orangeH' } +'ui.statusline' = { bg = 'brownH' } +'ui.statusline.inactive' = { bg = 'brownN' } +'ui.help' = { bg = 'brownD' } +'ui.highlight' = { bg = 'brownH' } +'ui.menu' = { bg = 'brownD' } +'ui.menu.selected' = { fg = 'orangeH', bg = 'brownH' } +'ui.popup' = { bg = 'brownD' } +'ui.popup.info' = { bg = 'brownH', fg = 'greyT' } +tag = { fg = 'blueH' } +label = { fg = 'greenS' } +# module = { bg = '#FF0000' } # ? +special = { fg = 'orangeW' } +operator = { fg = 'orangeY' } +# property = { bg = '#FF0000' } # ? +attribute = { fg = 'orangeL' } +attributes = { fg = 'orangeL' } +namespace = { fg = 'orangeL' } +'type' = { fg = 'redH' } +'type.builtin' = { fg = 'orangeL' } +'type.enum.variant' = { fg = 'orangeL' } +'constructor' = { fg = 'blueD' } +'constant' = { fg = 'greyG' } +'constant.builtin' = { fg = 'redL' } +'constant.builtin.boolean' = { fg = 'redL' } +'constant.character' = { fg = 'greenS' } +'constant.character.escape' = { fg = 'blueL' } +'constant.numeric' = { fg = 'redH' } +'constant.number' = { bg = 'blueH' } +'constant.number.integer' = { fg = 'orangeS' } # ? +'constant.number.float' = { fg = 'orangeS' } # ? +'string' = { fg = 'greenN' } +'string.regexp' = { fg = 'blueL' } +'string.special' = { fg = 'orangeW' } # ? +'string.special.path' = { fg = 'orangeW' } # ? +'string.special.url' = { fg = 'orangeW' } # ? +'string.special.symbol' = { fg = 'orangeW' } # ? +'comment' = { fg = 'greyC', modifiers = ['italic'] } +'comment.line' = { fg = 'greyC', modifiers = ['italic'] } +'comment.block' = { fg = 'greyC', modifiers = ['italic'] } +'comment.block.documentation' = { fg = 'greyC', modifiers = ['italic'] } +'variable' = { fg = 'greyT' } +'variable.builtin' = { fg = 'blueL' } +'variable.parameter' = { fg = 'white' } +'variable.other.member' = { fg = 'orangeH' } +# 'variable.function' = { fg = '#FF0000', bg = '#0000FF' } # ? +'punctuation' = { fg = 'blueL' } +'punctuation.delimeter' = { fg = 'blueH' } +'punctuation.bracket' = { fg = 'orangeN' } +'keyword' = { fg = 'blueH' } +'keyword.control' = { fg = 'blueL' } +'keyword.control.conditional' = { fg = 'blueL' } +'keyword.control.repeat' = { fg = 'blueL' } +'keyword.control.import' = { fg = 'redH' } +'keyword.control.return' = { fg = 'blueL' } +'keyword.control.exception' = { fg = 'redH' } +'keyword.operator' = { fg = 'blueL' } +'keyword.directive' = { fg = 'blueL' } +'keyword.function' = { fg = 'redH' } +'function' = { fg = 'blueH' } +'function.builtin' = { fg = 'blueH' } +'function.method' = { fg = 'blueH' } +'function.macro' = { fg = 'greyH' } +'function.special' = { fg = 'blueD' } +'markup.heading' = { fg = 'greenN' } +'markup.heading.1' = { fg = '#FFC977' } +'markup.heading.2' = { fg = '#FFC26C' } +'markup.heading.3' = { fg = '#FFC166' } +'markup.heading.4' = { fg = '#FFB950' } +'markup.heading.5' = { fg = '#FFB340' } +'markup.heading.6' = { fg = '#FFAD34' } +'markup.heading.marker' = { fg = 'orangeN' } +'markup.list' = { fg = 'greenN' } +'markup.list.numbered' = { fg = 'greenN' } +'markup.list.unnumbered' = { fg = 'greenN' } +'markup.bold' = { modifiers = ['bold'] } +'markup.italic' = { modifiers = ['italic'] } +'markup.link' = { fg = 'blueD' } +'markup.link.url' = { fg = 'blueL' } +'markup.link.label' = { fg = 'blueH' } +'markup.link.text' = { fg = 'blueN' } +'markup.quote' = { fg = 'blueL' } +'markup.normal' = { fg = 'blueL' } +'markup.normal.completion' = { bg = 'brownN' } +'markup.normal.raw' = { bg = 'brownN' } +'markup.heading.completion' = { fg = 'greenN' } +'markup.heading.raw' = { bg = 'brownN' } +'markup.raw' = { bg = 'brownN' } +'markup.raw.block' = { bg = 'brownH', fg = 'orangeH' } +'markup.raw.inline' = { fg = 'blueL' } +'markup.raw.inline.completion' = { fg = 'greenN' } +'markup.raw.inline.hover' = { fg = 'greenS' } +'diff.plus' = { fg = '#4dd44d' } +'diff.minus' = { fg = '#dd4d4d' } +'diff.delta' = { fg = '#4d4ddd' } +'diff.delta.moved' = { fg = '#dd4ddd' } + +[palette] +white = '#FFFFFF' +greyH = '#CFCFCF' +greyT = '#DEDEDE' +greyG = '#DDFFDD' +greyC = '#A0B4A7' +greyL = '#9A9A9A' +greyD = '#444444' +black = '#000000' +yellowH = '#FFCC00' +orangeH = '#FFD68A' +orangeL = '#FFCB6B' +orangeY = '#FDC33B' +orangeN = '#FDAF1F' +orangeW = '#FF9500' +orangeS = '#F79A6C' +redH = '#F78C6C' +redL = '#F96964' +redE = '#FF2200' +redD = '#CC3333' +greenN = '#73C48F' +greenS = '#6FC475' +blueH = '#8DEEF9' +blueL = '#6dd2fa' +blueN = '#39B7C7' +blueD = '#4AAAD6' +brownH = '#56524E' +brownN = '#3F3B39' +brownD = '#2B2928' \ No newline at end of file From 943a524bfeec88ce9a60c73f2d8bf3c93591cd2a Mon Sep 17 00:00:00 2001 From: jb Date: Wed, 20 Apr 2022 10:07:32 +0200 Subject: [PATCH 2/5] added trailing new line --- runtime/themes/pop-dark.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/themes/pop-dark.toml b/runtime/themes/pop-dark.toml index b16695a308bd..64b771fc5117 100644 --- a/runtime/themes/pop-dark.toml +++ b/runtime/themes/pop-dark.toml @@ -149,4 +149,4 @@ blueN = '#39B7C7' blueD = '#4AAAD6' brownH = '#56524E' brownN = '#3F3B39' -brownD = '#2B2928' \ No newline at end of file +brownD = '#2B2928' From b0601827fa638dac5e485b5e85125b908cf0f172 Mon Sep 17 00:00:00 2001 From: jb Date: Thu, 21 Apr 2022 13:09:30 +0200 Subject: [PATCH 3/5] updated virtuals --- runtime/themes/pop-dark.toml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/runtime/themes/pop-dark.toml b/runtime/themes/pop-dark.toml index 64b771fc5117..b8912f1cf397 100644 --- a/runtime/themes/pop-dark.toml +++ b/runtime/themes/pop-dark.toml @@ -1,9 +1,8 @@ # Pop Dark theme for the Helix Editor -# Author: workingj +# Author: workingj # Repo: https://github.com/workingJ/helix-pop-theme -# License: MIT License # Version: 1.0 -# This theme is based on Nathaniel Webb's VSCodePopTheme +# This theme is based on Nathaniel Webb's VSCodePopTheme info = { fg = 'yellowH', bg = 'brownD' } hint = { fg = 'brownD', bg = 'yellowH', modifiers = ['bold'] } @@ -17,7 +16,7 @@ diagnostic = { fg = 'greyT', bg = 'redD' } 'ui.text.focus' = { fg = 'orangeN' } 'ui.text.info' = { fg = 'orangeH', bg = 'brownH' } 'ui.cursor' = { fg = 'greyD', bg = 'orangeY' } -'ui.cursor.insert' = { fg = 'black', bg = 'orangeN' } +'ui.cursor.insert' = { fg = 'orangeN', bg = 'orangeN' } 'ui.cursor.select' = { fg = 'black', bg = 'orangeN' } 'ui.cursor.match' = { fg = 'black', bg = 'blueD' } 'ui.cursor.primary' = { fg = 'black', bg = 'orangeN' } @@ -29,6 +28,10 @@ diagnostic = { fg = 'greyT', bg = 'redD' } 'ui.statusline.inactive' = { bg = 'brownN' } 'ui.help' = { bg = 'brownD' } 'ui.highlight' = { bg = 'brownH' } +'ui.virtual' = { fg = 'brownV' } +'ui.virtual.ruler' = { bg = 'brownR' } +'ui.virtual.whitespace' = { fg = 'brownV' } +'ui.virtual.indent-guide' = { fg = 'brownR' } 'ui.menu' = { bg = 'brownD' } 'ui.menu.selected' = { fg = 'orangeH', bg = 'brownH' } 'ui.popup' = { bg = 'brownD' } @@ -40,7 +43,6 @@ special = { fg = 'orangeW' } operator = { fg = 'orangeY' } # property = { bg = '#FF0000' } # ? attribute = { fg = 'orangeL' } -attributes = { fg = 'orangeL' } namespace = { fg = 'orangeL' } 'type' = { fg = 'redH' } 'type.builtin' = { fg = 'orangeL' } @@ -147,6 +149,8 @@ blueH = '#8DEEF9' blueL = '#6dd2fa' blueN = '#39B7C7' blueD = '#4AAAD6' +brownV = '#67634F' brownH = '#56524E' brownN = '#3F3B39' -brownD = '#2B2928' +brownR = '#35312f' +brownD = '#2B2928' \ No newline at end of file From 1edba3e5d7d5940b9194fe02f5bdb87b12eb0123 Mon Sep 17 00:00:00 2001 From: jb Date: Thu, 21 Apr 2022 15:31:50 +0200 Subject: [PATCH 4/5] few more fixes --- runtime/themes/pop-dark.toml | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/runtime/themes/pop-dark.toml b/runtime/themes/pop-dark.toml index b8912f1cf397..2cacfcc79a55 100644 --- a/runtime/themes/pop-dark.toml +++ b/runtime/themes/pop-dark.toml @@ -1,5 +1,5 @@ # Pop Dark theme for the Helix Editor -# Author: workingj +# Author: workingj # Repo: https://github.com/workingJ/helix-pop-theme # Version: 1.0 # This theme is based on Nathaniel Webb's VSCodePopTheme @@ -38,11 +38,12 @@ diagnostic = { fg = 'greyT', bg = 'redD' } 'ui.popup.info' = { bg = 'brownH', fg = 'greyT' } tag = { fg = 'blueH' } label = { fg = 'greenS' } -# module = { bg = '#FF0000' } # ? +module = { bg = 'orangeL' } special = { fg = 'orangeW' } operator = { fg = 'orangeY' } -# property = { bg = '#FF0000' } # ? +property = { bg = 'blueH' } attribute = { fg = 'orangeL' } +attributes = { fg = 'orangeL' } namespace = { fg = 'orangeL' } 'type' = { fg = 'redH' } 'type.builtin' = { fg = 'orangeL' } @@ -55,14 +56,14 @@ namespace = { fg = 'orangeL' } 'constant.character.escape' = { fg = 'blueL' } 'constant.numeric' = { fg = 'redH' } 'constant.number' = { bg = 'blueH' } -'constant.number.integer' = { fg = 'orangeS' } # ? -'constant.number.float' = { fg = 'orangeS' } # ? +'constant.number.integer' = { fg = 'orangeS' } +'constant.number.float' = { fg = 'orangeS' } 'string' = { fg = 'greenN' } 'string.regexp' = { fg = 'blueL' } -'string.special' = { fg = 'orangeW' } # ? -'string.special.path' = { fg = 'orangeW' } # ? -'string.special.url' = { fg = 'orangeW' } # ? -'string.special.symbol' = { fg = 'orangeW' } # ? +'string.special' = { fg = 'orangeW' } +'string.special.path' = { fg = 'orangeW' } +'string.special.url' = { fg = 'orangeW' } +'string.special.symbol' = { fg = 'orangeW' } 'comment' = { fg = 'greyC', modifiers = ['italic'] } 'comment.line' = { fg = 'greyC', modifiers = ['italic'] } 'comment.block' = { fg = 'greyC', modifiers = ['italic'] } @@ -71,7 +72,7 @@ namespace = { fg = 'orangeL' } 'variable.builtin' = { fg = 'blueL' } 'variable.parameter' = { fg = 'white' } 'variable.other.member' = { fg = 'orangeH' } -# 'variable.function' = { fg = '#FF0000', bg = '#0000FF' } # ? +'variable.function' = { fg = 'blueL' } 'punctuation' = { fg = 'blueL' } 'punctuation.delimeter' = { fg = 'blueH' } 'punctuation.bracket' = { fg = 'orangeN' } @@ -153,4 +154,5 @@ brownV = '#67634F' brownH = '#56524E' brownN = '#3F3B39' brownR = '#35312f' -brownD = '#2B2928' \ No newline at end of file +brownD = '#2B2928' + From a0b80e7912be29c5ec4bdc1b6f03b8b0477ac15e Mon Sep 17 00:00:00 2001 From: jb Date: Sun, 24 Apr 2022 10:08:41 +0200 Subject: [PATCH 5/5] fixed 'ui.window' --- runtime/themes/pop-dark.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/themes/pop-dark.toml b/runtime/themes/pop-dark.toml index 2cacfcc79a55..4ff732b763da 100644 --- a/runtime/themes/pop-dark.toml +++ b/runtime/themes/pop-dark.toml @@ -10,7 +10,7 @@ warning = { fg = 'brownD', bg = 'orangeW', modifiers = ['bold'] } error = { fg = 'brownD', bg = 'redE', modifiers = ['bold'] } diagnostic = { fg = 'greyT', bg = 'redD' } 'ui.background' = { bg = 'brownN' } -# 'ui.window' = { bg = '#FF00FF', fg = 'black' } # ? +'ui.window' = { bg = 'brownH', fg = "brownD" } 'ui.gutter' = { bg = 'brownH' } 'ui.text' = { fg = 'greyT' } 'ui.text.focus' = { fg = 'orangeN' }