From 67f1eaaa39cd74f1c250431af5abe7ef35d3cefa Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Mon, 16 Oct 2023 21:40:03 +0800 Subject: [PATCH] Fixed #958 --- src/other/firefox/Monterey/colors/dark.css | 28 +++++++++++++++++++ src/other/firefox/Monterey/colors/light.css | 28 +++++++++++++++++++ src/other/firefox/WhiteSur/colors/dark.css | 28 +++++++++++++++++++ src/other/firefox/WhiteSur/colors/light.css | 28 +++++++++++++++++++ .../common/parts/headerbar-private-urlbar.css | 5 ++++ src/sass/gtk/_common-3.0.scss | 2 +- 6 files changed, 118 insertions(+), 1 deletion(-) diff --git a/src/other/firefox/Monterey/colors/dark.css b/src/other/firefox/Monterey/colors/dark.css index f11a382f..9fb379d4 100644 --- a/src/other/firefox/Monterey/colors/dark.css +++ b/src/other/firefox/Monterey/colors/dark.css @@ -135,5 +135,33 @@ --gnome-convert-icon-to-symbolic-hack-filter: invert(100%) sepia(100%) grayscale(100%) brightness(200%) brightness(85%); --gnome-icons-hack-filter: invert(100%) sepia(100%) grayscale(100%) brightness(200%) brightness(200%); /* without invert: none */ --gnome-window-icons-hack-filter: invert(90%); /* without invert: none */ + + /* Private window colors */ + --gnome-private-accent: #78aeed; + + /* Toolbars */ + --gnome-private-toolbar-background: var(--gnome-headerbar-background); + --gnome-private-inactive-toolbar-background: var(--gnome-inactive-headerbar-background); + /* Menus */ + --gnome-private-menu-background: #383838; + /* Header bar */ + --gnome-private-headerbar-background: #252F49; + --gnome-private-inactive-headerbar-background: var(--gnome-private-toolbar-background); + /* Tabs */ + --gnome-private-tabbar-tab-hover-background: #343e56; /* Hardcoded color */ + --gnome-private-tabbar-tab-active-background: #343e56; /* Hardcoded color */ + --gnome-private-tabbar-tab-active-background-contrast: #495675; /* Hardcoded color */ + --gnome-private-tabbar-tab-active-hover-background: #414a61; /* Hardcoded color */ + --gnome-private-inactive-tabbar-tab-hover-background: #242c3f; /* Hardcoded color */ + --gnome-private-inactive-tabbar-tab-active-background: #272e41; /* Hardcoded color */ + + /* Text color for Firefox Logo in new private tab */ + --gnome-private-wordmark: #FBFBFE; + + /* New private tab background */ + --gnome-private-in-content-page-background: #242424; + + /* Private browsing info box */ + --gnome-private-text-primary-color: #FBFBFE; } } diff --git a/src/other/firefox/Monterey/colors/light.css b/src/other/firefox/Monterey/colors/light.css index 77bddd1c..9d3f18ee 100644 --- a/src/other/firefox/Monterey/colors/light.css +++ b/src/other/firefox/Monterey/colors/light.css @@ -134,4 +134,32 @@ --gnome-convert-icon-to-symbolic-hack-filter: invert(100%) sepia(100%) grayscale(100%) brightness(200%) brightness(85%) invert(100%); --gnome-icons-hack-filter: none; --gnome-window-icons-hack-filter: invert(30%); + + /* Private window colors */ + --gnome-private-accent: #1c71d8; + + /* Toolbars */ + --gnome-private-toolbar-background: var(--gnome-headerbar-background); + --gnome-private-inactive-toolbar-background: var(--gnome-inactive-headerbar-background); + /* Menus */ + --gnome-private-menu-background: #ffffff; + /* Header bar */ + --gnome-private-headerbar-background: #D7E3F0; + --gnome-private-inactive-headerbar-background: var(--gnome-private-toolbar-background); + /* Tabs */ + --gnome-private-tabbar-tab-hover-background: #cbd7e3; /* Hardcoded color */ + --gnome-private-tabbar-tab-active-background: #c6d1dd; /* Hardcoded color */ + --gnome-private-tabbar-tab-active-background-contrast: #a9b6c4; /* Hardcoded color */ + --gnome-private-tabbar-tab-active-hover-background: #c0cbd7; /* Hardcoded color */ + --gnome-private-inactive-tabbar-tab-hover-background: #e4e9f0; /* Hardcoded color */ + --gnome-private-inactive-tabbar-tab-active-background: #e1e7ed; /* Hardcoded color */ + + /* Text color for Firefox Logo in new private tab */ + --gnome-private-wordmark: #20123A; + + /* New private tab background */ + --gnome-private-in-content-page-background: #FAFAFA; + + /* Private browsing info box */ + --gnome-private-text-primary-color: #15141A; } diff --git a/src/other/firefox/WhiteSur/colors/dark.css b/src/other/firefox/WhiteSur/colors/dark.css index 74d743d1..4af61bd8 100644 --- a/src/other/firefox/WhiteSur/colors/dark.css +++ b/src/other/firefox/WhiteSur/colors/dark.css @@ -134,5 +134,33 @@ --gnome-convert-icon-to-symbolic-hack-filter: invert(100%) sepia(100%) grayscale(100%) brightness(200%) brightness(85%); --gnome-icons-hack-filter: invert(100%) sepia(100%) grayscale(100%) brightness(200%) brightness(200%); /* without invert: none */ --gnome-window-icons-hack-filter: invert(90%); /* without invert: none */ + + /* Private window colors */ + --gnome-private-accent: #78aeed; + + /* Toolbars */ + --gnome-private-toolbar-background: var(--gnome-headerbar-background); + --gnome-private-inactive-toolbar-background: var(--gnome-inactive-headerbar-background); + /* Menus */ + --gnome-private-menu-background: #383838; + /* Header bar */ + --gnome-private-headerbar-background: #252F49; + --gnome-private-inactive-headerbar-background: var(--gnome-private-toolbar-background); + /* Tabs */ + --gnome-private-tabbar-tab-hover-background: #343e56; /* Hardcoded color */ + --gnome-private-tabbar-tab-active-background: #343e56; /* Hardcoded color */ + --gnome-private-tabbar-tab-active-background-contrast: #495675; /* Hardcoded color */ + --gnome-private-tabbar-tab-active-hover-background: #414a61; /* Hardcoded color */ + --gnome-private-inactive-tabbar-tab-hover-background: #242c3f; /* Hardcoded color */ + --gnome-private-inactive-tabbar-tab-active-background: #272e41; /* Hardcoded color */ + + /* Text color for Firefox Logo in new private tab */ + --gnome-private-wordmark: #FBFBFE; + + /* New private tab background */ + --gnome-private-in-content-page-background: #242424; + + /* Private browsing info box */ + --gnome-private-text-primary-color: #FBFBFE; } } diff --git a/src/other/firefox/WhiteSur/colors/light.css b/src/other/firefox/WhiteSur/colors/light.css index 642b8add..b462af41 100644 --- a/src/other/firefox/WhiteSur/colors/light.css +++ b/src/other/firefox/WhiteSur/colors/light.css @@ -132,4 +132,32 @@ --gnome-convert-icon-to-symbolic-hack-filter: invert(100%) sepia(100%) grayscale(100%) brightness(200%) brightness(85%) invert(100%); --gnome-icons-hack-filter: none; --gnome-window-icons-hack-filter: invert(30%); + + /* Private window colors */ + --gnome-private-accent: #1c71d8; + + /* Toolbars */ + --gnome-private-toolbar-background: var(--gnome-headerbar-background); + --gnome-private-inactive-toolbar-background: var(--gnome-inactive-headerbar-background); + /* Menus */ + --gnome-private-menu-background: #ffffff; + /* Header bar */ + --gnome-private-headerbar-background: #D7E3F0; + --gnome-private-inactive-headerbar-background: var(--gnome-private-toolbar-background); + /* Tabs */ + --gnome-private-tabbar-tab-hover-background: #cbd7e3; /* Hardcoded color */ + --gnome-private-tabbar-tab-active-background: #c6d1dd; /* Hardcoded color */ + --gnome-private-tabbar-tab-active-background-contrast: #a9b6c4; /* Hardcoded color */ + --gnome-private-tabbar-tab-active-hover-background: #c0cbd7; /* Hardcoded color */ + --gnome-private-inactive-tabbar-tab-hover-background: #e4e9f0; /* Hardcoded color */ + --gnome-private-inactive-tabbar-tab-active-background: #e1e7ed; /* Hardcoded color */ + + /* Text color for Firefox Logo in new private tab */ + --gnome-private-wordmark: #20123A; + + /* New private tab background */ + --gnome-private-in-content-page-background: #FAFAFA; + + /* Private browsing info box */ + --gnome-private-text-primary-color: #15141A; } diff --git a/src/other/firefox/common/parts/headerbar-private-urlbar.css b/src/other/firefox/common/parts/headerbar-private-urlbar.css index 427801e6..3f0b2154 100644 --- a/src/other/firefox/common/parts/headerbar-private-urlbar.css +++ b/src/other/firefox/common/parts/headerbar-private-urlbar.css @@ -2,6 +2,11 @@ @namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); +/* Hide tabsbar default private browsing indicator */ +#private-browsing-indicator-with-label { + display: none !important; +} + :root[privatebrowsingmode="temporary"] #nav-bar toolbarspring:first-of-type:before { background: url("../icons/user-not-tracked.svg") no-repeat; background-size: contain; diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss index 444c16fa..9e7505e5 100644 --- a/src/sass/gtk/_common-3.0.scss +++ b/src/sass/gtk/_common-3.0.scss @@ -28,7 +28,7 @@ $cakeisalie: "This stylesheet is generated, DO NOT EDIT"; -gtk-secondary-caret-color: $selected_bg_color; } -$side_style_shadow: linear-gradient(to left, rgba(black, if($variant == 'light', 0.04, 0.12)), transparent 6px); +$side_style_shadow: linear-gradient(to left, rgba(black, if($variant == 'light', 0.02, 0.1)), transparent 6px); %side_style_left { background-image: $side_style_shadow;