Skip to content

Use only colors from suggested gruvbox palettes #1176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 31, 2022
Merged

Use only colors from suggested gruvbox palettes #1176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57ff493
colors_gruvbox/gruvbox_dark: Use only colors from suggested palette.
neiljp Mar 22, 2022
3be7509
colors_gruvbox/gruvbox_light: Use only colors from suggested palette.
neiljp Mar 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions zulipterminal/themes/colors_gruvbox.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,41 @@
class GruvBoxColor(Enum):
# color = 16code 256code 24code
DEFAULT = 'default default default'

# Only or primarily dark mode - grayscales
# - generally background
DARK0_HARD = 'black h234 #1d2021'
GRAY_244 = 'dark_gray h244 #928374'
# - generally foreground
LIGHT2 = 'white h250 #d5c4a1'
# - grays
GRAY_244 = 'dark_gray h244 #928374'
LIGHT4 = 'light_gray h248 #bdae93'

# Dark mode only - colors
BRIGHT_BLUE = 'light_blue h109 #83a598'
BRIGHT_GREEN = 'light_green h142 #b8bb26'
BRIGHT_RED = 'light_red h167 #fb4934'
NEUTRAL_PURPLE = 'light_magenta h132 #b16286'
BRIGHT_YELLOW = 'brown h214 #fabd2f'

# May be relevant to both modes
NEUTRAL_BLUE = 'dark_cyan h66 #458588'
NEUTRAL_PURPLE = 'light_magenta h132 #b16286'
NEUTRAL_YELLOW = 'brown h172 #d79921'

# Light mode only - colors
FADED_BLUE = 'dark_blue h24 #076678'
FADED_YELLOW = 'brown h136 #b57614'
FADED_GREEN = 'dark_green h100 #79740e'
FADED_RED = 'dark_red h88 #9d0006'
FADED_YELLOW = 'brown h136 #b57614'

# Only or primarily light version - grayscales
# - generally background
LIGHT0_HARD = 'white h230 #f9f5d7'
GRAY_245 = 'dark_gray h245 #928374'
# - generally foreground
DARK2 = 'black h239 #504945'
# - grays
GRAY_245 = 'dark_gray h245 #928374'
DARK4 = 'black h243 #7c6f64'
BRIGHT_YELLOW = 'brown h214 #fabd2f'
FADED_GREEN = 'dark_green h100 #79740e'


# fmt: on
Expand Down
20 changes: 10 additions & 10 deletions zulipterminal/themes/gruvbox_dark.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
STYLES = {
# style_name : foreground background
None : (Color.LIGHT2, Color.DARK0_HARD),
'selected' : (Color.LIGHT2, Color.FADED_BLUE),
'msg_selected' : (Color.LIGHT2, Color.FADED_BLUE),
'header' : (Color.NEUTRAL_BLUE, Color.FADED_BLUE),
'general_narrow' : (Color.LIGHT2, Color.FADED_BLUE),
'selected' : (Color.DARK0_HARD, Color.NEUTRAL_BLUE),
'msg_selected' : (Color.DARK0_HARD, Color.NEUTRAL_BLUE),
'header' : (Color.NEUTRAL_BLUE, Color.BRIGHT_BLUE),
'general_narrow' : (Color.DARK0_HARD, Color.BRIGHT_BLUE),
'general_bar' : (Color.LIGHT2, Color.DARK0_HARD),
'name' : (Color.NEUTRAL_YELLOW__BOLD, Color.DARK0_HARD),
'unread' : (Color.NEUTRAL_PURPLE, Color.DARK0_HARD),
Expand All @@ -42,7 +42,7 @@
'msg_mention' : (Color.BRIGHT_RED__BOLD, Color.DARK0_HARD),
'msg_link' : (Color.BRIGHT_BLUE, Color.DARK0_HARD),
'msg_link_index' : (Color.BRIGHT_BLUE__BOLD, Color.DARK0_HARD),
'msg_quote' : (Color.FADED_YELLOW, Color.DARK0_HARD),
'msg_quote' : (Color.NEUTRAL_YELLOW, Color.DARK0_HARD),
'msg_code' : (Color.DARK0_HARD, Color.LIGHT2),
'msg_bold' : (Color.LIGHT2__BOLD, Color.DARK0_HARD),
'msg_time' : (Color.DARK0_HARD, Color.LIGHT2),
Expand All @@ -65,14 +65,14 @@
'popup_important' : (Color.BRIGHT_RED__BOLD, Color.DARK0_HARD),
'widget_disabled' : (Color.GRAY_244, Color.DARK0_HARD),
'area:help' : (Color.DARK0_HARD, Color.BRIGHT_GREEN),
'area:msg' : (Color.DARK0_HARD, Color.BRIGHT_RED),
'area:msg' : (Color.DARK0_HARD, Color.NEUTRAL_PURPLE),
'area:stream' : (Color.DARK0_HARD, Color.BRIGHT_BLUE),
'area:error' : (Color.LIGHT2, Color.FADED_RED),
'area:user' : (Color.LIGHT2, Color.FADED_BLUE),
'area:error' : (Color.DARK0_HARD, Color.BRIGHT_RED),
'area:user' : (Color.DARK0_HARD, Color.BRIGHT_YELLOW),
'search_error' : (Color.BRIGHT_RED, Color.DARK0_HARD),
'task:success' : (Color.DARK0_HARD, Color.BRIGHT_GREEN),
'task:error' : (Color.LIGHT2, Color.FADED_RED),
'task:warning' : (Color.DARK0_HARD, Color.BRIGHT_RED),
'task:error' : (Color.DARK0_HARD, Color.BRIGHT_RED),
'task:warning' : (Color.DARK0_HARD, Color.NEUTRAL_PURPLE),
}

META = {
Expand Down
20 changes: 10 additions & 10 deletions zulipterminal/themes/gruvbox_light.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
STYLES = {
# style_name : foreground background
None : (Color.DARK2, Color.LIGHT0_HARD),
'selected' : (Color.DARK2, Color.BRIGHT_BLUE),
'msg_selected' : (Color.DARK2, Color.BRIGHT_BLUE),
'header' : (Color.NEUTRAL_BLUE, Color.BRIGHT_BLUE),
'general_narrow' : (Color.DARK2, Color.BRIGHT_BLUE),
'selected' : (Color.LIGHT0_HARD, Color.NEUTRAL_BLUE),
'msg_selected' : (Color.LIGHT0_HARD, Color.NEUTRAL_BLUE),
'header' : (Color.NEUTRAL_BLUE, Color.FADED_BLUE),
'general_narrow' : (Color.LIGHT0_HARD, Color.FADED_BLUE),
'general_bar' : (Color.DARK2, Color.LIGHT0_HARD),
'name' : (Color.NEUTRAL_YELLOW, Color.LIGHT0_HARD),
'unread' : (Color.NEUTRAL_PURPLE, Color.LIGHT0_HARD),
Expand All @@ -41,7 +41,7 @@
'msg_mention' : (Color.FADED_RED__BOLD, Color.LIGHT0_HARD),
'msg_link' : (Color.FADED_BLUE, Color.LIGHT0_HARD),
'msg_link_index' : (Color.FADED_BLUE__BOLD, Color.LIGHT0_HARD),
'msg_quote' : (Color.BRIGHT_YELLOW, Color.LIGHT0_HARD),
'msg_quote' : (Color.NEUTRAL_YELLOW, Color.LIGHT0_HARD),
'msg_code' : (Color.LIGHT0_HARD, Color.DARK2),
'msg_bold' : (Color.DARK2__BOLD, Color.LIGHT0_HARD),
'msg_time' : (Color.LIGHT0_HARD, Color.DARK2),
Expand All @@ -64,14 +64,14 @@
'popup_important' : (Color.FADED_RED__BOLD, Color.LIGHT0_HARD),
'widget_disabled' : (Color.GRAY_245, Color.LIGHT0_HARD),
'area:help' : (Color.LIGHT0_HARD, Color.FADED_GREEN),
'area:msg' : (Color.LIGHT0_HARD, Color.FADED_RED),
'area:msg' : (Color.LIGHT0_HARD, Color.NEUTRAL_PURPLE),
'area:stream' : (Color.LIGHT0_HARD, Color.FADED_BLUE),
'area:error' : (Color.DARK2, Color.BRIGHT_RED),
'area:user' : (Color.DARK2, Color.BRIGHT_BLUE),
'area:error' : (Color.LIGHT0_HARD, Color.FADED_RED),
'area:user' : (Color.LIGHT0_HARD, Color.FADED_YELLOW),
'search_error' : (Color.FADED_RED, Color.LIGHT0_HARD),
'task:success' : (Color.LIGHT0_HARD, Color.FADED_GREEN),
'task:error' : (Color.DARK2, Color.BRIGHT_RED),
'task:warning' : (Color.LIGHT0_HARD, Color.FADED_RED),
'task:error' : (Color.LIGHT0_HARD, Color.FADED_RED),
'task:warning' : (Color.LIGHT0_HARD, Color.NEUTRAL_PURPLE),
}

META = {
Expand Down