From a7fe7ab6a3250c5518b58a36a86c0dc10265c81a Mon Sep 17 00:00:00 2001 From: Pogodaanton <8974778+Pogodaanton@users.noreply.github.com> Date: Sun, 2 Jul 2023 18:37:00 +0200 Subject: [PATCH 1/2] feat: Support Thunderbird 115.* fix: Adapt colors for new calendar UI feat: Add tab stripe color on hover --- manifest.json | 68 ++++++++++++++++++++++++++++++++++++++++++--------- style.css | 34 ++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 11 deletions(-) diff --git a/manifest.json b/manifest.json index 1ec24e9..cec6d72 100644 --- a/manifest.json +++ b/manifest.json @@ -5,8 +5,8 @@ "browser_specific_settings": { "gecko": { "id": "{96eca668-abbf-44cd-8bd3-91e485429d25}", - "strict_min_version": "100.0", - "strict_max_version": "102.*" + "strict_min_version": "115.0", + "strict_max_version": "116.*" } }, "description": "A faithful port of the original Cobalt2 theme by Wes Bos.", @@ -17,6 +17,7 @@ "tab_text": "#fff", "tab_selected": "#193549", "tab_line": "#ffc600", + "c_tab_line_hover": "rgba(255, 255, 255, 0.3)", "tab_loading": "#0088ff", "tab_background_text": "#aaaaaa", "tab_background_separator": "#15232d", @@ -35,14 +36,15 @@ "toolbar_top_separator": "#0d3a58", "toolbar_bottom_separator": "#0d3a58", "toolbar_vertical_separator": "#0d3a58", - "sidebar": "#193549", + "sidebar": "#15232d", "sidebar_text": "#cccccc", - "sidebar_border": "#3b5364", + "sidebar_border": "#0d3a58", + "c_sidebar_border_fix1": "transparent", "sidebar_highlight_border": "#193549", "sidebar_highlight": "#193549", "sidebar_highlight_text": "#fff", - "c_folder_pane": "#15232d", - "c_folder_pane_text": "#cccccc", + "c_tree_view_bg": "#193549", + "c_tree_view_color": "#cccccc", "popup": "#122738", "popup_text": "#ffffff", "popup_border": "#606060", @@ -50,11 +52,31 @@ "popup_highlight_text": "#ffffff", "button_background_hover": "rgba(255,255,255,0.15)", "button_background_active": "#0088ff", + "c_button_pressed_indicator_background": "#ffc600", + "c_button_pressed_indicator_border": "#ffc600", + "c_button_alt": "transparent", + "c_button_alt_border": "transparent", + "c_button_alt_hover": "rgba(255,255,255,0.15)", + "c_calendar": "#193549", "c_calendar_weekend": "rgba(81, 138, 178, 0.38)", - "c_calendar_today": "rgba(0, 0, 0, 0.4)", + "c_calendar_selected": "#0050a4", + "c_calendar_today": "#163042", "c_calendar_today_label": "#ffc600", "c_calendar_today_label_text": "#000", "c_calendar_today_label_border": "#ffc600", + "c_calendar_week_label": "transparent", + "c_calendar_minimonth": "#122738", + "c_calendar_minimonth_border": "#0d3a58", + "c_calendar_minimonth_week_color": "#ffc600", + "c_calendar_minimonth_today": "#15232d", + "c_calendar_minimonth_button": "transparent", + "c_calendar_minimonth_button_icon": "white", + "c_layout_background_0": "#122738", + "c_layout_background_1": "#193549", + "c_layout_background_2": "#0d3a58", + "c_layout_background_3": "#0e171d", + "c_layout_background_4": "#15232d", + "c_message_pane": "#15232d", "c_spaces": "#122738", "c_spaces_text": "#717d88", "c_spaces_active": "#15232d", @@ -69,18 +91,42 @@ "theme_experiment": { "stylesheet": "style.css", "colors": { - "c_folder_pane": "--folder-pane-background-color", - "c_folder_pane_text": "--folder-pane-text-color", + "c_layout_background_0": "--layout-background-0", + "c_layout_background_1": "--layout-background-1", + "c_layout_background_2": "--layout-background-2", + "c_layout_background_3": "--layout-background-3", + "c_layout_background_4": "--layout-background-4", + "c_message_pane": "--c-message-pane-box-background", + "c_tab_line_hover": "--c-tab-line-hover-background", + "c_calendar": "--viewBackground", + "c_calendar_label_text": "--viewMonthDayBoxLabelColor", "c_calendar_weekend": "--viewWeekendBackground", - "c_calendar_today": "--viewDayBoxSelectedBackground", + "c_calendar_selected": "--viewDayBoxSelectedBackground", + "c_calendar_today": "--viewTodayBackground", "c_calendar_today_label": "--viewTodayLabelBackground", "c_calendar_today_label_text": "--viewTodayLabelColor", "c_calendar_today_label_border": "--viewTodayBorderColor", + "c_calendar_week_label": "--viewMonthWeekLabelBackground", + "c_calendar_minimonth": "--cmmMainBackground", + "c_calendar_minimonth_color": "--cmmMainColor", + "c_calendar_minimonth_border": "--cmmMainBorderColor", + "c_calendar_minimonth_week_color": "--cmmDayWeekColor", + "c_calendar_minimonth_today": "--cmmDayTodayBackground", + "c_calendar_minimonth_button": "--cmmBoxBackground", + "c_calendar_minimonth_button_icon": "--cmmBoxColor", "c_spaces": "--spaces-bg-color", "c_spaces_text": "--spaces-button-text-color", "c_spaces_active": "--spaces-button-active-bg-color", "c_spaces_active_text": "--spaces-button-active-text-color", - "c_spaces_active_border": "--spaces-button-active-border-color" + "c_spaces_active_border": "--spaces-button-active-border-color", + "c_tree_view_bg": "--tree-view-bg", + "c_tree_view_color": "--tree-view-color", + "c_button_alt": "--button-background-color", + "c_button_alt_border": "--button-border-color", + "c_button_alt_hover": "--button-hover-background-color", + "c_button_pressed_indicator_background": "--button-pressed-indicator-background-color", + "c_button_pressed_indicator_border": "--button-pressed-indicator-border-color", + "c_sidebar_border_fix1": "--layout-border-0" } } } \ No newline at end of file diff --git a/style.css b/style.css index 8fe2cc1..fdececb 100644 --- a/style.css +++ b/style.css @@ -12,4 +12,38 @@ border-left-width: 2px; border-left-style: solid; margin-left: -2px; +} + +#threadPane #quick-filter-bar, #threadPane #threadPaneHeaderBar { + background-color: var(--toolbar-bgcolor); + border: none; +} + +/* mm variables are overridden by Thunderbird in dark mode, so we have to override *that* */ +/* TODO: Find an alternative to this ASAP */ +calendar-minimonth { + --mmMainBackground: var(--cmmMainBackground) !important; + --mmMainBorderColor: var(--cmmMainBorderColor) !important; + --mmMainColor: var(--cmmMainColor) !important; + --mmDayWeekColor: var(--cmmDayWeekColor) !important; + --mmDayTodayBackground: var(--cmmDayTodayBackground) !important; +} + +/* mm uses some other type of button */ +#calMinimonth .minimonth-header { + --mmBoxBackground: var(--cmmBoxBackground) !important; + fill: color-mix(in srgb, currentColor 20%, var(--cmmBoxColor)); + stroke: var(--cmmBoxColor); +} + +#calMinimonth .minimonth-nav-item { + border-color: transparent; +} + +#messagepanebox { + --layout-background-1: var(--c-message-pane-box-background) !important; +} + +.tabmail-tab:hover .tab-line:not([selected="true"]) { + background-color: var(--c-tab-line-hover-background); } \ No newline at end of file From a4c432af3781f0a0fddc6b511a2b87da5a4b471a Mon Sep 17 00:00:00 2001 From: Pogodaanton <8974778+Pogodaanton@users.noreply.github.com> Date: Mon, 10 Jul 2023 18:37:38 +0200 Subject: [PATCH 2/2] fix(mails): hover colors had low contrast misc: add vscode recommendation for easier color tweaking in editor --- .vscode/extensions.json | 5 +++++ .vscode/settings.json | 14 ++++++++++++++ manifest.json | 6 ++++-- style.css | 2 +- 4 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 .vscode/extensions.json create mode 100644 .vscode/settings.json diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..37f5bf8 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,5 @@ +{ + "recommendations": [ + "kamikillerto.vscode-colorize" + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..0326087 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,14 @@ +{ + "colorize.languages": [ + "json", + "css", + "sass", + "scss", + "less", + "postcss", + "sss", + "stylus", + "xml", + "svg" + ] +} \ No newline at end of file diff --git a/manifest.json b/manifest.json index cec6d72..8ae6b95 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "gecko": { "id": "{96eca668-abbf-44cd-8bd3-91e485429d25}", "strict_min_version": "115.0", - "strict_max_version": "116.*" + "strict_max_version": "117.*" } }, "description": "A faithful port of the original Cobalt2 theme by Wes Bos.", @@ -41,10 +41,11 @@ "sidebar_border": "#0d3a58", "c_sidebar_border_fix1": "transparent", "sidebar_highlight_border": "#193549", - "sidebar_highlight": "#193549", + "sidebar_highlight": "#1f4662", "sidebar_highlight_text": "#fff", "c_tree_view_bg": "#193549", "c_tree_view_color": "#cccccc", + "c_tree_view_header_hover": "#1f4662", "popup": "#122738", "popup_text": "#ffffff", "popup_border": "#606060", @@ -121,6 +122,7 @@ "c_spaces_active_border": "--spaces-button-active-border-color", "c_tree_view_bg": "--tree-view-bg", "c_tree_view_color": "--tree-view-color", + "c_tree_view_header_hover": "--tree-view-header-hover-bg", "c_button_alt": "--button-background-color", "c_button_alt_border": "--button-border-color", "c_button_alt_hover": "--button-hover-background-color", diff --git a/style.css b/style.css index fdececb..72f513c 100644 --- a/style.css +++ b/style.css @@ -40,7 +40,7 @@ calendar-minimonth { border-color: transparent; } -#messagepanebox { +#messagePane #messagepanebox { --layout-background-1: var(--c-message-pane-box-background) !important; }