Skip to content

Commit

Permalink
Add markup support (#1525)
Browse files Browse the repository at this point in the history 
* Add markup support for all Base16 themes

* Fix rose_pine `markup.link.text` attribute misname

* Add basic default markup support for all themes

* Fix cursor change color on Base16 terminal and default

* Remove old markup monokai_pro support and fix Onedark `markup.link.text` attribute misname

* Remove old markup dracula support
  • Loading branch information
@NNBnh
NNBnh committed Jan 23, 2022
1 parent b8cafee commit 83bde10
Show file tree
Hide file tree
Showing 17 changed files with 141 additions and 5 deletions.
11 changes: 10 additions & 1 deletion base16_theme.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"ui.statusline" = { fg = "black", bg = "white" }
"ui.statusline.inactive" = { fg = "gray", bg = "white" }
"ui.help" = { modifiers = ["reversed"] }
"ui.cursor" = { modifiers = ["reversed"] }
"ui.cursor" = { fg = "white", modifiers = ["reversed"] }
"variable" = "red"
"constant.numeric" = "yellow"
"constant" = "yellow"
Expand All @@ -29,6 +29,15 @@
"namespace" = "magenta"
"ui.help" = { fg = "white", bg = "black" }

"markup.heading" = "blue"
"markup.list" = "red"
"markup.bold" = { fg = "yellow", modifiers = ["bold"] }
"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
"markup.link.text" = "red"
"markup.quote" = "cyan"
"markup.raw" = "green"

"diff.plus" = "green"
"diff.delta" = "yellow"
"diff.minus" = "red"
Expand Down
9 changes: 9 additions & 0 deletions runtime/themes/base16_default_dark.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,15 @@
"namespace" = "base0E"
"ui.help" = { fg = "base06", bg = "base01" }

"markup.heading" = "base0D"
"markup.list" = "base08"
"markup.bold" = { fg = "base0A", modifiers = ["bold"] }
"markup.italic" = { fg = "base0E", modifiers = ["italic"] }
"markup.link.url" = { fg = "base09", modifiers = ["underlined"] }
"markup.link.text" = "base08"
"markup.quote" = "base0C"
"markup.raw" = "base0B"

"diff.plus" = "base0B"
"diff.delta" = "base09"
"diff.minus" = "base08"
Expand Down
9 changes: 9 additions & 0 deletions runtime/themes/base16_default_light.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,15 @@
"namespace" = "base0E"
"ui.help" = { fg = "base06", bg = "base01" }

"markup.heading" = "base0D"
"markup.list" = "base08"
"markup.bold" = { fg = "base0A", modifiers = ["bold"] }
"markup.italic" = { fg = "base0E", modifiers = ["italic"] }
"markup.link.url" = { fg = "base09", modifiers = ["underlined"] }
"markup.link.text" = "base08"
"markup.quote" = "base0C"
"markup.raw" = "base0B"

"diff.plus" = "base0B"
"diff.delta" = "base09"
"diff.minus" = "base08"
Expand Down
11 changes: 10 additions & 1 deletion runtime/themes/base16_terminal.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"ui.statusline.inactive" = { fg = "gray", bg = "black" }
"ui.help" = { fg = "white", bg = "black" }
"ui.cursor" = { fg = "light-gray", modifiers = ["reversed"] }
"ui.cursor.primary" = { modifiers = ["reversed"] }
"ui.cursor.primary" = { fg = "light-white", modifiers = ["reversed"] }
"variable" = "light-red"
"constant.numeric" = "yellow"
"constant" = "yellow"
Expand All @@ -30,6 +30,15 @@
"namespace" = "light-magenta"
"ui.help" = { fg = "white", bg = "black" }

"markup.heading" = "light-blue"
"markup.list" = "light-red"
"markup.bold" = { fg = "light-yellow", modifiers = ["bold"] }
"markup.italic" = { fg = "light-magenta", modifiers = ["italic"] }
"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
"markup.link.text" = "light-red"
"markup.quote" = "light-cyan"
"markup.raw" = "light-green"

"diff.plus" = "light-green"
"diff.delta" = "yellow"
"diff.minus" = "light-red"
Expand Down
10 changes: 10 additions & 0 deletions runtime/themes/bogster.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,16 @@

"module" = "#d32c5d"

# TODO
"markup.heading" = "blue"
"markup.list" = "red"
"markup.bold" = { fg = "yellow", modifiers = ["bold"] }
"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
"markup.link.text" = "red"
"markup.quote" = "cyan"
"markup.raw" = "green"

"diff.plus" = "#59dcb7"
"diff.delta" = "#dc7759"
"diff.minus" = "#dc597f"
Expand Down
10 changes: 10 additions & 0 deletions runtime/themes/dark_plus.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,16 @@
"constant.numeric" = { fg = "pale_green" }
"constant.character.escape" = { fg = "gold" }

# TODO
"markup.heading" = "blue"
"markup.list" = "red"
"markup.bold" = { fg = "yellow", modifiers = ["bold"] }
"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
"markup.link.text" = "red"
"markup.quote" = "cyan"
"markup.raw" = "green"

"diff.plus" = { fg = "pale_green" }
"diff.delta" = { fg = "gold" }
"diff.minus" = { fg = "red" }
Expand Down
10 changes: 10 additions & 0 deletions runtime/themes/everforest_dark.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,16 @@
"module" = "blue"
"special" = "orange"

# TODO
"markup.heading" = "blue"
"markup.list" = "red"
"markup.bold" = { fg = "yellow", modifiers = ["bold"] }
"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
"markup.link.text" = "red"
"markup.quote" = "cyan"
"markup.raw" = "green"

"diff.plus" = "green"
"diff.delta" = "orange"
"diff.minus" = "red"
Expand Down
10 changes: 10 additions & 0 deletions runtime/themes/everforest_light.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,16 @@
"module" = "blue"
"special" = "orange"

# TODO
"markup.heading" = "blue"
"markup.list" = "red"
"markup.bold" = { fg = "yellow", modifiers = ["bold"] }
"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
"markup.link.text" = "red"
"markup.quote" = "cyan"
"markup.raw" = "green"

"diff.plus" = "green"
"diff.delta" = "orange"
"diff.minus" = "red"
Expand Down
10 changes: 10 additions & 0 deletions runtime/themes/ingrid.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,16 @@

"module" = "#839A53"

# TODO
"markup.heading" = "blue"
"markup.list" = "red"
"markup.bold" = { fg = "yellow", modifiers = ["bold"] }
"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
"markup.link.text" = "red"
"markup.quote" = "cyan"
"markup.raw" = "green"

"diff.plus" = "#839A53"
"diff.delta" = "#D4A520"
"diff.minus" = "#D74E50"
Expand Down
10 changes: 10 additions & 0 deletions runtime/themes/monokai.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,16 @@
"constant.numeric" = { fg = "#ae81ff" }
"constant.character.escape" = { fg = "#ae81ff" }

# TODO
"markup.heading" = "blue"
"markup.list" = "red"
"markup.bold" = { fg = "yellow", modifiers = ["bold"] }
"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
"markup.link.text" = "red"
"markup.quote" = "cyan"
"markup.raw" = "green"

"diff.plus" = { fg = "#a6e22e" }
"diff.delta" = { fg = "#fd971f" }
"diff.minus" = { fg = "#f92672" }
Expand Down
10 changes: 10 additions & 0 deletions runtime/themes/nord.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,16 @@
# nord15 - integer, floating point
"constant.numeric" = "nord15"

# TODO markup
"markup.heading" = "blue"
"markup.list" = "red"
"markup.bold" = { fg = "yellow", modifiers = ["bold"] }
"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
"markup.link.text" = "red"
"markup.quote" = "cyan"
"markup.raw" = "green"

# vcs
"diff.plus" = "nord14"
"diff.delta" = "nord12"
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/onedark.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"markup.list" = { fg = "red" }
"markup.quote" = { fg = "yellow" }
"markup.link.url" = { fg = "cyan", modifiers = ["underlined"]}
"markup.link.label" = { fg = "purple" }
"markup.link.text" = { fg = "purple" }

"diff.plus" = "green"
"diff.delta" = "gold"
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/rose_pine.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"markup.list" = { fg = "love" }
"markup.quote" = { fg = "rose" }
"markup.link.url" = { fg = "pine", modifiers = ["underlined"]}
"markup.link.label" = { fg = "foam" }
"markup.link.text" = { fg = "foam" }

[palette]
base = "#191724"
Expand Down
2 changes: 1 addition & 1 deletion runtime/themes/rose_pine_dawn.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"markup.list" = { fg = "love" }
"markup.quote" = { fg = "rose" }
"markup.link.url" = { fg = "pine", modifiers = ["underlined"]}
"markup.link.label" = { fg = "foam" }
"markup.link.test" = { fg = "foam" }

[palette]
base = "#faf4ed"
Expand Down
10 changes: 10 additions & 0 deletions runtime/themes/solarized_dark.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@
"module" = { fg = "violet" }
"tag" = { fg = "magenta" }

# TODO
"markup.heading" = "blue"
"markup.list" = "red"
"markup.bold" = { fg = "yellow", modifiers = ["bold"] }
"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
"markup.link.text" = "red"
"markup.quote" = "cyan"
"markup.raw" = "green"

"diff.plus" = { fg = "green" }
"diff.delta" = { fg = "orange" }
"diff.minus" = { fg = "red" }
Expand Down
10 changes: 10 additions & 0 deletions runtime/themes/solarized_light.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@
"module" = { fg = "violet" }
"tag" = { fg = "magenta" }

# TODO
"markup.heading" = "blue"
"markup.list" = "red"
"markup.bold" = { fg = "yellow", modifiers = ["bold"] }
"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
"markup.link.text" = "red"
"markup.quote" = "cyan"
"markup.raw" = "green"

"diff.plus" = { fg = "green" }
"diff.delta" = { fg = "orange" }
"diff.minus" = { fg = "red" }
Expand Down
10 changes: 10 additions & 0 deletions runtime/themes/spacebones_light.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,16 @@
"label" = "#b1951d"
"module" = "#b1951d"

# TODO
"markup.heading" = "blue"
"markup.list" = "red"
"markup.bold" = { fg = "yellow", modifiers = ["bold"] }
"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
"markup.link.text" = "red"
"markup.quote" = "cyan"
"markup.raw" = "green"

"diff.plus" = "#2d9574"
"diff.delta" = "#715ab1"
"diff.minus" = "#ba2f59"
Expand Down

0 comments on commit 83bde10

Please sign in to comment.