Skip to content

Commit 9f31ddd

Browse files
committed
themes: Group popup_* styles together and add popup_important style.
This commit adds another style attribute "popup_important" for rendering hints/errors in the popup, or to justify the reason behind some popup elements being rendered differently/disabled. This also groups all the popup_* attributes together in all themes, so that its easier to read and compare them.
1 parent 5c3908a commit 9f31ddd

File tree

5 files changed

+15
-10
lines changed

5 files changed

+15
-10
lines changed

zulipterminal/config/themes.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
'column_title' : 'bold',
3333
'time' : '',
3434
'bar' : 'standout',
35-
'popup_contrast' : 'standout',
3635
'msg_emoji' : 'bold',
3736
'reaction' : 'bold',
3837
'reaction_mine' : 'standout',
@@ -47,7 +46,6 @@
4746
'footer' : 'standout',
4847
'footer_contrast' : 'standout',
4948
'starred' : 'bold',
50-
'popup_category' : 'bold',
5149
'unread_count' : 'bold',
5250
'starred_count' : '',
5351
'table_head' : 'bold',
@@ -59,6 +57,9 @@
5957
'current_user' : '',
6058
'muted' : 'bold',
6159
'popup_border' : 'bold',
60+
'popup_category' : 'bold',
61+
'popup_contrast' : 'standout',
62+
'popup_important' : 'bold',
6263
'widget_disabled' : 'strikethrough',
6364
'area:help' : 'standout',
6465
'area:msg' : 'standout',

zulipterminal/themes/gruvbox.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ class GruvBoxColor(Enum):
5252
'column_title' : (Color.LIGHT2__BOLD, Color.DARK0_HARD),
5353
'time' : (Color.BRIGHT_BLUE, Color.DARK0_HARD),
5454
'bar' : (Color.LIGHT2, Color.GRAY_244),
55-
'popup_contrast' : (Color.DARK0_HARD, Color.GRAY_244),
5655
'msg_emoji' : (Color.NEUTRAL_PURPLE, Color.DARK0_HARD),
5756
'reaction' : (Color.NEUTRAL_PURPLE__BOLD, Color.DARK0_HARD),
5857
'reaction_mine' : (Color.DARK0_HARD, Color.NEUTRAL_PURPLE),
@@ -67,7 +66,6 @@ class GruvBoxColor(Enum):
6766
'footer' : (Color.DARK0_HARD, Color.LIGHT4),
6867
'footer_contrast' : (Color.LIGHT2, Color.DARK0_HARD),
6968
'starred' : (Color.BRIGHT_RED__BOLD, Color.DARK0_HARD),
70-
'popup_category' : (Color.BRIGHT_BLUE__BOLD, Color.DARK0_HARD),
7169
'unread_count' : (Color.NEUTRAL_YELLOW, Color.DARK0_HARD),
7270
'starred_count' : (Color.LIGHT4, Color.DARK0_HARD),
7371
'table_head' : (Color.LIGHT2__BOLD, Color.DARK0_HARD),
@@ -79,6 +77,9 @@ class GruvBoxColor(Enum):
7977
'current_user' : (Color.LIGHT2, Color.DARK0_HARD),
8078
'muted' : (Color.BRIGHT_BLUE, Color.DARK0_HARD),
8179
'popup_border' : (Color.LIGHT2, Color.DARK0_HARD),
80+
'popup_category' : (Color.BRIGHT_BLUE__BOLD, Color.DARK0_HARD),
81+
'popup_contrast' : (Color.DARK0_HARD, Color.GRAY_244),
82+
'popup_important' : (Color.BRIGHT_RED__BOLD, Color.DARK0_HARD),
8283
'widget_disabled' : (Color.GRAY_244, Color.DARK0_HARD),
8384
'area:help' : (Color.DARK0_HARD, Color.BRIGHT_GREEN),
8485
'area:msg' : (Color.DARK0_HARD, Color.BRIGHT_RED),

zulipterminal/themes/zt_blue.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
'column_title' : (Color.BLACK__BOLD, Color.LIGHT_BLUE),
2727
'time' : (Color.DARK_BLUE, Color.LIGHT_BLUE),
2828
'bar' : (Color.WHITE, Color.DARK_BLUE),
29-
'popup_contrast' : (Color.WHITE, Color.DARK_BLUE),
3029
'msg_emoji' : (Color.DARK_MAGENTA, Color.LIGHT_BLUE),
3130
'reaction' : (Color.DARK_MAGENTA__BOLD, Color.LIGHT_BLUE),
3231
'reaction_mine' : (Color.LIGHT_BLUE, Color.DARK_MAGENTA),
@@ -41,7 +40,6 @@
4140
'footer' : (Color.WHITE, Color.DARK_GRAY),
4241
'footer_contrast' : (Color.BLACK, Color.WHITE),
4342
'starred' : (Color.LIGHT_RED__BOLD, Color.LIGHT_BLUE),
44-
'popup_category' : (Color.LIGHT_GRAY__BOLD, Color.LIGHT_BLUE),
4543
'unread_count' : (Color.YELLOW, Color.LIGHT_BLUE),
4644
'starred_count' : (Color.BLACK, Color.LIGHT_BLUE),
4745
'table_head' : (Color.BLACK__BOLD, Color.LIGHT_BLUE),
@@ -53,6 +51,9 @@
5351
'current_user' : (Color.LIGHT_GRAY, Color.LIGHT_BLUE),
5452
'muted' : (Color.LIGHT_GRAY, Color.LIGHT_BLUE),
5553
'popup_border' : (Color.WHITE, Color.LIGHT_BLUE),
54+
'popup_category' : (Color.LIGHT_GRAY__BOLD, Color.LIGHT_BLUE),
55+
'popup_contrast' : (Color.WHITE, Color.DARK_BLUE),
56+
'popup_important' : (Color.LIGHT_RED__BOLD, Color.LIGHT_BLUE),
5657
'widget_disabled' : (Color.DARK_GRAY, Color.LIGHT_BLUE),
5758
'area:help' : (Color.WHITE, Color.DARK_GREEN),
5859
'area:stream' : (Color.WHITE, Color.DARK_CYAN),

zulipterminal/themes/zt_dark.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
'column_title' : (Color.WHITE__BOLD, Color.BLACK),
2727
'time' : (Color.LIGHT_BLUE, Color.BLACK),
2828
'bar' : (Color.WHITE, Color.DARK_GRAY),
29-
'popup_contrast' : (Color.WHITE, Color.DARK_GRAY),
3029
'msg_emoji' : (Color.LIGHT_MAGENTA, Color.BLACK),
3130
'reaction' : (Color.LIGHT_MAGENTA__BOLD, Color.BLACK),
3231
'reaction_mine' : (Color.BLACK, Color.LIGHT_MAGENTA),
@@ -41,7 +40,6 @@
4140
'footer' : (Color.BLACK, Color.LIGHT_GRAY),
4241
'footer_contrast' : (Color.WHITE, Color.BLACK),
4342
'starred' : (Color.LIGHT_RED__BOLD, Color.BLACK),
44-
'popup_category' : (Color.LIGHT_BLUE__BOLD, Color.BLACK),
4543
'unread_count' : (Color.YELLOW, Color.BLACK),
4644
'starred_count' : (Color.LIGHT_GRAY, Color.BLACK),
4745
'table_head' : (Color.WHITE__BOLD, Color.BLACK),
@@ -53,6 +51,9 @@
5351
'current_user' : (Color.WHITE, Color.BLACK),
5452
'muted' : (Color.LIGHT_BLUE, Color.BLACK),
5553
'popup_border' : (Color.WHITE, Color.BLACK),
54+
'popup_category' : (Color.LIGHT_BLUE__BOLD, Color.BLACK),
55+
'popup_contrast' : (Color.WHITE, Color.DARK_GRAY),
56+
'popup_important' : (Color.LIGHT_RED__BOLD, Color.BLACK),
5657
'widget_disabled' : (Color.DARK_GRAY, Color.BLACK),
5758
'area:help' : (Color.WHITE, Color.DARK_GREEN),
5859
'area:msg' : (Color.WHITE, Color.BROWN),

zulipterminal/themes/zt_light.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
'column_title' : (Color.BLACK__BOLD, Color.WHITE),
2727
'time' : (Color.DARK_BLUE, Color.WHITE),
2828
'bar' : (Color.WHITE, Color.DARK_GRAY),
29-
'popup_contrast' : (Color.WHITE, Color.DARK_GRAY),
3029
'msg_emoji' : (Color.LIGHT_MAGENTA, Color.WHITE),
3130
'reaction' : (Color.LIGHT_MAGENTA__BOLD, Color.WHITE),
3231
'reaction_mine' : (Color.WHITE, Color.LIGHT_MAGENTA),
@@ -41,7 +40,6 @@
4140
'footer' : (Color.WHITE, Color.DARK_GRAY),
4241
'footer_contrast' : (Color.BLACK, Color.WHITE),
4342
'starred' : (Color.LIGHT_RED__BOLD, Color.WHITE),
44-
'popup_category' : (Color.DARK_GRAY__BOLD, Color.LIGHT_GRAY),
4543
'unread_count' : (Color.DARK_BLUE__BOLD, Color.WHITE),
4644
'starred_count' : (Color.BLACK, Color.WHITE),
4745
'table_head' : (Color.BLACK__BOLD, Color.WHITE),
@@ -53,6 +51,9 @@
5351
'current_user' : (Color.DARK_GRAY, Color.WHITE),
5452
'muted' : (Color.DARK_GRAY, Color.WHITE),
5553
'popup_border' : (Color.BLACK, Color.WHITE),
54+
'popup_category' : (Color.DARK_GRAY__BOLD, Color.LIGHT_GRAY),
55+
'popup_contrast' : (Color.WHITE, Color.DARK_GRAY),
56+
'popup_important' : (Color.LIGHT_RED__BOLD, Color.WHITE),
5657
'widget_disabled' : (Color.LIGHT_GRAY, Color.WHITE),
5758
'area:help' : (Color.BLACK, Color.LIGHT_GREEN),
5859
'area:stream' : (Color.BLACK, Color.LIGHT_BLUE),

0 commit comments

Comments
 (0)