From d90ec3467c0d014ab1852cc0ca3f6af0a79cfd29 Mon Sep 17 00:00:00 2001 From: RealStickman Date: Wed, 27 Jul 2022 12:54:37 +0200 Subject: [PATCH 1/4] Rsync changes - use -t to update time (remote user needs to be file owner) - use -v instead of --progress (less output) - add -z for compression if possible --- arch-config/scripts/in_path/sc-manga-update | 44 ++++++++++----------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/arch-config/scripts/in_path/sc-manga-update b/arch-config/scripts/in_path/sc-manga-update index e258c8af..256424ba 100755 --- a/arch-config/scripts/in_path/sc-manga-update +++ b/arch-config/scripts/in_path/sc-manga-update @@ -10,45 +10,45 @@ sshkeypath=$HOME/.ssh/id_ed25519 # transfer to kavita # books -echo Kavita books -rsync -ur --progress --bwlimit=4M -e "ssh -i $sshkeypath -p $port" /home/marc/Nextcloud/Books/Unterhaltung/ ${user}@${server}:/mnt/books/kavita/books/ +echo Kavita books upload +rsync -urtzv --bwlimit=4M -e "ssh -i $sshkeypath -p $port" /home/marc/Nextcloud/Books/Unterhaltung/ ${user}@${server}:/mnt/books/kavita/books/ # manga -echo Kavita manga -rsync -ur --progress --bwlimit=4M -e "ssh -i $sshkeypath -p $port" /home/marc/Nextcloud/Books/Manga/ ${user}@${server}:/mnt/books/kavita/manga/ +echo Kavita manga upload +rsync -urtzv --bwlimit=4M -e "ssh -i $sshkeypath -p $port" /home/marc/Nextcloud/Books/Manga/ ${user}@${server}:/mnt/books/kavita/manga/ # Tech -echo Kavita tech -rsync -ur --progress --bwlimit=4M -e "ssh -i $sshkeypath -p $port" /home/marc/Nextcloud/Books/Tech/ ${user}@${server}:/mnt/books/kavita/tech/ +echo Kavita tech upload +rsync -urtzv --bwlimit=4M -e "ssh -i $sshkeypath -p $port" /home/marc/Nextcloud/Books/Tech/ ${user}@${server}:/mnt/books/kavita/tech/ # other -echo Kavita other -rsync -ur --progress --bwlimit=4M -e "ssh -i $sshkeypath -p $port" /home/marc/Nextcloud/Books/other/ ${user}@${server}:/mnt/books/kavita/other/ +echo Kavita other upload +rsync -urtzv --bwlimit=4M -e "ssh -i $sshkeypath -p $port" /home/marc/Nextcloud/Books/other/ ${user}@${server}:/mnt/books/kavita/other/ # transfer to komga # TODO # transfer to kavita-nightly # books -echo Kavita Nightly books -rsync -ur --progress --bwlimit=4M -e "ssh -i $sshkeypath -p $port" /home/marc/Nextcloud/Books/Unterhaltung/ ${user}@${server}:/mnt/books/kavita-nightly/books/ +echo Kavita Nightly books upload +rsync -urtzv --bwlimit=4M -e "ssh -i $sshkeypath -p $port" /home/marc/Nextcloud/Books/Unterhaltung/ ${user}@${server}:/mnt/books/kavita-nightly/books/ # manga -echo Kavita Nightly manga -rsync -ur --progress --bwlimit=4M -e "ssh -i $sshkeypath -p $port" /home/marc/Nextcloud/Books/Manga/ ${user}@${server}:/mnt/books/kavita-nightly/manga/ +echo Kavita Nightly manga upload +rsync -urtzv --bwlimit=4M -e "ssh -i $sshkeypath -p $port" /home/marc/Nextcloud/Books/Manga/ ${user}@${server}:/mnt/books/kavita-nightly/manga/ # Tech -echo Kavita Nightly tech -rsync -ur --progress --bwlimit=4M -e "ssh -i $sshkeypath -p $port" /home/marc/Nextcloud/Books/Tech/ ${user}@${server}:/mnt/books/kavita-nightly/tech/ +echo Kavita Nightly tech upload +rsync -urtzv --bwlimit=4M -e "ssh -i $sshkeypath -p $port" /home/marc/Nextcloud/Books/Tech/ ${user}@${server}:/mnt/books/kavita-nightly/tech/ # other -echo Kavita Nightly other -rsync -ur --progress --bwlimit=4M -e "ssh -i $sshkeypath -p $port" /home/marc/Nextcloud/Books/other/ ${user}@${server}:/mnt/books/kavita-nightly/other/ +echo Kavita Nightly other upload +rsync -urtzv --bwlimit=4M -e "ssh -i $sshkeypath -p $port" /home/marc/Nextcloud/Books/other/ ${user}@${server}:/mnt/books/kavita-nightly/other/ # download from kavita # books #echo Downloading books #rsync -ur --progress --bwlimit=4M -e "ssh -i $sshkeypath -p $port" ${user}@${server}:/mnt/books/kavita/books/ /home/marc/Nextcloud/Books/Unterhaltung/ # manga -echo Downloading manga -rsync -ur --progress --bwlimit=4M -e "ssh -i $sshkeypath -p $port" ${user}@${server}:/mnt/books/kavita/manga/ /home/marc/Nextcloud/Books/Manga/ +echo Kavita manga download +rsync -urtzv --bwlimit=4M -e "ssh -i $sshkeypath -p $port" ${user}@${server}:/mnt/books/kavita/manga/ /home/marc/Nextcloud/Books/Manga/ # Tech -echo Downloading tech -rsync -ur --progress --bwlimit=4M -e "ssh -i $sshkeypath -p $port" ${user}@${server}:/mnt/books/kavita/tech/ /home/marc/Nextcloud/Books/Tech/ +#echo Downloading tech +#rsync -ur --progress --bwlimit=4M -e "ssh -i $sshkeypath -p $port" ${user}@${server}:/mnt/books/kavita/tech/ /home/marc/Nextcloud/Books/Tech/ # other -echo Downloading other -rsync -ur --progress --bwlimit=4M -e "ssh -i $sshkeypath -p $port" ${user}@${server}:/mnt/books/kavita/other/ /home/marc/Nextcloud/Books/other/ +#echo Downloading other +#rsync -ur --progress --bwlimit=4M -e "ssh -i $sshkeypath -p $port" ${user}@${server}:/mnt/books/kavita/other/ /home/marc/Nextcloud/Books/other/ From 5d6aeff87bfe37d58dc718f07aeb96700d52dd6d Mon Sep 17 00:00:00 2001 From: RealStickman Date: Wed, 27 Jul 2022 14:42:14 +0200 Subject: [PATCH 2/4] Fix spacing --- arch-config/scripts/in_path/sc-manga-update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch-config/scripts/in_path/sc-manga-update b/arch-config/scripts/in_path/sc-manga-update index 256424ba..65a86870 100755 --- a/arch-config/scripts/in_path/sc-manga-update +++ b/arch-config/scripts/in_path/sc-manga-update @@ -11,7 +11,7 @@ sshkeypath=$HOME/.ssh/id_ed25519 # transfer to kavita # books echo Kavita books upload -rsync -urtzv --bwlimit=4M -e "ssh -i $sshkeypath -p $port" /home/marc/Nextcloud/Books/Unterhaltung/ ${user}@${server}:/mnt/books/kavita/books/ +rsync -urtzv --bwlimit=4M -e "ssh -i $sshkeypath -p $port" /home/marc/Nextcloud/Books/Unterhaltung/ ${user}@${server}:/mnt/books/kavita/books/ # manga echo Kavita manga upload rsync -urtzv --bwlimit=4M -e "ssh -i $sshkeypath -p $port" /home/marc/Nextcloud/Books/Manga/ ${user}@${server}:/mnt/books/kavita/manga/ From 97c75c3319eb47e4594210043a4e9dedd9f85a07 Mon Sep 17 00:00:00 2001 From: RealStickman Date: Wed, 27 Jul 2022 15:53:22 +0200 Subject: [PATCH 3/4] Update to lepton 5.3.0 --- .../firefox/default-release/chrome/LEPTON | 2 +- .../chrome/__tests__/accent_color.test.scss | 62 +++ .../chrome/css/leptonChrome.css | 370 ++++++++++++++---- .../chrome/css/leptonContent.css | 170 +++++++- .../chrome/docs/Restrictions.md | 12 + .../chrome/icons/arrow-between-down.svg | 3 + .../chrome/icons/auto-fit-width.svg | 3 + .../default-release/chrome/install.ps1 | 2 +- .../chrome/src/compatibility/_os.scss | 4 +- .../chrome/src/contents/_activity_stream.scss | 6 + .../chrome/src/contents/_proton_color.scss | 4 +- .../chrome/src/decoration/_field_border.scss | 8 +- .../chrome/src/icons/_activity_stream.scss | 41 ++ .../chrome/src/icons/_global_menu.scss | 23 ++ .../src/icons/_layout_activity_stream.scss | 16 + .../chrome/src/icons/_layout_menu.scss | 8 +- .../chrome/src/icons/_layout_menu_common.scss | 2 +- .../chrome/src/icons/_layout_panel.scss | 6 +- .../chrome/src/icons/_panel.scss | 9 +- .../chrome/src/leptonChrome.scss | 1 + .../chrome/src/leptonContent.scss | 1 + .../chrome/src/padding/_menu.scss | 4 + .../tabbar/clipped_tab/_letters_cleary.scss | 25 +- .../tabbar/newtab_button/_looks_like_tab.scss | 32 +- .../unselected_tab/_dynamic_separator.scss | 5 +- .../chrome/src/theme/_fully_color.scss | 6 +- .../theme/proton_chrome/_proton_commons.scss | 4 +- .../src/theme/system_default_theme/_gtk.scss | 4 +- .../src/theme/system_default_theme/_mac.scss | 20 +- .../_urlbar_focus_color.scss | 24 +- .../theme/system_default_theme/_win10.scss | 42 +- .../chrome/src/utils/_accent_color.scss | 21 + .../chrome/src/utils/_proton_elements.scss | 69 ++-- .../.mozilla/firefox/default-release/prefs.js | 162 ++++---- .../.mozilla/firefox/default-release/user.js | 22 +- 35 files changed, 911 insertions(+), 282 deletions(-) create mode 100644 arch-config/.mozilla/firefox/default-release/chrome/__tests__/accent_color.test.scss create mode 100644 arch-config/.mozilla/firefox/default-release/chrome/icons/arrow-between-down.svg create mode 100644 arch-config/.mozilla/firefox/default-release/chrome/icons/auto-fit-width.svg create mode 100644 arch-config/.mozilla/firefox/default-release/chrome/src/icons/_activity_stream.scss create mode 100644 arch-config/.mozilla/firefox/default-release/chrome/src/icons/_layout_activity_stream.scss create mode 100644 arch-config/.mozilla/firefox/default-release/chrome/src/utils/_accent_color.scss diff --git a/arch-config/.mozilla/firefox/default-release/chrome/LEPTON b/arch-config/.mozilla/firefox/default-release/chrome/LEPTON index 5e79670c..1ed9c7ac 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/LEPTON +++ b/arch-config/.mozilla/firefox/default-release/chrome/LEPTON @@ -1,3 +1,3 @@ [Info] -Ver=v5.2.1 +Ver=v5.3.0 Branch=photon-style diff --git a/arch-config/.mozilla/firefox/default-release/chrome/__tests__/accent_color.test.scss b/arch-config/.mozilla/firefox/default-release/chrome/__tests__/accent_color.test.scss new file mode 100644 index 00000000..fe22ef83 --- /dev/null +++ b/arch-config/.mozilla/firefox/default-release/chrome/__tests__/accent_color.test.scss @@ -0,0 +1,62 @@ +@use "true" as *; +@use "../src/utils/accent_color" as *; + +@include test-module("Accent Color Option [mix]") { + @include test("simple") { + @include assert { + @include output { + @include AccentColor { + body { + background-color: $accentColor; + color: $accentTextColor; + } + } + } + @include expect { + body { + background-color: AccentColor; + color: AccentColorText; + } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + body { + background-color: -moz-accent-color; + color: -moz-accent-color-foreground; + } + } + } + } + } + @include test("css var") { + @include assert { + @include output { + :root { + @include AccentColor { + // Don't use like this!! + --uc-accent-color: $accentColor; + --uc-accent-text-color: $accentTextColor; + + // Use like this + --uc-accent-color: #{$accentColor}; + --uc-accent-text-color: #{$accentTextColor}; + } + } + } + @include expect { + :root { + --uc-accent-color: $accentColor; + --uc-accent-text-color: $accentTextColor; + --uc-accent-color: AccentColor; + --uc-accent-text-color: AccentColorText; + } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + :root { + --uc-accent-color: $accentColor; + --uc-accent-text-color: $accentTextColor; + --uc-accent-color: -moz-accent-color; + --uc-accent-text-color: -moz-accent-color-foreground; + } + } + } + } + } +} diff --git a/arch-config/.mozilla/firefox/default-release/chrome/css/leptonChrome.css b/arch-config/.mozilla/firefox/default-release/chrome/css/leptonChrome.css index 4e9a9792..90a20748 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/css/leptonChrome.css +++ b/arch-config/.mozilla/firefox/default-release/chrome/css/leptonChrome.css @@ -146,7 +146,12 @@ } @media (-moz-windows-accent-color-in-titlebar) { :root[sizemode="normal"][tabsintitlebar] #navigator-toolbox { - border-top-color: -moz-accent-color !important; + border-top-color: AccentColor !important; + } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + :root[sizemode="normal"][tabsintitlebar] #navigator-toolbox { + border-top-color: -moz-accent-color !important; + } } } } @@ -351,16 +356,31 @@ /* URL Bar */ :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme), :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) { - --focus-outline-color: -moz-accent-color !important; + --focus-outline-color: AccentColor !important; } :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme) #urlbar[open] > #urlbar-background, :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) #urlbar[open] > #urlbar-background { - border-color: color-mix(in srgb, -moz-accent-color 50%, transparent) !important; + border-color: color-mix(in srgb, AccentColor 50%, transparent) !important; /* Like: --toolbar-field-focus-border-color */ } + + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme), + :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) { + --focus-outline-color: -moz-accent-color !important; + } + + :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme) #urlbar[open] > #urlbar-background, + :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) + #urlbar[open] + > #urlbar-background { + border-color: color-mix(in srgb, -moz-accent-color 50%, transparent) !important; + /* Like: --toolbar-field-focus-border-color */ + } + } } /*= Windows7 - Aero Based Theme ==============================================*/ @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7) { @@ -418,11 +438,20 @@ --win-shorcut-text-color: #757575; --win-error-color: #b31616; --win-red-border-color: #ff4343; - --win-accent-forground-color: -moz-accent-color-foreground; - --win-accent-color: color-mix(in srgb, rgba(0, 0, 0, 0.8) 10%, -moz-accent-color); - --win-accent-content-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 15%, -moz-accent-color); - --win-accent-hover-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 27%, -moz-accent-color); - --win-accent-active-color: -moz-accent-color; + --win-accent-forground-color: AccentColorText; + --win-accent-color: color-mix(in srgb, rgba(0, 0, 0, 0.8) 10%, AccentColor); + --win-accent-content-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 15%, AccentColor); + --win-accent-hover-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 27%, AccentColor); + --win-accent-active-color: AccentColor; + } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + :root:not(:-moz-lwtheme) { + --win-accent-forground-color: -moz-accent-color-foreground; + --win-accent-color: color-mix(in srgb, rgba(0, 0, 0, 0.8) 10%, -moz-accent-color); + --win-accent-content-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 15%, -moz-accent-color); + --win-accent-hover-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 27%, -moz-accent-color); + --win-accent-active-color: -moz-accent-color; + } } @media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) { @@ -450,10 +479,19 @@ --win-shorcut-text-color: #adadad; --win-error-color: #ffb900; --win-red-border-color: #ff4343; - --win-accent-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 20%, -moz-accent-color); - --win-accent-content-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 35%, -moz-accent-color); - --win-accent-hover-color: color-mix(in srgb, rgba(0, 0, 0, 0.8) 5%, -moz-accent-color); - --win-accent-active-color: -moz-accent-color; + --win-accent-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 20%, AccentColor); + --win-accent-content-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 35%, AccentColor); + --win-accent-hover-color: color-mix(in srgb, rgba(0, 0, 0, 0.8) 5%, AccentColor); + --win-accent-active-color: AccentColor; + } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + :root:not(:-moz-lwtheme), + :root[lwt-default-theme-in-dark-mode] { + --win-accent-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 20%, -moz-accent-color); + --win-accent-content-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 35%, -moz-accent-color); + --win-accent-hover-color: color-mix(in srgb, rgba(0, 0, 0, 0.8) 5%, -moz-accent-color); + --win-accent-active-color: -moz-accent-color; + } } } :root:not(:-moz-lwtheme), @@ -482,8 +520,7 @@ /* Text Shortcut Color */ --panel-shortcut-color: var(--win-shorcut-text-color) !important; --panel-description-color: var(--win-shorcut-text-color) !important; - /* Title Background, Border Color */ - --menu-border-color: var(--win-bgcolor) !important; + /* Title Background */ --lwt-accent-color: var(--win-bgcolor) !important; --toolbar-field-border-color: var(--win-bgcolor) !important; --chrome-content-separator-color: var(--win-bgcolor) !important; @@ -493,6 +530,7 @@ --toolbar-non-lwt-bgcolor: var(--win-component-bgcolor) !important; --arrowpanel-background: var(--win-component-bgcolor) !important; --autocomplete-popup-background: var(--win-component-bgcolor) !important; + /* Border Color */ /* Seperator */ --toolbarseparator-color: var(--win-tab-seperator-color) !important; /* Field Backround Color */ @@ -636,7 +674,7 @@ .sidebar-panel[style="--newtab-background-color: rgb(43, 42, 51); --newtab-text-primary-color: rgba(251, 251, 254, 1); --lwt-sidebar-background-color: rgb(56, 56, 61); --lwt-sidebar-text-color: rgba(249, 249, 250, 1);"], body[lwt-sidebar][style="--newtab-background-color: rgb(43, 42, 51); --newtab-text-primary-color: rgba(251, 251, 254, 1); --lwt-sidebar-background-color: rgb(56, 56, 61); --lwt-sidebar-text-color: rgba(249, 249, 250, 1);"] { /* Only darkmode has more: --newtab-background-color-secondary: rgba(66, 65, 77, 1); */ - --lwt-sidebar-background-color: transparent !important; + --lwt-sidebar-background-color: var(--win-sidebar-bgcolor) !important; --lwt-sidebar-text-color: var(--win-text-color) !important; } } @@ -704,20 +742,39 @@ /* Tab Bar */ :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme) .titlebar-color, :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) .titlebar-color { - color: -moz-accent-color-foreground; - background-color: -moz-accent-color; + color: AccentColorText; + background-color: AccentColor; + } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme) .titlebar-color, + :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) .titlebar-color { + color: -moz-accent-color-foreground; + background-color: -moz-accent-color; + } } :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme) .toolbar-items, :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) .toolbar-items { --toolbarbutton-icon-fill: currentColor; - --toolbarbutton-hover-background: color-mix(in srgb, -moz-accent-color-foreground 10%, transparent); - --toolbarbutton-active-background: color-mix(in srgb, -moz-accent-color-foreground 15%, transparent); + --toolbarbutton-hover-background: color-mix(in srgb, AccentColorText 10%, transparent); + --toolbarbutton-active-background: color-mix(in srgb, AccentColorText 15%, transparent); + } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme) .toolbar-items, + :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) .toolbar-items { + --toolbarbutton-hover-background: color-mix(in srgb, -moz-accent-color-foreground 10%, transparent); + --toolbarbutton-active-background: color-mix(in srgb, -moz-accent-color-foreground 15%, transparent); + } } } /*= GTK - URL View url accent color ==========================================*/ @media (-moz-gtk-csd-available) { :root:not(:-moz-lwtheme) .urlbarView-url { - --urlbar-popup-url-color: -moz-accent-color; + --urlbar-popup-url-color: AccentColor; + } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + :root:not(:-moz-lwtheme) .urlbarView-url { + --urlbar-popup-url-color: -moz-accent-color; + } } /* Nightly Compatibility */ @@ -743,14 +800,14 @@ --mac-sidebar-hover-bgcolor: color-mix(in srgb, ButtonFace 60%, var(--mac-sidebar-bgcolor)); --mac-hover-bgcolor: Window; --mac-disabled-bgcolor: transparent; - --mac-primary-button-color: -moz-accent-color-foreground; + --mac-primary-button-color: AccentColorText; /* or -moz-mac-menutextselect */ - --mac-accent-color: -moz-accent-color; + --mac-accent-color: AccentColor; /* or LinkText */ - --mac-accent-content-color: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-accent-color); - --mac-accent-hover-color: color-mix(in srgb, rgb(0, 0, 0) 10%, -moz-accent-color); + --mac-accent-content-color: color-mix(in srgb, rgb(255, 255, 255) 15%, AccentColor); + --mac-accent-hover-color: color-mix(in srgb, rgb(0, 0, 0) 10%, AccentColor); /* or -moz-mac-menuselect, Highlight */ - --mac-accent-active-color: color-mix(in srgb, rgb(0, 0, 0) 20%, -moz-accent-color); + --mac-accent-active-color: color-mix(in srgb, rgb(0, 0, 0) 20%, AccentColor); /* or ActiveBorder */ /* Text, Icon Color */ --menu-color: var(--mac-text-color) !important; @@ -857,6 +914,20 @@ --download-progress-flare-color: rgba(255, 255, 255, 0.75) !important; --panelview-toolbarbutton-focus-box-shadow: inset 0 0 0 2px var(--focus-outline-color) !important; } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + :root:not(:-moz-lwtheme), + :root[lwt-default-theme-in-dark-mode] { + --mac-primary-button-color: -moz-accent-color-foreground; + /* or -moz-mac-menutextselect */ + --mac-accent-color: -moz-accent-color; + /* or LinkText */ + --mac-accent-content-color: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-accent-color); + --mac-accent-hover-color: color-mix(in srgb, rgb(0, 0, 0) 10%, -moz-accent-color); + /* or -moz-mac-menuselect, Highlight */ + --mac-accent-active-color: color-mix(in srgb, rgb(0, 0, 0) 20%, -moz-accent-color); + /* or ActiveBorder */ + } + } @media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) { :root:not(:-moz-lwtheme), @@ -1356,9 +1427,17 @@ .sidebar-panel:not([lwt-sidebar]) #search-box[focused="true"], body:not([lwt-sidebar]) xul|search-textbox.tabsFilter[focused="true"] { - border-color: -moz-accent-color !important; + border-color: AccentColor !important; /* Hard Coded */ - outline-color: -moz-accent-color !important; + outline-color: AccentColor !important; + } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + .sidebar-panel:not([lwt-sidebar]) #search-box[focused="true"], + body:not([lwt-sidebar]) xul|search-textbox.tabsFilter[focused="true"] { + border-color: -moz-accent-color !important; + /* Hard Coded */ + outline-color: -moz-accent-color !important; + } } /*= PopupAutoComplete ========================================================*/ @@ -1715,61 +1794,116 @@ .checkbox-check[checked] { -moz-context-properties: fill !important; fill: currentColor !important; - color: var(--checkbox-checked-color, -moz-accent-color-foreground) !important; border-color: var(--checkbox-checked-border-color, transparent) !important; - background-color: var(--checkbox-checked-bgcolor, -moz-accent-color) !important; background-image: url("chrome://global/skin/icons/check.svg") !important; background-position: center !important; background-repeat: no-repeat !important; /* Style the button also when printing with "Print Backgrounds" unchecked */ color-adjust: exact !important; + color: var(--checkbox-checked-color, AccentColorText) !important; + background-color: var(--checkbox-checked-bgcolor, AccentColor) !important; + } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + .checkbox-check[checked] { + color: var(--checkbox-checked-color, -moz-accent-color-foreground) !important; + background-color: var(--checkbox-checked-bgcolor, -moz-accent-color) !important; + } } checkbox:not([disabled="true"]):hover > .checkbox-check { - background-color: var( - --checkbox-unchecked-hover-bgcolor, - color-mix(in srgb, -moz-accent-color 4%, Field) - ) !important; + background-color: var(--checkbox-unchecked-hover-bgcolor, color-mix(in srgb, AccentColor 4%, Field)) !important; + } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + checkbox:not([disabled="true"]):hover > .checkbox-check { + background-color: var( + --checkbox-unchecked-hover-bgcolor, + color-mix(in srgb, -moz-accent-color 4%, Field) + ) !important; + } } checkbox:not([disabled="true"]):hover:active > .checkbox-check { - background-color: var( - --checkbox-unchecked-active-bgcolor, - color-mix(in srgb, -moz-accent-color 8%, Field) - ) !important; + background-color: var(--checkbox-unchecked-active-bgcolor, color-mix(in srgb, AccentColor 8%, Field)) !important; + } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + checkbox:not([disabled="true"]):hover:active > .checkbox-check { + background-color: var( + --checkbox-unchecked-active-bgcolor, + color-mix(in srgb, -moz-accent-color 8%, Field) + ) !important; + } } checkbox:not([disabled="true"]):hover > .checkbox-check[checked] { background-color: var( --checkbox-checked-hover-bgcolor, - color-mix(in srgb, currentColor 12.5%, -moz-accent-color) + color-mix(in srgb, currentColor 12.5%, AccentColor) ) !important; } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + checkbox:not([disabled="true"]):hover > .checkbox-check[checked] { + background-color: var( + --checkbox-checked-hover-bgcolor, + color-mix(in srgb, currentColor 12.5%, -moz-accent-color) + ) !important; + } + } checkbox:not([disabled="true"]):hover:active > .checkbox-check[checked] { background-color: var( --checkbox-checked-active-bgcolor, - color-mix(in srgb, currentColor 25%, -moz-accent-color) + color-mix(in srgb, currentColor 25%, AccentColor) ) !important; } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + checkbox:not([disabled="true"]):hover:active > .checkbox-check[checked] { + background-color: var( + --checkbox-checked-active-bgcolor, + color-mix(in srgb, currentColor 25%, -moz-accent-color) + ) !important; + } + } checkbox:-moz-focusring > .checkbox-check { - outline: 2px solid var(--focus-outline-color, -moz-accent-color) !important; + outline: 2px solid var(--focus-outline-color, AccentColor) !important; outline-offset: var(--focus-outline-offset, 2px) !important; } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + checkbox:-moz-focusring > .checkbox-check { + outline: 2px solid var(--focus-outline-color, -moz-accent-color) !important; + } + } @media (prefers-contrast) { checkbox:not([disabled="true"]):hover > .checkbox-check { /* color will set the border-color on the check due to how HCM works for in-content pages. */ - color: var(--checkbox-checked-border-color, color-mix(in srgb, -moz-accent-color 4%, Field)) !important; + color: var(--checkbox-checked-border-color, color-mix(in srgb, AccentColor 4%, Field)) !important; + } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + checkbox:not([disabled="true"]):hover > .checkbox-check { + /* color will set the border-color on the check due to how HCM works for in-content pages. */ + color: var(--checkbox-checked-border-color, color-mix(in srgb, -moz-accent-color 4%, Field)) !important; + } } .checkbox-check[checked] { color: var(--checkbox-checked-border-color, currentColor) !important; - fill: var(--checkbox-checked-color, -moz-accent-color-foreground) !important; + fill: var(--checkbox-checked-color, AccentColorText) !important; + } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + .checkbox-check[checked] { + fill: var(--checkbox-checked-color, -moz-accent-color-foreground) !important; + } } checkbox:not([disabled="true"]):hover:active > .checkbox-check[checked] > .checkbox-check[checked], checkbox:not([disabled="true"]):hover > .checkbox-check[checked] > .checkbox-check[checked] { - color: var(--checkbox-checked-border-color-hover, -moz-accent-color-foreground) !important; - fill: var(--checkbox-checked-border-color-hover, -moz-accent-color-foreground) !important; + color: var(--checkbox-checked-border-color-hover, AccentColorText) !important; + fill: var(--checkbox-checked-border-color-hover, AccentColorText) !important; + } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + checkbox:not([disabled="true"]):hover:active > .checkbox-check[checked] > .checkbox-check[checked], + checkbox:not([disabled="true"]):hover > .checkbox-check[checked] > .checkbox-check[checked] { + color: var(--checkbox-checked-border-color-hover, -moz-accent-color-foreground) !important; + fill: var(--checkbox-checked-border-color-hover, -moz-accent-color-foreground) !important; + } } } .checkbox-icon[src] { @@ -1815,9 +1949,14 @@ background-color: var(--button-active-bgcolor, color-mix(in srgb, currentColor 20%, ButtonFace)) !important; } xul|menulist:-moz-focusring { - outline: 2px solid var(--focus-outline-color, -moz-accent-color) !important; + outline: 2px solid var(--focus-outline-color, AccentColor) !important; outline-offset: var(--focus-outline-offset, 2px) !important; } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + xul|menulist:-moz-focusring { + outline: 2px solid var(--focus-outline-color, -moz-accent-color) !important; + } + } #label-box { -moz-box-align: center !important; @@ -2681,14 +2820,27 @@ .sidebar-panel:not([lwt-sidebar]) #search-box:hover, body:not([lwt-sidebar]) xul|search-textbox.tabsFilter:hover { - border-color: -moz-accent-color !important; + border-color: AccentColor !important; + } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + .sidebar-panel:not([lwt-sidebar]) #search-box:hover, + body:not([lwt-sidebar]) xul|search-textbox.tabsFilter:hover { + border-color: -moz-accent-color !important; + } } /* Others */ #editBMPanel_namePicker:hover, #editBMPanel_tagsField:hover, .findbar-container .findbar-textbox:hover { - --input-border-color: color-mix(in srgb, var(--focus-outline-color, -moz-accent-color) 50%, transparent); + --input-border-color: color-mix(in srgb, var(--focus-outline-color, AccentColor) 50%, transparent); + } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + #editBMPanel_namePicker:hover, + #editBMPanel_tagsField:hover, + .findbar-container .findbar-textbox:hover { + --input-border-color: color-mix(in srgb, var(--focus-outline-color, -moz-accent-color) 50%, transparent); + } } } /*= Downloads Panel ========================================================*/ @@ -3448,6 +3600,12 @@ #ContentSelectDropdown > menupopup > menuitem { padding-block: 0 !important; } + @media (-moz-gtk-csd-available) { + #ContentSelectDropdown > menupopup > menucaption, + #ContentSelectDropdown > menupopup > menuitem { + padding-block: var(--menu-padding) !important; + } + } @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { :root:not([uidensity="touch"]) .menu-text, @@ -4400,7 +4558,11 @@ .tab-background::before, #navigator-toolbox:not([movingtab]) .tabbrowser-tab[last-visible-tab]:is([visuallyselected], [multiselected], :hover) - ~ #tabs-newtab-button::before { + ~ #tabs-newtab-button::before, + #navigator-toolbox:not([movingtab]) + .tabbrowser-tab[last-visible-tab]:is([visuallyselected], [multiselected], :hover) + ~ #tabbrowser-arrowscrollbox-periphery + #tabs-newtab-button::before { opacity: 0 !important; } } @@ -4529,15 +4691,30 @@ @media (-moz-windows-accent-color-in-titlebar) { :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme) #tabs-newtab-button:hover, :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) #tabs-newtab-button:hover { - fill: color-mix(in srgb, -moz-accent-color-foreground 10%, transparent) !important; + fill: color-mix(in srgb, AccentColorText 10%, transparent) !important; /* Hardcorded for compatibility */ } :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme) #tabs-newtab-button:hover:active, :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) #tabs-newtab-button:hover:active { - fill: color-mix(in srgb, -moz-accent-color-foreground 15%, transparent) !important; + fill: color-mix(in srgb, AccentColorText 15%, transparent) !important; /* Hardcorded for compatibility */ } + + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme) #tabs-newtab-button:hover, + :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) #tabs-newtab-button:hover { + fill: color-mix(in srgb, -moz-accent-color-foreground 10%, transparent) !important; + /* Hardcorded for compatibility */ + } + + :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme) #tabs-newtab-button:hover:active, + :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) + #tabs-newtab-button:hover:active { + fill: color-mix(in srgb, -moz-accent-color-foreground 15%, transparent) !important; + /* Hardcorded for compatibility */ + } + } } /* '+'Icon */ #tabs-newtab-button .toolbarbutton-icon { @@ -4611,16 +4788,27 @@ --inline-tab-padding: 8px; } - #tabbrowser-tabs[closebuttons="activetab"] .tab-label-container[textoverflow][labeldirection="ltr"]:not([pinned]), - #tabbrowser-tabs[closebuttons="activetab"] - .tab-label-container[textoverflow]:not([labeldirection]):-moz-locale-dir(ltr):not([pinned]) { - mask-image: linear-gradient(to right, black 70%, transparent) !important; + .tabbrowser-tab .tab-label-container { + --tab-label-mask-size: 1.8em; + /* Original: 2em */ } - #tabbrowser-tabs[closebuttons="activetab"] .tab-label-container[textoverflow][labeldirection="rtl"]:not([pinned]), + #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab .tab-label-container { + --tab-label-mask-size: 30%; + } #tabbrowser-tabs[closebuttons="activetab"] - .tab-label-container[textoverflow]:not([labeldirection]):-moz-locale-dir(rtl):not([pinned]) { - mask-image: linear-gradient(to left, black 70%, transparent) !important; + .tabbrowser-tab:is([visuallyselected="true"], [multiselected="true"]) + .tab-label-container { + --tab-label-mask-size: 25%; + } + + .tabbrowser-tab[visuallyselected="true"]:not([labelendaligned]):hover .tab-label-container, + #tabbrowser-tabs:not([closebuttons="activetab"]) + > #tabbrowser-arrowscrollbox + > .tabbrowser-tab:not([visuallyselected="true"], [labelendaligned]):hover + .tab-label-container { + --tab-label-mask-size: 0.9em; + /* Original: 1em */ } } /** Clipped tabs - Show close button at hover *********************************/ @@ -5451,13 +5639,15 @@ } #appMenu-fxa-status2, - #appMenu-zoom-controls2 { + #appMenu-zoom-controls2, + #appMenu-zoom-controls { align-items: center; padding-top: var(--arrowpanel-menuimageblank-padding-block) !important; padding-bottom: var(--arrowpanel-menuimageblank-padding-block) !important; } - #appMenu-zoom-controls2::before { + #appMenu-zoom-controls2::before, + #appMenu-zoom-controls::before { margin-inline-end: 0 !important; } @@ -5540,7 +5730,8 @@ padding-bottom: var(--arrowpanel-menuitemblank-padding) !important; } - #appMenu-zoom-controls2 { + #appMenu-zoom-controls2, + #appMenu-zoom-controls { padding-inline-start: var(--arrowpanel-menuimageblank-padding-horizontal) !important; } } @@ -5557,7 +5748,8 @@ padding-bottom: var(--arrowpanel-menuitemblank-padding-block) !important; } - #appMenu-zoom-controls2 { + #appMenu-zoom-controls2, + #appMenu-zoom-controls { padding-inline-start: var(--arrowpanel-menuimageblank-padding-horizontal) !important; } } @@ -5603,7 +5795,8 @@ list-style-image: url("chrome://global/skin/icons/search-glass.svg"); } - #appMenu-zoom-controls2::before { + #appMenu-zoom-controls2::before, + #appMenu-zoom-controls::before { content: url("../icons/screenshot.svg"); } } @@ -6032,9 +6225,9 @@ > menupopup > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), :not(menu, #ContentSelectDropdown) > menupopup > menu:not(.menu-iconic, .in-menulist, [checked="true"]), - menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) + menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) + menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) menu:not(.menu-iconic, .in-menulist, [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), @@ -6077,9 +6270,9 @@ :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menu:not(.menu-iconic, .in-menulist, [checked="true"]), - menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) + menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) + menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) menu:not(.menu-iconic, .in-menulist, [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), @@ -6135,9 +6328,9 @@ :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menu:not(.menu-iconic, .in-menulist, [checked="true"]), - menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) + menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) + menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) menu:not(.menu-iconic, .in-menulist, [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), @@ -6167,9 +6360,9 @@ :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menu:not(.menu-iconic, .in-menulist, [checked="true"]), - menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) + menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) + menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) menu:not(.menu-iconic, .in-menulist, [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), @@ -6224,11 +6417,14 @@ } /* Global Menu */ - /* Disabled. some icons not appear - menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked=true]), menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) menu:not(.menu-iconic, .in-menulist, [checked=true]) { - list-style-image: var(--menuitem-image, url("../icons/blank.svg")); - } - */ + @supports -moz-bool-pref("userChrome.icon.global_menu.mac") { + menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) + menuitem:not(.menuitem-iconic, .bookmark-item), + menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) + menu:not(.menu-iconic) { + list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important; + } + } } /*= Bookmark Menu - Layout ===================================================*/ /* #goPopup(Legacy of historyMenuPoup), #historyMenuPopup, #bookmarksMenuPopup: looks like global menu @@ -7255,6 +7451,10 @@ --menuitem-image: url("chrome://browser/skin/mail.svg"); } + menu.share-tab-url-item { + --menuitem-image: url("chrome://browser/skin/share.svg"); + } + #menu_print { --menuitem-image: url("chrome://global/skin/icons/print.svg"); } @@ -7337,6 +7537,14 @@ --menuitem-image: url("chrome://browser/skin/characterEncoding.svg"); } + #enterFullScreenItem { + --menuitem-image: url("chrome://browser/skin/fullscreen.svg"); + } + + #exitFullScreenItem { + --menuitem-image: url("chrome://browser/skin/fullscreen-exit.svg"); + } + #fullScreenItem { /* checkbox */ --menuitem-image: url("chrome://browser/skin/fullscreen.svg"); @@ -7372,6 +7580,10 @@ --menuitem-image: url("../icons/resize.svg"); } + #toggle_zoom { + --menuitem-image: url("../icons/screenshot.svg"); + } + /*= goPopup ==================================================================*/ #menu_showAllHistory { --menuitem-image: url("chrome://browser/skin/history.svg"); @@ -7494,6 +7706,14 @@ --menuitem-image: url("chrome://devtools/skin/images/debugging-addons.svg"); } + /*= windowPopup ==============================================================*/ + #windowPopup > menuitem[command="minimizeWindow"] { + --menuitem-image: url("../icons/arrow-between-down.svg"); + } + #windowPopup > menuitem[command="zoomWindow"] { + --menuitem-image: url("../icons/auto-fit-width.svg"); + } + /*= menu_HelpPopup ===========================================================*/ #menu_openHelp { --menuitem-image: url("chrome://global/skin/icons/help.svg"); diff --git a/arch-config/.mozilla/firefox/default-release/chrome/css/leptonContent.css b/arch-config/.mozilla/firefox/default-release/chrome/css/leptonContent.css index b346bde5..be42adbe 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/css/leptonContent.css +++ b/arch-config/.mozilla/firefox/default-release/chrome/css/leptonContent.css @@ -272,6 +272,77 @@ } } } + /** Activity Stream - Menu Icons ********************************************/ + @supports -moz-bool-pref("userChrome.icon.context_menu") { + .context-menu-list .context-menu-item button { + padding-inline-start: 0 !important; + } + + .context-menu-list .context-menu-item button span { + padding-inline-start: 24px; + /* 16p + (4px * 2) */ + -moz-context-properties: fill, fill-opacity !important; + fill: currentColor !important; + /* Layout */ + background-size: 16px; + background-repeat: no-repeat; + background-image: var(--menuitem-image); + background-position: left 4px center; + } + + .context-menu-item span[data-l10n-id="newtab-menu-pin"] { + --menuitem-image: url("../icons/pin-tab.svg"); + } + + .context-menu-item span[data-l10n-id="newtab-menu-unpin"] { + --menuitem-image: url("../icons/unpin-tab.svg"); + } + + .context-menu-item span[data-l10n-id="newtab-menu-edit-topsites"] { + --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + } + + .context-menu-item span[data-l10n-id="newtab-menu-bookmark"] { + --menuitem-image: url("chrome://browser/skin/bookmark.svg"); + } + + .context-menu-item span[data-l10n-id="newtab-menu-remove-bookmark"] { + --menuitem-image: url("chrome://browser/skin/bookmark-hollow.svg"); + } + + .context-menu-item span[data-l10n-id="newtab-menu-save-to-pocket"] { + --menuitem-image: url("../icons/pocket-outline.svg"); + } + + .context-menu-item span[data-l10n-id="newtab-menu-open-file"] { + --menuitem-image: url("../icons/fluid.svg"); + } + + .context-menu-item span[data-l10n-id="newtab-menu-show-file"] { + --menuitem-image: url("chrome://global/skin/icons/folder.svg"); + } + @supports -moz-bool-pref("userChrome.icon.library") { + .context-menu-item span[data-l10n-id="newtab-menu-show-file"] { + --menuitem-image: url("../icons/folder.svg"); + } + } + + .context-menu-item span[data-l10n-id="newtab-menu-open-new-window"] { + --menuitem-image: url("chrome://browser/skin/window.svg"); + } + + .context-menu-item span[data-l10n-id="newtab-menu-open-new-private-window"] { + --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg"); + } + + .context-menu-item span[data-l10n-id="newtab-menu-dismiss"] { + --menuitem-image: url("chrome://global/skin/icons/delete.svg"); + } + + .context-menu-item span[data-l10n-id="newtab-menu-delete-history"] { + --menuitem-image: url("../icons/eraser.svg"); + } + } /** Activity Stream - Web Site Icon: full size ******************************/ @supports -moz-bool-pref("userContent.newTab.full_icon") { .top-site-outer .tile { @@ -751,11 +822,17 @@ @supports -moz-bool-pref("userContent.page.proton_color.system_accent") { :host, :root { - --in-content-primary-button-text-color: -moz-accent-color-foreground !important; + --in-content-primary-button-text-color: AccentColorText !important; --in-content-primary-button-background: Highlight !important; --in-content-primary-button-background-hover: color-mix(in srgb, black 10%, Highlight) !important; --in-content-primary-button-background-active: color-mix(in srgb, black 20%, Highlight) !important; } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + :host, + :root { + --in-content-primary-button-text-color: -moz-accent-color-foreground !important; + } + } } } } @@ -2763,53 +2840,111 @@ menuitem[type="checkbox"] > .menu-iconic-left[checked="true"] > .menu-iconic-icon { -moz-context-properties: fill !important; fill: currentColor !important; - color: var(--checkbox-checked-color, -moz-accent-color-foreground) !important; border-color: var(--checkbox-checked-border-color, transparent) !important; - background-color: var(--checkbox-checked-bgcolor, -moz-accent-color) !important; background-image: url("chrome://global/skin/icons/check.svg") !important; background-position: center !important; background-repeat: no-repeat !important; /* Style the button also when printing with "Print Backgrounds" unchecked */ color-adjust: exact !important; + color: var(--checkbox-checked-color, AccentColorText) !important; + background-color: var(--checkbox-checked-bgcolor, AccentColor) !important; + } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + menuitem[type="checkbox"] > .menu-iconic-left[checked="true"] > .menu-iconic-icon { + color: var(--checkbox-checked-color, -moz-accent-color-foreground) !important; + background-color: var(--checkbox-checked-bgcolor, -moz-accent-color) !important; + } } menuitem[type="checkbox"]:not([disabled="true"]):hover > .menu-iconic-left > .menu-iconic-icon { background-color: var( --checkbox-unchecked-hover-bgcolor, - color-mix(in srgb, -moz-accent-color 4%, Field) + color-mix(in srgb, AccentColor 4%, Field) ) !important; } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + menuitem[type="checkbox"]:not([disabled="true"]):hover > .menu-iconic-left > .menu-iconic-icon { + background-color: var( + --checkbox-unchecked-hover-bgcolor, + color-mix(in srgb, -moz-accent-color 4%, Field) + ) !important; + } + } menuitem[type="checkbox"]:not([disabled="true"]):hover:active > .menu-iconic-left > .menu-iconic-icon { background-color: var( --checkbox-unchecked-active-bgcolor, - color-mix(in srgb, -moz-accent-color 8%, Field) + color-mix(in srgb, AccentColor 8%, Field) ) !important; } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + menuitem[type="checkbox"]:not([disabled="true"]):hover:active > .menu-iconic-left > .menu-iconic-icon { + background-color: var( + --checkbox-unchecked-active-bgcolor, + color-mix(in srgb, -moz-accent-color 8%, Field) + ) !important; + } + } menuitem[type="checkbox"]:not([disabled="true"]):hover > .menu-iconic-left[checked="true"] > .menu-iconic-icon { background-color: var( --checkbox-checked-hover-bgcolor, - color-mix(in srgb, currentColor 12.5%, -moz-accent-color) + color-mix(in srgb, currentColor 12.5%, AccentColor) ) !important; } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + menuitem[type="checkbox"]:not([disabled="true"]):hover + > .menu-iconic-left[checked="true"] + > .menu-iconic-icon { + background-color: var( + --checkbox-checked-hover-bgcolor, + color-mix(in srgb, currentColor 12.5%, -moz-accent-color) + ) !important; + } + } menuitem[type="checkbox"]:not([disabled="true"]):hover:active > .menu-iconic-left[checked="true"] > .menu-iconic-icon { background-color: var( --checkbox-checked-active-bgcolor, - color-mix(in srgb, currentColor 25%, -moz-accent-color) + color-mix(in srgb, currentColor 25%, AccentColor) ) !important; } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + menuitem[type="checkbox"]:not([disabled="true"]):hover:active + > .menu-iconic-left[checked="true"] + > .menu-iconic-icon { + background-color: var( + --checkbox-checked-active-bgcolor, + color-mix(in srgb, currentColor 25%, -moz-accent-color) + ) !important; + } + } menuitem[type="checkbox"]:focus > .menu-iconic-left > .menu-iconic-icon { - outline: 2px solid var(--focus-outline-color, -moz-accent-color) !important; + outline: 2px solid var(--focus-outline-color, AccentColor) !important; outline-offset: var(--focus-outline-offset, 2px) !important; } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + menuitem[type="checkbox"]:focus > .menu-iconic-left > .menu-iconic-icon { + outline: 2px solid var(--focus-outline-color, -moz-accent-color) !important; + } + } @media (prefers-contrast) { menuitem[type="checkbox"]:not([disabled="true"]) > .menu-iconic-left > .menu-iconic-icon { /* color will set the border-color on the check due to how HCM works for in-content pages. */ - color: var(--checkbox-checked-border-color, color-mix(in srgb, -moz-accent-color 4%, Field)) !important; + color: var(--checkbox-checked-border-color, color-mix(in srgb, AccentColor 4%, Field)) !important; + } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + menuitem[type="checkbox"]:not([disabled="true"]) > .menu-iconic-left > .menu-iconic-icon { + /* color will set the border-color on the check due to how HCM works for in-content pages. */ + color: var(--checkbox-checked-border-color, color-mix(in srgb, -moz-accent-color 4%, Field)) !important; + } } menuitem[type="checkbox"] > .menu-iconic-left[checked="true"] { color: var(--checkbox-checked-border-color, currentColor) !important; - fill: var(--checkbox-checked-color, -moz-accent-color-foreground) !important; + fill: var(--checkbox-checked-color, AccentColorText) !important; + } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + menuitem[type="checkbox"] > .menu-iconic-left[checked="true"] { + fill: var(--checkbox-checked-color, -moz-accent-color-foreground) !important; + } } menuitem[type="checkbox"]:not([disabled="true"]):hover:active > .menu-iconic-left[checked="true"] @@ -2817,8 +2952,19 @@ menuitem[type="checkbox"]:not([disabled="true"]):hover > .menu-iconic-left[checked="true"] > .menu-iconic-icon { - color: var(--checkbox-checked-border-color-hover, -moz-accent-color-foreground) !important; - fill: var(--checkbox-checked-border-color-hover, -moz-accent-color-foreground) !important; + color: var(--checkbox-checked-border-color-hover, AccentColorText) !important; + fill: var(--checkbox-checked-border-color-hover, AccentColorText) !important; + } + @supports -moz-bool-pref("userChrome.compatibility.accent_color") { + menuitem[type="checkbox"]:not([disabled="true"]):hover:active + > .menu-iconic-left[checked="true"] + > .menu-iconic-icon, + menuitem[type="checkbox"]:not([disabled="true"]):hover + > .menu-iconic-left[checked="true"] + > .menu-iconic-icon { + color: var(--checkbox-checked-border-color-hover, -moz-accent-color-foreground) !important; + fill: var(--checkbox-checked-border-color-hover, -moz-accent-color-foreground) !important; + } } } menuitem[type="checkbox"] > .menu-iconic-text { diff --git a/arch-config/.mozilla/firefox/default-release/chrome/docs/Restrictions.md b/arch-config/.mozilla/firefox/default-release/chrome/docs/Restrictions.md index a74021fe..4c8029a8 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/docs/Restrictions.md +++ b/arch-config/.mozilla/firefox/default-release/chrome/docs/Restrictions.md @@ -6,6 +6,7 @@ * [Cross Platform](#cross-platform) * [Firefox Version](#firefox-version) * [Side Effect](#side-effect) + * [`-moz-accent-color` Related](#-moz-accent-color-related) - [Internals](#internals) * [CSS Loading Order](#css-loading-order) * [DOM structure cannot be modified](#dom-structure-cannot-be-modified) @@ -51,6 +52,17 @@ This project is using SCSS to make a [reusable compatible mixins](../src/utils). } ``` +**Main compatibility bugs** + +- `-moz-toolbar-prefers-color-scheme` -> `prefers-color-scheme` [#250](https://github.com/black7375/Firefox-UI-Fix/issues/250) +- `:root[lwtheme-mozlightdark]` is removed [#288](https://github.com/black7375/Firefox-UI-Fix/issues/288) +- `-moz-os-version` -> `-moz-platform` [#331](https://github.com/black7375/Firefox-UI-Fix/issues/331) +- Breaking change with `-moz-accent-color`/`-moz-accent-color-foreground` -> `AccentColor`/`AccentColorText` [#433](https://github.com/black7375/Firefox-UI-Fix/issues/433) + +### `-moz-accent-color` + +I don't know the exact reason, but it can be a problem if it is not applied to [CSS Variable](https://developer.mozilla.org/en-US/docs/Web/CSS/var). [#437](https://github.com/black7375/Firefox-UI-Fix/issues/437) + ### Side Effect Only CSS modifications can cause bugs that are hard to think of in the general web, such as the [context menu not appearing](https://github.com/black7375/Firefox-UI-Fix/issues/114). diff --git a/arch-config/.mozilla/firefox/default-release/chrome/icons/arrow-between-down.svg b/arch-config/.mozilla/firefox/default-release/chrome/icons/arrow-between-down.svg new file mode 100644 index 00000000..b15ee776 --- /dev/null +++ b/arch-config/.mozilla/firefox/default-release/chrome/icons/arrow-between-down.svg @@ -0,0 +1,3 @@ + + + diff --git a/arch-config/.mozilla/firefox/default-release/chrome/icons/auto-fit-width.svg b/arch-config/.mozilla/firefox/default-release/chrome/icons/auto-fit-width.svg new file mode 100644 index 00000000..6b39adec --- /dev/null +++ b/arch-config/.mozilla/firefox/default-release/chrome/icons/auto-fit-width.svg @@ -0,0 +1,3 @@ + + + diff --git a/arch-config/.mozilla/firefox/default-release/chrome/install.ps1 b/arch-config/.mozilla/firefox/default-release/chrome/install.ps1 index 49e10283..c16e4496 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/install.ps1 +++ b/arch-config/.mozilla/firefox/default-release/chrome/install.ps1 @@ -826,7 +826,7 @@ function Copy-Lepton() { Param ( [Parameter(Position=0)] [string] $chromeDir = "chrome", - [Parameter(Position=0)] + [Parameter(Position=1)] [string] $userJSPath = "${chromeDir}\user.js" ) diff --git a/arch-config/.mozilla/firefox/default-release/chrome/src/compatibility/_os.scss b/arch-config/.mozilla/firefox/default-release/chrome/src/compatibility/_os.scss index 26d8e87a..905289e7 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/src/compatibility/_os.scss +++ b/arch-config/.mozilla/firefox/default-release/chrome/src/compatibility/_os.scss @@ -10,7 +10,9 @@ @media (-moz-windows-accent-color-in-titlebar) { #navigator-toolbox { - border-top-color: -moz-accent-color !important; + @include AccentColor { + border-top-color: $accentColor !important; + } } } } diff --git a/arch-config/.mozilla/firefox/default-release/chrome/src/contents/_activity_stream.scss b/arch-config/.mozilla/firefox/default-release/chrome/src/contents/_activity_stream.scss index 3a0acf32..324e4acb 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/src/contents/_activity_stream.scss +++ b/arch-config/.mozilla/firefox/default-release/chrome/src/contents/_activity_stream.scss @@ -27,6 +27,12 @@ } } + /** Activity Stream - Menu Icons ********************************************/ + @include Option("userChrome.icon.context_menu") { + @import "../icons/layout_activity_stream"; + @import "../icons/activity_stream"; + } + /** Activity Stream - Web Site Icon: full size ******************************/ @include Option("userContent.newTab.full_icon") { .top-site-outer .tile { diff --git a/arch-config/.mozilla/firefox/default-release/chrome/src/contents/_proton_color.scss b/arch-config/.mozilla/firefox/default-release/chrome/src/contents/_proton_color.scss index 8db37ae3..ab1fc389 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/src/contents/_proton_color.scss +++ b/arch-config/.mozilla/firefox/default-release/chrome/src/contents/_proton_color.scss @@ -19,7 +19,9 @@ @include Option("userContent.page.proton_color.system_accent") { :host, :root { - --in-content-primary-button-text-color: -moz-accent-color-foreground !important; + @include AccentColor { + --in-content-primary-button-text-color: #{$accentTextColor} !important; + } --in-content-primary-button-background: Highlight !important; --in-content-primary-button-background-hover: color-mix(in srgb, black 10%, Highlight) !important; --in-content-primary-button-background-active: color-mix(in srgb, black 20%, Highlight) !important; diff --git a/arch-config/.mozilla/firefox/default-release/chrome/src/decoration/_field_border.scss b/arch-config/.mozilla/firefox/default-release/chrome/src/decoration/_field_border.scss index 4d7983d8..2198c577 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/src/decoration/_field_border.scss +++ b/arch-config/.mozilla/firefox/default-release/chrome/src/decoration/_field_border.scss @@ -12,12 +12,16 @@ body[lwt-sidebar] xul|search-textbox.tabsFilter:hover { } .sidebar-panel:not([lwt-sidebar]) #search-box:hover, body:not([lwt-sidebar]) xul|search-textbox.tabsFilter:hover { - border-color: -moz-accent-color !important; + @include AccentColor { + border-color: $accentColor !important; + } } /* Others */ #editBMPanel_namePicker:hover, #editBMPanel_tagsField:hover, .findbar-container .findbar-textbox:hover { - --input-border-color: color-mix(in srgb, var(--focus-outline-color, -moz-accent-color) 50%, transparent); + @include AccentColor { + --input-border-color: color-mix(in srgb, var(--focus-outline-color, #{$accentColor}) 50%, transparent); + } } diff --git a/arch-config/.mozilla/firefox/default-release/chrome/src/icons/_activity_stream.scss b/arch-config/.mozilla/firefox/default-release/chrome/src/icons/_activity_stream.scss new file mode 100644 index 00000000..b916a3ec --- /dev/null +++ b/arch-config/.mozilla/firefox/default-release/chrome/src/icons/_activity_stream.scss @@ -0,0 +1,41 @@ +.context-menu-item span[data-l10n-id="newtab-menu-pin"] { + --menuitem-image: url("../icons/pin-tab.svg"); +} +.context-menu-item span[data-l10n-id="newtab-menu-unpin"] { + --menuitem-image: url("../icons/unpin-tab.svg"); +} +.context-menu-item span[data-l10n-id="newtab-menu-edit-topsites"] { + --menuitem-image: url("chrome://global/skin/icons/edit.svg"); +} +.context-menu-item span[data-l10n-id="newtab-menu-bookmark"] { + --menuitem-image: url("chrome://browser/skin/bookmark.svg"); +} +.context-menu-item span[data-l10n-id="newtab-menu-remove-bookmark"] { + --menuitem-image: url("chrome://browser/skin/bookmark-hollow.svg"); +} +.context-menu-item span[data-l10n-id="newtab-menu-save-to-pocket"] { + --menuitem-image: url("../icons/pocket-outline.svg"); +} +.context-menu-item span[data-l10n-id="newtab-menu-open-file"] { + --menuitem-image: url("../icons/fluid.svg"); +} +.context-menu-item span[data-l10n-id="newtab-menu-show-file"] { + --menuitem-image: url("chrome://global/skin/icons/folder.svg"); + @include Option("userChrome.icon.library") { + --menuitem-image: url("../icons/folder.svg"); + } +} + +.context-menu-item span[data-l10n-id="newtab-menu-open-new-window"] { + --menuitem-image: url("chrome://browser/skin/window.svg"); +} +.context-menu-item span[data-l10n-id="newtab-menu-open-new-private-window"] { + --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg"); +} + +.context-menu-item span[data-l10n-id="newtab-menu-dismiss"] { + --menuitem-image: url("chrome://global/skin/icons/delete.svg"); +} +.context-menu-item span[data-l10n-id="newtab-menu-delete-history"] { + --menuitem-image: url("../icons/eraser.svg"); +} diff --git a/arch-config/.mozilla/firefox/default-release/chrome/src/icons/_global_menu.scss b/arch-config/.mozilla/firefox/default-release/chrome/src/icons/_global_menu.scss index 00aa9f5e..be303a11 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/src/icons/_global_menu.scss +++ b/arch-config/.mozilla/firefox/default-release/chrome/src/icons/_global_menu.scss @@ -32,6 +32,9 @@ #menu_sendLink { --menuitem-image: url("chrome://browser/skin/mail.svg"); } +menu.share-tab-url-item { + --menuitem-image: url("chrome://browser/skin/share.svg"); +} #menu_printPreview { } @@ -114,6 +117,12 @@ --menuitem-image: url("chrome://browser/skin/characterEncoding.svg"); } +#enterFullScreenItem { + --menuitem-image: url("chrome://browser/skin/fullscreen.svg"); +} +#exitFullScreenItem { + --menuitem-image: url("chrome://browser/skin/fullscreen-exit.svg"); +} #fullScreenItem { /* checkbox */ --menuitem-image: url("chrome://browser/skin/fullscreen.svg"); @@ -145,6 +154,10 @@ --menuitem-image: url("../icons/resize.svg"); } +#toggle_zoom { + --menuitem-image: url("../icons/screenshot.svg"); +} + /*= goPopup ==================================================================*/ #menu_showAllHistory { --menuitem-image: url("chrome://browser/skin/history.svg"); @@ -262,6 +275,16 @@ --menuitem-image: url("chrome://devtools/skin/images/debugging-addons.svg"); } +/*= windowPopup ==============================================================*/ +#windowPopup > menuitem { + &[command="minimizeWindow"] { + --menuitem-image: url("../icons/arrow-between-down.svg"); + } + &[command="zoomWindow"] { + --menuitem-image: url("../icons/auto-fit-width.svg"); + } +} + /*= menu_HelpPopup ===========================================================*/ #menu_openHelp { --menuitem-image: url("chrome://global/skin/icons/help.svg"); diff --git a/arch-config/.mozilla/firefox/default-release/chrome/src/icons/_layout_activity_stream.scss b/arch-config/.mozilla/firefox/default-release/chrome/src/icons/_layout_activity_stream.scss new file mode 100644 index 00000000..fb5fcae0 --- /dev/null +++ b/arch-config/.mozilla/firefox/default-release/chrome/src/icons/_layout_activity_stream.scss @@ -0,0 +1,16 @@ +.context-menu-list .context-menu-item button { + padding-inline-start: 0 !important; +} + +.context-menu-list .context-menu-item button span { + padding-inline-start: 24px; /* 16p + (4px * 2) */ + + -moz-context-properties: fill, fill-opacity !important; + fill: currentColor !important; + + /* Layout */ + background-size: 16px; + background-repeat: no-repeat; + background-image: var(--menuitem-image); + background-position: left 4px center; +} diff --git a/arch-config/.mozilla/firefox/default-release/chrome/src/icons/_layout_menu.scss b/arch-config/.mozilla/firefox/default-release/chrome/src/icons/_layout_menu.scss index fb0be852..7493b61f 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/src/icons/_layout_menu.scss +++ b/arch-config/.mozilla/firefox/default-release/chrome/src/icons/_layout_menu.scss @@ -118,9 +118,9 @@ $_layoutCommonMenus: ( } /* Global Menu */ - /* Disabled. some icons not appear - #{$_iconMenuPopupMenus} { - list-style-image: var(--menuitem-image, url("../icons/blank.svg")); + @include Option("userChrome.icon.global_menu.mac") { + #{selector.nest($_iconMenuPopup, "menuitem:not(.menuitem-iconic, .bookmark-item), menu:not(.menu-iconic)")} { + list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important; + } } - */ } diff --git a/arch-config/.mozilla/firefox/default-release/chrome/src/icons/_layout_menu_common.scss b/arch-config/.mozilla/firefox/default-release/chrome/src/icons/_layout_menu_common.scss index 3d3a92c5..5ed72463 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/src/icons/_layout_menu_common.scss +++ b/arch-config/.mozilla/firefox/default-release/chrome/src/icons/_layout_menu_common.scss @@ -10,7 +10,7 @@ $_iconMenu: "menu:not(.menu-iconic, #{$_iconNoneCommon})"; // Components $_nestedPopupIcon: ":not(menu, #ContentSelectDropdown) > menupopup >"; $_nestedPopupPadding: ":not(menu, #ContentSelectDropdown, #context-navigation) > menupopup >"; -$_iconMenuPopup: "menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)"; +$_iconMenuPopup: "menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)"; $_nestedPopupIconMenus: selector.nest( $_nestedPopupIcon, diff --git a/arch-config/.mozilla/firefox/default-release/chrome/src/icons/_layout_panel.scss b/arch-config/.mozilla/firefox/default-release/chrome/src/icons/_layout_panel.scss index 83e9873a..546fd639 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/src/icons/_layout_panel.scss +++ b/arch-config/.mozilla/firefox/default-release/chrome/src/icons/_layout_panel.scss @@ -55,12 +55,14 @@ margin-inline-start: var(--arrowpanel-menuitem-padding-inline) !important; } #appMenu-fxa-status2, -#appMenu-zoom-controls2 { +#appMenu-zoom-controls2, /* Legacy v104 */ +#appMenu-zoom-controls { align-items: center; padding-top: var(--arrowpanel-menuimageblank-padding-block) !important; padding-bottom: var(--arrowpanel-menuimageblank-padding-block) !important; } -#appMenu-zoom-controls2::before { +#appMenu-zoom-controls2::before, /* Legacy v104 */ +#appMenu-zoom-controls::before { margin-inline-end: 0 !important; } #appMenu-zoomReduce-button2, diff --git a/arch-config/.mozilla/firefox/default-release/chrome/src/icons/_panel.scss b/arch-config/.mozilla/firefox/default-release/chrome/src/icons/_panel.scss index 2fcb4e68..7420f7cf 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/src/icons/_panel.scss +++ b/arch-config/.mozilla/firefox/default-release/chrome/src/icons/_panel.scss @@ -36,7 +36,8 @@ padding-top: var(--arrowpanel-menuitemblank-padding) !important; padding-bottom: var(--arrowpanel-menuitemblank-padding) !important; } - #appMenu-zoom-controls2 { + #appMenu-zoom-controls2, /* Legacy v104 */ + #appMenu-zoom-controls { padding-inline-start: var(--arrowpanel-menuimageblank-padding-horizontal) !important; } } @@ -52,7 +53,8 @@ padding-top: var(--arrowpanel-menuitemblank-padding-block) !important; padding-bottom: var(--arrowpanel-menuitemblank-padding-block) !important; } - #appMenu-zoom-controls2 { + #appMenu-zoom-controls2, /* Legacy v104 */ + #appMenu-zoom-controls { padding-inline-start: var(--arrowpanel-menuimageblank-padding-horizontal) !important; } } @@ -91,7 +93,8 @@ #appMenu-find-button2 { list-style-image: url("chrome://global/skin/icons/search-glass.svg"); } - #appMenu-zoom-controls2::before { + #appMenu-zoom-controls2::before, /* Legacy v104 */ + #appMenu-zoom-controls::before { content: url("../icons/screenshot.svg"); } } diff --git a/arch-config/.mozilla/firefox/default-release/chrome/src/leptonChrome.scss b/arch-config/.mozilla/firefox/default-release/chrome/src/leptonChrome.scss index 353bd454..47441534 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/src/leptonChrome.scss +++ b/arch-config/.mozilla/firefox/default-release/chrome/src/leptonChrome.scss @@ -2,6 +2,7 @@ @use "utils/option" as *; @use "utils/color_scheme" as *; @use "utils/theme" as *; +@use "utils/accent_color" as *; @use "utils/native_menu" as *; @use "utils/proton_elements" as Proton; @use "sass:selector"; diff --git a/arch-config/.mozilla/firefox/default-release/chrome/src/leptonContent.scss b/arch-config/.mozilla/firefox/default-release/chrome/src/leptonContent.scss index cc96c6da..1fcf8e23 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/src/leptonContent.scss +++ b/arch-config/.mozilla/firefox/default-release/chrome/src/leptonContent.scss @@ -1,6 +1,7 @@ @use "utils/os" as *; @use "utils/option" as *; @use "utils/color_scheme" as *; +@use "utils/accent_color" as *; @use "utils/native_menu" as *; @use "utils/proton_elements" as Proton; @use "sass:selector"; diff --git a/arch-config/.mozilla/firefox/default-release/chrome/src/padding/_menu.scss b/arch-config/.mozilla/firefox/default-release/chrome/src/padding/_menu.scss index 677e1e0a..e4c7c4e3 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/src/padding/_menu.scss +++ b/arch-config/.mozilla/firefox/default-release/chrome/src/padding/_menu.scss @@ -25,6 +25,10 @@ menupopup > menu { #ContentSelectDropdown > menupopup > menucaption, #ContentSelectDropdown > menupopup > menuitem { padding-block: 0 !important; + + @include OS($linux) { + padding-block: var(--menu-padding) !important; + } } @include OS($mac) { diff --git a/arch-config/.mozilla/firefox/default-release/chrome/src/tabbar/clipped_tab/_letters_cleary.scss b/arch-config/.mozilla/firefox/default-release/chrome/src/tabbar/clipped_tab/_letters_cleary.scss index a4b4446f..8b9f8997 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/src/tabbar/clipped_tab/_letters_cleary.scss +++ b/arch-config/.mozilla/firefox/default-release/chrome/src/tabbar/clipped_tab/_letters_cleary.scss @@ -13,14 +13,23 @@ --inline-tab-padding: 8px; } -#tabbrowser-tabs[closebuttons="activetab"] .tab-label-container[textoverflow][labeldirection="ltr"]:not([pinned]), -#tabbrowser-tabs[closebuttons="activetab"] - .tab-label-container[textoverflow]:not([labeldirection]):-moz-locale-dir(ltr):not([pinned]) { - mask-image: linear-gradient(to right, black 70%, transparent) !important; +// mask-image: linear-gradient(to left, transparent, black var(--tab-label-mask-size)); +.tabbrowser-tab { + .tab-label-container { + --tab-label-mask-size: 1.8em; /* Original: 2em */ + } } -#tabbrowser-tabs[closebuttons="activetab"] .tab-label-container[textoverflow][labeldirection="rtl"]:not([pinned]), -#tabbrowser-tabs[closebuttons="activetab"] - .tab-label-container[textoverflow]:not([labeldirection]):-moz-locale-dir(rtl):not([pinned]) { - mask-image: linear-gradient(to left, black 70%, transparent) !important; +#tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab { + .tab-label-container { + --tab-label-mask-size: 30%; + } + &:is([visuallyselected="true"], [multiselected="true"]) .tab-label-container { + --tab-label-mask-size: 25%; + } +} + +.tabbrowser-tab[visuallyselected=true]:not([labelendaligned]):hover .tab-label-container, +#tabbrowser-tabs:not([closebuttons=activetab]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab:not([visuallyselected=true],[labelendaligned]):hover .tab-label-container { + --tab-label-mask-size: 0.9em; /* Original: 1em */ } diff --git a/arch-config/.mozilla/firefox/default-release/chrome/src/tabbar/newtab_button/_looks_like_tab.scss b/arch-config/.mozilla/firefox/default-release/chrome/src/tabbar/newtab_button/_looks_like_tab.scss index 94a0f8eb..bdda2a6d 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/src/tabbar/newtab_button/_looks_like_tab.scss +++ b/arch-config/.mozilla/firefox/default-release/chrome/src/tabbar/newtab_button/_looks_like_tab.scss @@ -32,21 +32,23 @@ fill: var(--toolbarbutton-active-background) !important; } @media (-moz-windows-accent-color-in-titlebar) { - :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme) #tabs-newtab-button:hover, - :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) #tabs-newtab-button:hover { - fill: color-mix( - in srgb, - -moz-accent-color-foreground 10%, - transparent - ) !important; /* Hardcorded for compatibility */ - } - :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme) #tabs-newtab-button:hover:active, - :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) #tabs-newtab-button:hover:active { - fill: color-mix( - in srgb, - -moz-accent-color-foreground 15%, - transparent - ) !important; /* Hardcorded for compatibility */ + @include AccentColor { + :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme) #tabs-newtab-button:hover, + :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) #tabs-newtab-button:hover { + fill: color-mix( + in srgb, + $accentTextColor 10%, + transparent + ) !important; /* Hardcorded for compatibility */ + } + :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme) #tabs-newtab-button:hover:active, + :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) #tabs-newtab-button:hover:active { + fill: color-mix( + in srgb, + $accentTextColor 15%, + transparent + ) !important; /* Hardcorded for compatibility */ + } } } diff --git a/arch-config/.mozilla/firefox/default-release/chrome/src/tabbar/unselected_tab/_dynamic_separator.scss b/arch-config/.mozilla/firefox/default-release/chrome/src/tabbar/unselected_tab/_dynamic_separator.scss index 9633b1b2..2ba2299c 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/src/tabbar/unselected_tab/_dynamic_separator.scss +++ b/arch-config/.mozilla/firefox/default-release/chrome/src/tabbar/unselected_tab/_dynamic_separator.scss @@ -91,7 +91,10 @@ .tab-background::before, #navigator-toolbox:not([movingtab]) .tabbrowser-tab[last-visible-tab]:is([visuallyselected], [multiselected], :hover) - ~ #tabs-newtab-button::before { + ~ #tabs-newtab-button::before, /* Legacy - v103 */ + #navigator-toolbox:not([movingtab]) + .tabbrowser-tab[last-visible-tab]:is([visuallyselected], [multiselected], :hover) + ~ #tabbrowser-arrowscrollbox-periphery #tabs-newtab-button::before { opacity: 0 !important; } } diff --git a/arch-config/.mozilla/firefox/default-release/chrome/src/theme/_fully_color.scss b/arch-config/.mozilla/firefox/default-release/chrome/src/theme/_fully_color.scss index 94e98bcd..b13d4ad4 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/src/theme/_fully_color.scss +++ b/arch-config/.mozilla/firefox/default-release/chrome/src/theme/_fully_color.scss @@ -155,8 +155,10 @@ body[lwt-sidebar] xul|search-textbox.tabsFilter[focused="true"] { } .sidebar-panel:not([lwt-sidebar]) #search-box[focused="true"], body:not([lwt-sidebar]) xul|search-textbox.tabsFilter[focused="true"] { - border-color: -moz-accent-color !important; /* Hard Coded */ - outline-color: -moz-accent-color !important; + @include AccentColor { + border-color: $accentColor !important; /* Hard Coded */ + outline-color: $accentColor !important; + } } /*= PopupAutoComplete ========================================================*/ diff --git a/arch-config/.mozilla/firefox/default-release/chrome/src/theme/proton_chrome/_proton_commons.scss b/arch-config/.mozilla/firefox/default-release/chrome/src/theme/proton_chrome/_proton_commons.scss index a3c31e52..d5688bd5 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/src/theme/proton_chrome/_proton_commons.scss +++ b/arch-config/.mozilla/firefox/default-release/chrome/src/theme/proton_chrome/_proton_commons.scss @@ -269,7 +269,9 @@ background-color: var(--button-active-bgcolor, color-mix(in srgb, currentColor 20%, ButtonFace)) !important; } &:-moz-focusring { - outline: 2px solid var(--focus-outline-color, -moz-accent-color) !important; + @include AccentColor { + outline: 2px solid var(--focus-outline-color, $accentColor) !important; + } outline-offset: var(--focus-outline-offset, 2px) !important; } } diff --git a/arch-config/.mozilla/firefox/default-release/chrome/src/theme/system_default_theme/_gtk.scss b/arch-config/.mozilla/firefox/default-release/chrome/src/theme/system_default_theme/_gtk.scss index 1fde0850..4a2e4547 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/src/theme/system_default_theme/_gtk.scss +++ b/arch-config/.mozilla/firefox/default-release/chrome/src/theme/system_default_theme/_gtk.scss @@ -1,7 +1,9 @@ /*= GTK - URL View url accent color ==========================================*/ @include OS($linux) { :root:not(:-moz-lwtheme) .urlbarView-url { - --urlbar-popup-url-color: -moz-accent-color; + @include AccentColor { + --urlbar-popup-url-color: #{$accentColor}; + } } /* Nightly Compatibility */ diff --git a/arch-config/.mozilla/firefox/default-release/chrome/src/theme/system_default_theme/_mac.scss b/arch-config/.mozilla/firefox/default-release/chrome/src/theme/system_default_theme/_mac.scss index 17efe8c9..a63537a5 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/src/theme/system_default_theme/_mac.scss +++ b/arch-config/.mozilla/firefox/default-release/chrome/src/theme/system_default_theme/_mac.scss @@ -12,15 +12,17 @@ --mac-sidebar-hover-bgcolor: color-mix(in srgb, ButtonFace 60%, var(--mac-sidebar-bgcolor)); --mac-hover-bgcolor: Window; --mac-disabled-bgcolor: transparent; - --mac-primary-button-color: -moz-accent-color-foreground; /* or -moz-mac-menutextselect */ - --mac-accent-color: -moz-accent-color; /* or LinkText */ - --mac-accent-content-color: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-accent-color); - --mac-accent-hover-color: color-mix( - in srgb, - rgb(0, 0, 0) 10%, - -moz-accent-color - ); /* or -moz-mac-menuselect, Highlight */ - --mac-accent-active-color: color-mix(in srgb, rgb(0, 0, 0) 20%, -moz-accent-color); /* or ActiveBorder */ + @include AccentColor { + --mac-primary-button-color: #{$accentTextColor}; /* or -moz-mac-menutextselect */ + --mac-accent-color: #{$accentColor}; /* or LinkText */ + --mac-accent-content-color: color-mix(in srgb, rgb(255, 255, 255) 15%, #{$accentColor}); + --mac-accent-hover-color: color-mix( + in srgb, + rgb(0, 0, 0) 10%, + #{$accentColor} + ); /* or -moz-mac-menuselect, Highlight */ + --mac-accent-active-color: color-mix(in srgb, rgb(0, 0, 0) 20%, #{$accentColor}); /* or ActiveBorder */ + } /* Text, Icon Color */ --menu-color: var(--mac-text-color) !important; diff --git a/arch-config/.mozilla/firefox/default-release/chrome/src/theme/system_default_theme/_urlbar_focus_color.scss b/arch-config/.mozilla/firefox/default-release/chrome/src/theme/system_default_theme/_urlbar_focus_color.scss index a175e0e3..b6ac62c1 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/src/theme/system_default_theme/_urlbar_focus_color.scss +++ b/arch-config/.mozilla/firefox/default-release/chrome/src/theme/system_default_theme/_urlbar_focus_color.scss @@ -5,17 +5,19 @@ $_urlBarFocusDarkSelector: ":root[tabsintitlebar][lwt-default-theme-in-dark-mode @media (-moz-windows-accent-color-in-titlebar), (-moz-gtk-csd-available) { /* URL Bar */ - #{$_urlBarFocusSelector}, - #{$_urlBarFocusDarkSelector} { - --focus-outline-color: -moz-accent-color !important; - } + @include AccentColor { + #{$_urlBarFocusSelector}, + #{$_urlBarFocusDarkSelector} { + --focus-outline-color: #{$accentColor} !important; + } - #{$_urlBarFocusSelector} #urlbar[open] > #urlbar-background, - #{$_urlBarFocusDarkSelector} #urlbar[open] > #urlbar-background { - border-color: color-mix( - in srgb, - -moz-accent-color 50%, - transparent - ) !important; /* Like: --toolbar-field-focus-border-color */ + #{$_urlBarFocusSelector} #urlbar[open] > #urlbar-background, + #{$_urlBarFocusDarkSelector} #urlbar[open] > #urlbar-background { + border-color: color-mix( + in srgb, + $accentColor 50%, + transparent + ) !important; /* Like: --toolbar-field-focus-border-color */ + } } } diff --git a/arch-config/.mozilla/firefox/default-release/chrome/src/theme/system_default_theme/_win10.scss b/arch-config/.mozilla/firefox/default-release/chrome/src/theme/system_default_theme/_win10.scss index a90a79a8..0024cc7b 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/src/theme/system_default_theme/_win10.scss +++ b/arch-config/.mozilla/firefox/default-release/chrome/src/theme/system_default_theme/_win10.scss @@ -21,11 +21,13 @@ --win-shorcut-text-color: #757575; --win-error-color: #b31616; --win-red-border-color: #ff4343; - --win-accent-forground-color: -moz-accent-color-foreground; - --win-accent-color: color-mix(in srgb, rgba(0, 0, 0, 0.8) 10%, -moz-accent-color); - --win-accent-content-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 15%, -moz-accent-color); - --win-accent-hover-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 27%, -moz-accent-color); - --win-accent-active-color: -moz-accent-color; + @include AccentColor { + --win-accent-forground-color: #{$accentTextColor}; + --win-accent-color: color-mix(in srgb, rgba(0, 0, 0, 0.8) 10%, #{$accentColor}); + --win-accent-content-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 15%, #{$accentColor}); + --win-accent-hover-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 27%, #{$accentColor}); + --win-accent-active-color: #{$accentColor}; + } } @include Dark { #{system-default-theme()} { @@ -49,10 +51,12 @@ --win-shorcut-text-color: #adadad; --win-error-color: #ffb900; --win-red-border-color: #ff4343; - --win-accent-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 20%, -moz-accent-color); - --win-accent-content-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 35%, -moz-accent-color); - --win-accent-hover-color: color-mix(in srgb, rgba(0, 0, 0, 0.8) 5%, -moz-accent-color); - --win-accent-active-color: -moz-accent-color; + @include AccentColor { + --win-accent-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 20%, #{$accentColor}); + --win-accent-content-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 35%, #{$accentColor}); + --win-accent-hover-color: color-mix(in srgb, rgba(0, 0, 0, 0.8) 5%, #{$accentColor}); + --win-accent-active-color: #{$accentColor}; + } } } @@ -84,8 +88,7 @@ --panel-shortcut-color: var(--win-shorcut-text-color) !important; --panel-description-color: var(--win-shorcut-text-color) !important; - /* Title Background, Border Color */ - --menu-border-color: var(--win-bgcolor) !important; + /* Title Background */ --lwt-accent-color: var(--win-bgcolor) !important; --toolbar-field-border-color: var(--win-bgcolor) !important; --chrome-content-separator-color: var(--win-bgcolor) !important; @@ -97,6 +100,9 @@ --arrowpanel-background: var(--win-component-bgcolor) !important; --autocomplete-popup-background: var(--win-component-bgcolor) !important; + /* Border Color */ + // --menu-border-color: var(--win-border-color) !important; + /* Seperator */ --toolbarseparator-color: var(--win-tab-seperator-color) !important; @@ -249,7 +255,7 @@ .sidebar-panel[style="--newtab-background-color: rgb(43, 42, 51); --newtab-text-primary-color: rgba(251, 251, 254, 1); --lwt-sidebar-background-color: rgb(56, 56, 61); --lwt-sidebar-text-color: rgba(249, 249, 250, 1);"], /* Nightly */ body[lwt-sidebar][style="--newtab-background-color: rgb(43, 42, 51); --newtab-text-primary-color: rgba(251, 251, 254, 1); --lwt-sidebar-background-color: rgb(56, 56, 61); --lwt-sidebar-text-color: rgba(249, 249, 250, 1);"] { /* Only darkmode has more: --newtab-background-color-secondary: rgba(66, 65, 77, 1); */ - --lwt-sidebar-background-color: transparent !important; + --lwt-sidebar-background-color: var(--win-sidebar-bgcolor) !important; --lwt-sidebar-text-color: var(--win-text-color) !important; } } @@ -312,14 +318,18 @@ :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme), :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) { .titlebar-color { - color: -moz-accent-color-foreground; - background-color: -moz-accent-color; + @include AccentColor { + color: $accentTextColor; + background-color: $accentColor; + } } .toolbar-items { --toolbarbutton-icon-fill: currentColor; - --toolbarbutton-hover-background: color-mix(in srgb, -moz-accent-color-foreground 10%, transparent); - --toolbarbutton-active-background: color-mix(in srgb, -moz-accent-color-foreground 15%, transparent); + @include AccentColor { + --toolbarbutton-hover-background: color-mix(in srgb, #{$accentTextColor} 10%, transparent); + --toolbarbutton-active-background: color-mix(in srgb, #{$accentTextColor} 15%, transparent); + } } } } diff --git a/arch-config/.mozilla/firefox/default-release/chrome/src/utils/_accent_color.scss b/arch-config/.mozilla/firefox/default-release/chrome/src/utils/_accent_color.scss new file mode 100644 index 00000000..03742e58 --- /dev/null +++ b/arch-config/.mozilla/firefox/default-release/chrome/src/utils/_accent_color.scss @@ -0,0 +1,21 @@ +@use "option" as *; + +// Compatibility for accent color +// https://github.com/mozilla/gecko-dev/commit/4c5f20179e8d3b963dc588efb9dc2c7b49e7bb31 +// +// Need to hard coded #437 +$accentColor: AccentColor; +$accentTextColor: AccentColorText; + +@mixin AccentColor() { + @content; + + @include Option("userChrome.compatibility.accent_color") { + $accentColor: -moz-accent-color !global; + $accentTextColor: -moz-accent-color-foreground !global; + + @content; + } + $accentColor: AccentColor !global; + $accentTextColor: AccentColorText !global; +} diff --git a/arch-config/.mozilla/firefox/default-release/chrome/src/utils/_proton_elements.scss b/arch-config/.mozilla/firefox/default-release/chrome/src/utils/_proton_elements.scss index 04eb4591..72892e36 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/src/utils/_proton_elements.scss +++ b/arch-config/.mozilla/firefox/default-release/chrome/src/utils/_proton_elements.scss @@ -1,3 +1,5 @@ +@use "accent_color" as *; + //== Radio Button ============================================================== @mixin RadioGlobal { /* margin-inline-start: 0 !important; */ @@ -88,63 +90,82 @@ @mixin CheckboxCheckedIcon { -moz-context-properties: fill !important; fill: currentColor !important; - color: var(--checkbox-checked-color, -moz-accent-color-foreground) !important; border-color: var(--checkbox-checked-border-color, transparent) !important; - background-color: var(--checkbox-checked-bgcolor, -moz-accent-color) !important; background-image: url("chrome://global/skin/icons/check.svg") !important; background-position: center !important; background-repeat: no-repeat !important; /* Style the button also when printing with "Print Backgrounds" unchecked */ color-adjust: exact !important; + + @include AccentColor { + color: var(--checkbox-checked-color, $accentTextColor) !important; + background-color: var(--checkbox-checked-bgcolor, $accentColor) !important; + } } @mixin CheckboxIconHover { - background-color: var( - --checkbox-unchecked-hover-bgcolor, - color-mix(in srgb, -moz-accent-color 4%, Field) - ) !important; + @include AccentColor { + background-color: var( + --checkbox-unchecked-hover-bgcolor, + color-mix(in srgb, $accentColor 4%, Field) + ) !important; + } } @mixin CheckboxIconActive { - background-color: var( - --checkbox-unchecked-active-bgcolor, - color-mix(in srgb, -moz-accent-color 8%, Field) - ) !important; + @include AccentColor { + background-color: var( + --checkbox-unchecked-active-bgcolor, + color-mix(in srgb, $accentColor 8%, Field) + ) !important; + } } @mixin CheckboxCheckedIconHover { - background-color: var( - --checkbox-checked-hover-bgcolor, - color-mix(in srgb, currentColor 12.5%, -moz-accent-color) - ) !important; + @include AccentColor { + background-color: var( + --checkbox-checked-hover-bgcolor, + color-mix(in srgb, currentColor 12.5%, $accentColor) + ) !important; + } } @mixin CheckboxCheckedIconActive { - background-color: var( - --checkbox-checked-active-bgcolor, - color-mix(in srgb, currentColor 25%, -moz-accent-color) - ) !important; + @include AccentColor { + background-color: var( + --checkbox-checked-active-bgcolor, + color-mix(in srgb, currentColor 25%, $accentColor) + ) !important; + } } @mixin CheckboxIconHoverContrast { - /* color will set the border-color on the check due to how HCM works for in-content pages. */ - color: var(--checkbox-checked-border-color, color-mix(in srgb, -moz-accent-color 4%, Field)) !important; + @include AccentColor { + /* color will set the border-color on the check due to how HCM works for in-content pages. */ + color: var(--checkbox-checked-border-color, color-mix(in srgb, $accentColor 4%, Field)) !important; + } } @mixin CheckboxCheckedIconContrast { color: var(--checkbox-checked-border-color, currentColor) !important; - fill: var(--checkbox-checked-color, -moz-accent-color-foreground) !important; + @include AccentColor { + fill: var(--checkbox-checked-color, $accentTextColor) !important; + } } @mixin CheckboxCheckedIconHoverContrast { - color: var(--checkbox-checked-border-color-hover, -moz-accent-color-foreground) !important; - fill: var(--checkbox-checked-border-color-hover, -moz-accent-color-foreground) !important; + @include AccentColor { + color: var(--checkbox-checked-border-color-hover, $accentTextColor) !important; + fill: var(--checkbox-checked-border-color-hover, $accentTextColor) !important; + } } @mixin CheckboxFocusRing { - outline: 2px solid var(--focus-outline-color, -moz-accent-color) !important; + @include AccentColor { + outline: 2px solid var(--focus-outline-color, $accentColor) !important; + } outline-offset: var(--focus-outline-offset, 2px) !important; } diff --git a/arch-config/.mozilla/firefox/default-release/prefs.js b/arch-config/.mozilla/firefox/default-release/prefs.js index b6e4d431..858f011b 100644 --- a/arch-config/.mozilla/firefox/default-release/prefs.js +++ b/arch-config/.mozilla/firefox/default-release/prefs.js @@ -23,16 +23,16 @@ user_pref("app.normandy.startupRolloutPrefs.pdfjs.renderInteractiveForms", true) user_pref("app.normandy.startupRolloutPrefs.security.bad_cert_domain_error.url_fix_enabled", true); user_pref("app.normandy.startupRolloutPrefs.security.remote_settings.intermediates.downloads_per_poll", 3000); user_pref("app.normandy.user_id", "e43b400f-0f20-4ae3-9dfa-ee00b787e18a"); -user_pref("app.update.lastUpdateTime.addon-background-update-timer", 1656956914); +user_pref("app.update.lastUpdateTime.addon-background-update-timer", 1658854339); user_pref("app.update.lastUpdateTime.blocklist-background-update-timer", 1588944333); -user_pref("app.update.lastUpdateTime.browser-cleanup-thumbnails", 1656959914); -user_pref("app.update.lastUpdateTime.recipe-client-addon-run", 1656956674); -user_pref("app.update.lastUpdateTime.region-update-timer", 1656609419); -user_pref("app.update.lastUpdateTime.rs-experiment-loader-timer", 1656956434); -user_pref("app.update.lastUpdateTime.search-engine-update-timer", 1656956554); -user_pref("app.update.lastUpdateTime.services-settings-poll-changes", 1656956794); -user_pref("app.update.lastUpdateTime.telemetry_modules_ping", 1656609539); -user_pref("app.update.lastUpdateTime.xpi-signature-verification", 1656957034); +user_pref("app.update.lastUpdateTime.browser-cleanup-thumbnails", 1658927698); +user_pref("app.update.lastUpdateTime.recipe-client-addon-run", 1658913418); +user_pref("app.update.lastUpdateTime.region-update-timer", 1658681659); +user_pref("app.update.lastUpdateTime.rs-experiment-loader-timer", 1658916778); +user_pref("app.update.lastUpdateTime.search-engine-update-timer", 1658913298); +user_pref("app.update.lastUpdateTime.services-settings-poll-changes", 1658854219); +user_pref("app.update.lastUpdateTime.telemetry_modules_ping", 1658681779); +user_pref("app.update.lastUpdateTime.xpi-signature-verification", 1658854459); user_pref("browser.aboutConfig.showWarning", false); user_pref("browser.bookmarks.defaultLocation", "Sf1F8MX-syPh"); user_pref("browser.bookmarks.editDialog.confirmationHintShowCount", 3); @@ -64,7 +64,7 @@ user_pref("browser.newtabpage.activity-stream.impressionId", "{2ddf8150-1c1e-4ec user_pref("browser.newtabpage.activity-stream.improvesearch.handoffToAwesomebar", false); user_pref("browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts.havePinned", "google"); user_pref("browser.newtabpage.activity-stream.showSponsoredTopSites", false); -user_pref("browser.newtabpage.pinned", "[]"); +user_pref("browser.newtabpage.pinned", "[{\"url\":\"https://google.com\",\"label\":\"@google\",\"searchTopSite\":true}]"); user_pref("browser.newtabpage.storageVersion", 1); user_pref("browser.pageActions.persistedActions", "{\"version\":1,\"ids\":[\"bookmark\",\"jid0-3guet1r69sqnsrca5p8kx9ezc3u_jetpack\",\"_testpilot-containers\",\"_036a55b4-5e72-4d05-a06c-cba2dfcc134a_\",\"firefox-translations-addon_mozilla_org\"],\"idsInUrlbar\":[\"jid0-3guet1r69sqnsrca5p8kx9ezc3u_jetpack\",\"_testpilot-containers\",\"_036a55b4-5e72-4d05-a06c-cba2dfcc134a_\",\"firefox-translations-addon_mozilla_org\",\"bookmark\"],\"idsInUrlbarPreProton\":[\"bookmark\"]}"); user_pref("browser.pagethumbnails.storage_version", 3); @@ -72,30 +72,31 @@ user_pref("browser.protections_panel.infoMessage.seen", true); user_pref("browser.proton.enabled", true); user_pref("browser.proton.places-tooltip.enabled", true); user_pref("browser.proton.toolbar.version", 3); -user_pref("browser.region.update.updated", 1656609420); +user_pref("browser.region.update.updated", 1658681660); user_pref("browser.rights.3.shown", true); user_pref("browser.safebrowsing.downloads.remote.enabled", false); user_pref("browser.safebrowsing.malware.enabled", false); user_pref("browser.safebrowsing.phishing.enabled", false); user_pref("browser.safebrowsing.provider.google4.lastupdatetime", "1654774495409"); user_pref("browser.safebrowsing.provider.google4.nextupdatetime", "1654776285409"); -user_pref("browser.safebrowsing.provider.mozilla.lastupdatetime", "1656956289571"); -user_pref("browser.safebrowsing.provider.mozilla.nextupdatetime", "1656977889571"); +user_pref("browser.safebrowsing.provider.mozilla.lastupdatetime", "1658913154614"); +user_pref("browser.safebrowsing.provider.mozilla.nextupdatetime", "1658934754614"); user_pref("browser.search.region", "CH"); user_pref("browser.sessionstore.upgradeBackup.latestBuildID", "20211121002925"); user_pref("browser.shell.checkDefaultBrowser", true); -user_pref("browser.shell.mostRecentDateSetAsDefault", "1656956287"); +user_pref("browser.shell.mostRecentDateSetAsDefault", "1658913152"); user_pref("browser.slowStartup.averageTime", 614); user_pref("browser.slowStartup.samples", 2); user_pref("browser.startup.couldRestoreSession.count", 1); -user_pref("browser.startup.homepage_override.buildID", "20220627181515"); -user_pref("browser.startup.homepage_override.mstone", "102.0"); -user_pref("browser.startup.lastColdStartupCheck", 1656956286); +user_pref("browser.startup.homepage_override.buildID", "20220706125320"); +user_pref("browser.startup.homepage_override.mstone", "102.0.1"); +user_pref("browser.startup.lastColdStartupCheck", 1658913152); user_pref("browser.startup.upgradeDialog.version", 100); user_pref("browser.theme.content-theme", 0); user_pref("browser.theme.toolbar-theme", 0); user_pref("browser.toolbars.bookmarks.showOtherBookmarks", false); user_pref("browser.toolbars.bookmarks.visibility", "always"); +user_pref("browser.translation.neverForLanguages", "de"); user_pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[\"https-everywhere_eff_org-browser-action\",\"jid1-mnnxcxisbpnsxq_jetpack-browser-action\",\"cookieautodelete_kennydo_com-browser-action\",\"enhancerforyoutube_maximerf_addons_mozilla_org-browser-action\",\"jid1-ciklkkpvkw6ipw_jetpack-browser-action\",\"_b86e4813-687a-43e6-ab65-0bde4ab75758_-browser-action\",\"sponsorblocker_ajay_app-browser-action\",\"_9a41dee2-b924-4161-a971-7fb35c053a4a_-browser-action\",\"languagetool-webextension_languagetool_org-browser-action\",\"_762f9885-5a13-4abd-9c77-433dcd38b8fd_-browser-action\",\"_884679b9-5d6b-48b2-90a7-15ae26ce568a_-browser-action\",\"_f5ffc648-66fb-4aae-bd47-fe9b87b1f408_-browser-action\",\"_6706d386-2d33-4e1e-bbf1-51b9e1ce47e1_-browser-action\",\"jid1-kkzogwgsw3ao4q_jetpack-browser-action\",\"addon_fastforward_team-browser-action\"],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"home-button\",\"customizableui-special-spring1\",\"urlbar-container\",\"customizableui-special-spring2\",\"downloads-button\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\",\"ublock0_raymondhill_net-browser-action\",\"keepassxc-browser_keepassxc_org-browser-action\",\"_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action\",\"wayback_machine_mozilla_org-browser-action\",\"_12cf650b-1822-40aa-bff0-996df6948878_-browser-action\",\"_529b261b-df0b-4e3b-bf42-07b462da0ee8_-browser-action\",\"_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action\",\"_a6c4a591-f1b2-4f03-b3ff-767e5bedf4e7_-browser-action\",\"_testpilot-containers-browser-action\",\"webtoepub_baka-tsuki_org-browser-action\",\"_c8f79b34-c3ff-4ce4-bdf4-eefa15c87f98_-browser-action\",\"_036a55b4-5e72-4d05-a06c-cba2dfcc134a_-browser-action\",\"adnauseam_rednoise_org-browser-action\",\"clearcache_michel_de_almeida-browser-action\",\"7esoorv3_alefvanoon_anonaddy_me-browser-action\"],\"toolbar-menubar\":[\"menubar-items\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"PersonalToolbar\":[\"personal-bookmarks\"]},\"seen\":[\"developer-button\",\"enhancerforyoutube_maximerf_addons_mozilla_org-browser-action\",\"cookieautodelete_kennydo_com-browser-action\",\"jid1-mnnxcxisbpnsxq_jetpack-browser-action\",\"https-everywhere_eff_org-browser-action\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\",\"ublock0_raymondhill_net-browser-action\",\"keepassxc-browser_keepassxc_org-browser-action\",\"_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action\",\"_9a41dee2-b924-4161-a971-7fb35c053a4a_-browser-action\",\"jid1-ciklkkpvkw6ipw_jetpack-browser-action\",\"save-to-pocket-button\",\"wayback_machine_mozilla_org-browser-action\",\"jid1-kkzogwgsw3ao4q_jetpack-browser-action\",\"languagetool-webextension_languagetool_org-browser-action\",\"sponsorblocker_ajay_app-browser-action\",\"_12cf650b-1822-40aa-bff0-996df6948878_-browser-action\",\"_529b261b-df0b-4e3b-bf42-07b462da0ee8_-browser-action\",\"_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action\",\"_a6c4a591-f1b2-4f03-b3ff-767e5bedf4e7_-browser-action\",\"_b86e4813-687a-43e6-ab65-0bde4ab75758_-browser-action\",\"_testpilot-containers-browser-action\",\"webtoepub_baka-tsuki_org-browser-action\",\"addon_fastforward_team-browser-action\",\"_6706d386-2d33-4e1e-bbf1-51b9e1ce47e1_-browser-action\",\"_762f9885-5a13-4abd-9c77-433dcd38b8fd_-browser-action\",\"_884679b9-5d6b-48b2-90a7-15ae26ce568a_-browser-action\",\"_c8f79b34-c3ff-4ce4-bdf4-eefa15c87f98_-browser-action\",\"7esoorv3_alefvanoon_anonaddy_me-browser-action\",\"_f5ffc648-66fb-4aae-bd47-fe9b87b1f408_-browser-action\",\"_036a55b4-5e72-4d05-a06c-cba2dfcc134a_-browser-action\",\"adnauseam_rednoise_org-browser-action\",\"clearcache_michel_de_almeida-browser-action\"],\"dirtyAreaCache\":[\"nav-bar\",\"toolbar-menubar\",\"TabsToolbar\",\"PersonalToolbar\",\"widget-overflow-fixed-list\"],\"currentVersion\":17,\"newElementCount\":21}"); user_pref("browser.urlbar.placeholderName", "DuckDuckGo"); user_pref("browser.urlbar.placeholderName.private", "DuckDuckGo"); @@ -126,13 +127,12 @@ user_pref("devtools.theme.show-auto-theme-info", false); user_pref("devtools.toolbox.footer.height", 382); user_pref("devtools.toolbox.host", "right"); user_pref("devtools.toolbox.previousHost", "bottom"); -user_pref("devtools.toolbox.selectedTool", "netmonitor"); user_pref("devtools.toolbox.sidebar.width", 664); user_pref("devtools.toolsidebar-height.inspector", 350); user_pref("devtools.toolsidebar-width.inspector", 700); user_pref("devtools.toolsidebar-width.inspector.splitsidebar", 250); user_pref("distribution.archlinux.bookmarksProcessed", true); -user_pref("distribution.iniFile.exists.appversion", "102.0"); +user_pref("distribution.iniFile.exists.appversion", "102.0.1"); user_pref("distribution.iniFile.exists.value", true); user_pref("doh-rollout.balrog-migration-done", true); user_pref("doh-rollout.disable-heuristics", true); @@ -150,17 +150,18 @@ user_pref("extensions.blocklist.pingCountVersion", -1); user_pref("extensions.databaseSchema", 35); user_pref("extensions.fxmonitor.enabled", false); user_pref("extensions.fxmonitor.firstAlertShown", true); -user_pref("extensions.getAddons.cache.lastUpdate", 1656956919); +user_pref("extensions.getAddons.cache.lastUpdate", 1658854339); user_pref("extensions.getAddons.databaseSchema", 6); user_pref("extensions.incognito.migrated", true); -user_pref("extensions.lastAppBuildId", "20220627181515"); -user_pref("extensions.lastAppVersion", "102.0"); -user_pref("extensions.lastPlatformVersion", "102.0"); +user_pref("extensions.lastAppBuildId", "20220706125320"); +user_pref("extensions.lastAppVersion", "102.0.1"); +user_pref("extensions.lastPlatformVersion", "102.0.1"); user_pref("extensions.pendingOperations", false); user_pref("extensions.pictureinpicture.enable_picture_in_picture_overrides", true); user_pref("extensions.reset_default_search.runonce.3", true); user_pref("extensions.reset_default_search.runonce.reason", "previousRun"); user_pref("extensions.systemAddonSet", "{\"schema\":1,\"addons\":{}}"); +user_pref("extensions.translations.disabled", false); user_pref("extensions.ui.dictionary.hidden", true); user_pref("extensions.ui.extension.hidden", false); user_pref("extensions.ui.lastCategory", "addons://list/extension"); @@ -231,26 +232,23 @@ user_pref("general.smoothScroll.stopDecelerationWeighting", "0.6"); user_pref("gfx.blacklist.webrender.failureid", "FEATURE_FAILURE_DDX_INTEL"); user_pref("identity.fxaccounts.account.device.name", "marc’s Firefox on lupusregina"); user_pref("identity.fxaccounts.account.telemetry.sanitized_uid", "7d43bb2e98e00c17c235782ba1e87861"); -user_pref("identity.fxaccounts.commands.missed.last_fetch", 1656956386); +user_pref("identity.fxaccounts.commands.missed.last_fetch", 1658855485); user_pref("identity.fxaccounts.lastSignedInUserHash", "8BRA9+6sRIqGXRuNxzfOnvsueJGliFd7TfEFww9llO8="); user_pref("identity.fxaccounts.toolbar.accessed", true); -user_pref("idle.lastDailyNotification", 1656858872); +user_pref("idle.lastDailyNotification", 1658916203); +user_pref("javascript.options.wasm_simd_wormhole", true); user_pref("layout.css.backdrop-filter.enabled", true); user_pref("layout.css.color-mix.enabled", true); user_pref("media.benchmark.vp9.fps", 256); user_pref("media.benchmark.vp9.versioncheck", 5); -user_pref("media.eme.enabled", true); user_pref("media.gmp-gmpopenh264.abi", "x86_64-gcc3"); user_pref("media.gmp-gmpopenh264.lastDownload", 1656608575); user_pref("media.gmp-gmpopenh264.lastInstallStart", 1656608575); user_pref("media.gmp-gmpopenh264.lastUpdate", 1656608575); user_pref("media.gmp-gmpopenh264.version", "1.8.1.2"); -user_pref("media.gmp-manager.buildID", "20220627181515"); -user_pref("media.gmp-manager.lastCheck", 1656956315); -user_pref("media.gmp-manager.lastEmptyCheck", 1656956315); -user_pref("media.gmp-widevinecdm.abi", "x86_64-gcc3"); -user_pref("media.gmp-widevinecdm.lastUpdate", 1652891135); -user_pref("media.gmp-widevinecdm.version", "4.10.2449.0"); +user_pref("media.gmp-manager.buildID", "20220706125320"); +user_pref("media.gmp-manager.lastCheck", 1658853325); +user_pref("media.gmp-manager.lastEmptyCheck", 1658853325); user_pref("media.gmp.storage.version.observed", 1); user_pref("media.peerconnection.enabled", false); user_pref("media.peerconnection.ice.default_address_only", true); @@ -260,6 +258,7 @@ user_pref("media.videocontrols.picture-in-picture.video-toggle.has-used", true); user_pref("mousewheel.acceleration.factor", 3); user_pref("mousewheel.min_line_scroll_amount", 0); user_pref("mousewheel.system_scroll_override_on_root_content.enabled", false); +user_pref("network.cookie.lifetimePolicy", 2); user_pref("network.dns.disablePrefetch", true); user_pref("network.http.referer.disallowCrossSiteRelaxingDefault.top_navigation", true); user_pref("network.http.speculative-parallel-limit", 0); @@ -274,7 +273,7 @@ user_pref("pdfjs.enabledCache.state", true); user_pref("pdfjs.migrationVersion", 2); user_pref("pdfjs.previousHandler.alwaysAskBeforeHandling", true); user_pref("pdfjs.previousHandler.preferredAction", 4); -user_pref("places.database.lastMaintenance", 1656609325); +user_pref("places.database.lastMaintenance", 1658681668); user_pref("places.history.expiration.transient_current_max_pages", 112348); user_pref("pref.general.disable_button.default_browser", false); user_pref("pref.privacy.disable_button.cookie_exceptions", false); @@ -337,7 +336,6 @@ user_pref("print.printer_HP_LaserJet_MFP_M426dw.print_unwriteable_margin_right", user_pref("print.printer_HP_LaserJet_MFP_M426dw.print_unwriteable_margin_top", 17); user_pref("print_printer", "HP_LaserJet_MFP_M426dw"); user_pref("privacy.annotate_channels.strict_list.enabled", true); -user_pref("privacy.clearOnShutdown.offlineApps", true); user_pref("privacy.history.custom", true); user_pref("privacy.partition.network_state.ocsp_cache", true); user_pref("privacy.purge_trackers.date_in_cookie_database", "0"); @@ -359,50 +357,50 @@ user_pref("services.blocklist.addons.checked", 1591867368); user_pref("services.blocklist.gfx.checked", 1654758333); user_pref("services.blocklist.pinning.checked", 1591805812); user_pref("services.blocklist.plugins.checked", 1591867368); -user_pref("services.settings.blocklists.addons-bloomfilters.last_check", 1656960499); -user_pref("services.settings.blocklists.gfx.last_check", 1656960499); -user_pref("services.settings.clock_skew_seconds", 1); -user_pref("services.settings.last_etag", "\"1656961035261\""); -user_pref("services.settings.last_update_seconds", 1656961398); -user_pref("services.settings.main.addons-manager-settings.last_check", 1656960499); -user_pref("services.settings.main.anti-tracking-url-decoration.last_check", 1656960499); +user_pref("services.settings.blocklists.addons-bloomfilters.last_check", 1658926970); +user_pref("services.settings.blocklists.gfx.last_check", 1658926970); +user_pref("services.settings.clock_skew_seconds", 0); +user_pref("services.settings.last_etag", "\"1658926637190\""); +user_pref("services.settings.last_update_seconds", 1658926970); +user_pref("services.settings.main.addons-manager-settings.last_check", 1658926970); +user_pref("services.settings.main.anti-tracking-url-decoration.last_check", 1658926970); user_pref("services.settings.main.cfr-fxa.last_check", 1629621510); -user_pref("services.settings.main.cfr.last_check", 1656960499); -user_pref("services.settings.main.devtools-compatibility-browsers.last_check", 1656960499); -user_pref("services.settings.main.doh-config.last_check", 1656960499); -user_pref("services.settings.main.doh-providers.last_check", 1656960499); -user_pref("services.settings.main.fxmonitor-breaches.last_check", 1656960499); -user_pref("services.settings.main.hijack-blocklists.last_check", 1656960499); -user_pref("services.settings.main.language-dictionaries.last_check", 1656960499); -user_pref("services.settings.main.message-groups.last_check", 1656960499); +user_pref("services.settings.main.cfr.last_check", 1658926970); +user_pref("services.settings.main.devtools-compatibility-browsers.last_check", 1658926970); +user_pref("services.settings.main.doh-config.last_check", 1658926970); +user_pref("services.settings.main.doh-providers.last_check", 1658926970); +user_pref("services.settings.main.fxmonitor-breaches.last_check", 1658926970); +user_pref("services.settings.main.hijack-blocklists.last_check", 1658926970); +user_pref("services.settings.main.language-dictionaries.last_check", 1658926970); +user_pref("services.settings.main.message-groups.last_check", 1658926970); user_pref("services.settings.main.messaging-experiments.last_check", 1591867368); -user_pref("services.settings.main.nimbus-desktop-defaults.last_check", 1656960499); -user_pref("services.settings.main.nimbus-desktop-experiments.last_check", 1656960499); -user_pref("services.settings.main.normandy-recipes-capabilities.last_check", 1656960499); -user_pref("services.settings.main.partitioning-exempt-urls.last_check", 1656960499); -user_pref("services.settings.main.password-recipes.last_check", 1656960499); -user_pref("services.settings.main.password-rules.last_check", 1656960499); -user_pref("services.settings.main.personality-provider-models.last_check", 1656960499); -user_pref("services.settings.main.personality-provider-recipe.last_check", 1656960499); -user_pref("services.settings.main.pioneer-study-addons-v1.last_check", 1656960499); -user_pref("services.settings.main.pioneer-study-addons.last_check", 1656960499); -user_pref("services.settings.main.public-suffix-list.last_check", 1656960499); -user_pref("services.settings.main.query-stripping.last_check", 1656960499); -user_pref("services.settings.main.search-config.last_check", 1656960499); -user_pref("services.settings.main.search-default-override-allowlist.last_check", 1656960499); -user_pref("services.settings.main.search-telemetry-v2.last_check", 1656960499); -user_pref("services.settings.main.search-telemetry.last_check", 1656960499); -user_pref("services.settings.main.sites-classification.last_check", 1656960499); -user_pref("services.settings.main.tippytop.last_check", 1656960499); -user_pref("services.settings.main.top-sites.last_check", 1656960499); -user_pref("services.settings.main.url-classifier-skip-urls.last_check", 1656960499); -user_pref("services.settings.main.websites-with-shared-credential-backends.last_check", 1656960499); -user_pref("services.settings.main.whats-new-panel.last_check", 1656960499); -user_pref("services.settings.security-state.cert-revocations.last_check", 1656961398); -user_pref("services.settings.security-state.intermediates.last_check", 1656960499); -user_pref("services.settings.security-state.onecrl.last_check", 1656960499); +user_pref("services.settings.main.nimbus-desktop-defaults.last_check", 1658926970); +user_pref("services.settings.main.nimbus-desktop-experiments.last_check", 1658926970); +user_pref("services.settings.main.normandy-recipes-capabilities.last_check", 1658926970); +user_pref("services.settings.main.partitioning-exempt-urls.last_check", 1658926970); +user_pref("services.settings.main.password-recipes.last_check", 1658926970); +user_pref("services.settings.main.password-rules.last_check", 1658926970); +user_pref("services.settings.main.personality-provider-models.last_check", 1658926970); +user_pref("services.settings.main.personality-provider-recipe.last_check", 1658926970); +user_pref("services.settings.main.pioneer-study-addons-v1.last_check", 1658926970); +user_pref("services.settings.main.pioneer-study-addons.last_check", 1658926970); +user_pref("services.settings.main.public-suffix-list.last_check", 1658926970); +user_pref("services.settings.main.query-stripping.last_check", 1658926970); +user_pref("services.settings.main.search-config.last_check", 1658926970); +user_pref("services.settings.main.search-default-override-allowlist.last_check", 1658926970); +user_pref("services.settings.main.search-telemetry-v2.last_check", 1658926970); +user_pref("services.settings.main.search-telemetry.last_check", 1658926970); +user_pref("services.settings.main.sites-classification.last_check", 1658926970); +user_pref("services.settings.main.tippytop.last_check", 1658926970); +user_pref("services.settings.main.top-sites.last_check", 1658926970); +user_pref("services.settings.main.url-classifier-skip-urls.last_check", 1658926970); +user_pref("services.settings.main.websites-with-shared-credential-backends.last_check", 1658926970); +user_pref("services.settings.main.whats-new-panel.last_check", 1658926970); +user_pref("services.settings.security-state.cert-revocations.last_check", 1658926970); +user_pref("services.settings.security-state.intermediates.last_check", 1658926970); +user_pref("services.settings.security-state.onecrl.last_check", 1658926970); user_pref("services.settings.security.onecrl.checked", 1654758333); -user_pref("services.sync.addons.lastSync", "1656936431.63"); +user_pref("services.sync.addons.lastSync", "1657114011.23"); user_pref("services.sync.addons.syncID", "L7k31iPXEMk6"); user_pref("services.sync.bookmarks.lastSync", "1591894790.66"); user_pref("services.sync.bookmarks.syncID", "3C9StXXGztPe"); @@ -410,8 +408,8 @@ user_pref("services.sync.client.GUID", "-S_pn8VT4ZCp"); user_pref("services.sync.client.syncID", "MtJM9DyW2j2m"); user_pref("services.sync.clients.devices.desktop", 2); user_pref("services.sync.clients.devices.mobile", 1); -user_pref("services.sync.clients.lastRecordUpload", 1656956293); -user_pref("services.sync.clients.lastSync", "1656959410.28"); +user_pref("services.sync.clients.lastRecordUpload", 1658913157); +user_pref("services.sync.clients.lastSync", "1658924589.13"); user_pref("services.sync.clients.syncID", "-UKRQIkr1Rru"); user_pref("services.sync.creditcards.lastSync", "0"); user_pref("services.sync.creditcards.syncID", "yp8F-l4YaopB"); @@ -426,12 +424,12 @@ user_pref("services.sync.extension-storage.lastSync", "0"); user_pref("services.sync.forms.lastSync", "0"); user_pref("services.sync.globalScore", 0); user_pref("services.sync.history.lastSync", "0"); -user_pref("services.sync.lastPing", 1656956292); -user_pref("services.sync.lastSync", "Mon Jul 04 2022 21:23:30 GMT+0200 (Central European Summer Time)"); +user_pref("services.sync.lastPing", 1658853907); +user_pref("services.sync.lastSync", "Wed Jul 27 2022 15:48:35 GMT+0200 (Central European Summer Time)"); user_pref("services.sync.lastTabFetch", 1586120826); user_pref("services.sync.nextSync", 0); user_pref("services.sync.passwords.syncID", "-WeMPm6W3NJC"); -user_pref("services.sync.prefs.lastSync", "1654774970.89"); +user_pref("services.sync.prefs.lastSync", "1657959687.00"); user_pref("services.sync.prefs.syncID", "SMCLZI5bvGCx"); user_pref("services.sync.syncInterval", 600000); user_pref("services.sync.syncThreshold", 300); @@ -445,9 +443,9 @@ user_pref("storage.vacuum.last.places.sqlite", 1656609325); user_pref("svg.context-properties.content.enabled", true); user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", true); user_pref("toolkit.scrollbox.horizontalScrollDistance", 4); -user_pref("toolkit.startup.last_success", 1656956281); +user_pref("toolkit.startup.last_success", 1658913145); user_pref("toolkit.telemetry.cachedClientID", "27215ebf-b618-4b9c-bd32-ceb6347e229a"); -user_pref("toolkit.telemetry.previousBuildID", "20220627181515"); +user_pref("toolkit.telemetry.previousBuildID", "20220706125320"); user_pref("toolkit.telemetry.reportingpolicy.firstRun", false); user_pref("trailhead.firstrun.didSeeAboutWelcome", true); user_pref("userChrome.compatibility.os", true); diff --git a/arch-config/.mozilla/firefox/default-release/user.js b/arch-config/.mozilla/firefox/default-release/user.js index 39c37eb8..0a1b3cc6 100644 --- a/arch-config/.mozilla/firefox/default-release/user.js +++ b/arch-config/.mozilla/firefox/default-release/user.js @@ -28,33 +28,36 @@ user_pref("browser.newtabpage.activity-stream.improvesearch.handoffToAwesomebar" // ** Theme Related Options **************************************************** // == Theme Distribution Settings ============================================== +// The rows that are located continuously must be changed `true`/`false` explicitly because there is a collision. +// https://github.com/black7375/Firefox-UI-Fix/wiki/Options#important user_pref("userChrome.tab.connect_to_window", true); // Original, Photon user_pref("userChrome.tab.color_like_toolbar", true); // Original, Photon -// user_pref("userChrome.tab.lepton_like_padding", true); // Original +user_pref("userChrome.tab.lepton_like_padding", false); // Original user_pref("userChrome.tab.photon_like_padding", true); // Photon -// user_pref("userChrome.tab.dynamic_separtor", true); // Original, Proton +user_pref("userChrome.tab.dynamic_separtor", false); // Original, Proton user_pref("userChrome.tab.static_separator", true); // Photon -// user_pref("userChrome.tab.static_separator.selected_accent", true); // Just option +user_pref("userChrome.tab.static_separator.selected_accent", false); // Just option -// user_pref("userChrome.tab.newtab_button_like_tab", true); // Original +user_pref("userChrome.tab.newtab_button_like_tab", false); // Original user_pref("userChrome.tab.newtab_button_smaller", true); // Photon -// user_pref("userChrome.tab.newtab_button_proton", true); // Proton +user_pref("userChrome.tab.newtab_button_proton", false); // Proton -// user_pref("userChrome.icon.panel_full", true); // Original, Proton +user_pref("userChrome.icon.panel_full", false); // Original, Proton user_pref("userChrome.icon.panel_photon", true); // Photon -// user_pref("userChrome.icon.panel_sparse", true); // Just option +user_pref("userChrome.icon.panel_sparse", false); // Just option // Original Only -// user_pref("userChrome.tab.box_shadow", true); -// user_pref("userChrome.tab.bottom_rounded_corner", true); +user_pref("userChrome.tab.box_shadow", false); +user_pref("userChrome.tab.bottom_rounded_corner", false); // Photon Only user_pref("userChrome.tab.photon_like_contextline", true); user_pref("userChrome.rounding.square_tab", true); // == Theme Compatibility Settings ============================================= +// user_pref("userChrome.compatibility.accent_color", true); // Firefox v103 Below // user_pref("userChrome.compatibility.covered_header_image", true); // user_pref("userChrome.compatibility.panel_cutoff", true); // user_pref("userChrome.compatibility.navbar_top_border", true); @@ -110,6 +113,7 @@ user_pref("userChrome.rounding.square_tab", true); // user_pref("userChrome.icon.account_image_to_right", true); // user_pref("userChrome.icon.account_label_to_right", true); // user_pref("userChrome.icon.menu.full", true); +// user_pref("userChrome.icon.global_menu.mac", true); // -- User Content ------------------------------------------------------------- // user_pref("userContent.player.ui.twoline", true); From cd03b977e440843ece4056c6c16cdbdad0563cb0 Mon Sep 17 00:00:00 2001 From: RealStickman Date: Fri, 29 Jul 2022 15:18:18 +0200 Subject: [PATCH 4/4] Add lineageos build instructions --- arch-config/Dokumente/lineageos-build.md | 84 ++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 arch-config/Dokumente/lineageos-build.md diff --git a/arch-config/Dokumente/lineageos-build.md b/arch-config/Dokumente/lineageos-build.md new file mode 100644 index 00000000..9a409bee --- /dev/null +++ b/arch-config/Dokumente/lineageos-build.md @@ -0,0 +1,84 @@ +# Build LineageOS +https://wiki.lineageos.org/devices/oneplus3/build +https://dzx.fr/blog/how-to-compile-the-wireguard-kernel-module-for-lineageos/ + +## Preparing environment +I'll be using a container to keep my main system clean + +Adapted from [How to build LineageOS inside a container](https://dzx.fr/blog/how-to-build-lineageos-inside-a-container/) + +``` +$ podman run -itd --name lineageos-build \ + -v /mnt/storage/lineageos-build:/var/lineageos-build \ + -v /home/marc/lineageos-cache:/var/lineageos-cache \ + docker.io/ubuntu:jammy-20220531 +``` + +Enter the newly created container +`$ podman exec -it lineageos-build bash` + +Install the necessary packages +`# apt update` +`# apt install bc bison build-essential ccache curl flex g++-multilib gcc-multilib git gnupg gperf imagemagick lib32ncurses5-dev lib32readline-dev lib32z1-dev liblz4-tool libncurses5 libncurses5-dev libsdl1.2-dev libssl-dev libxml2 libxml2-utils lzop pngcrush rsync schedtool squashfs-tools xsltproc zip zlib1g-dev python-is-python3 vim` + +Add an unpriviledged user for building +Make sure it can access the lineageos folders mounted +`# adduser --disabled-password (user)` +`# chown (user):(user) -R /var/lineageos-*` +`# su exu` + +Set cache and export to bashrc +Create the file `~/.config/ccache/ccache.conf` +``` +max_size = 30G +cache_dir = /var/lineageos-cache +``` + +`$ echo 'export USE_CCACHE=1' >> ~/.bashrc` + +### Install repo tool +``` +$ mkdir -p ~/.local/bin/ +$ source ~/.profile +``` + +``` +$ curl https://storage.googleapis.com/git-repo-downloads/repo > ~/.local/bin/repo +$ chmod a+x ~/.local/bin/repo +``` + +``` +$ git config --global user.email mrc@frm01.net +$ git config --global user.name RealStickman +``` + +### Get source lineage code +``` +$ mkdir -p /var/lineageos-build/lineage/ +$ cd /var/lineageos-build/lineage/ +``` + +Initialize the repo +`$ repo init -u https://github.com/LineageOS/android.git -b lineage-18.1` + +Sync repo content +This can take a long time +`$ repo sync --force-sync` + +Repo fetches the latest version automatically, so we can use a symlink +`$ ln -sf /var/lineageos-build/lineage/.repo/repo/repo ~/.local/bin/repo` + +### Download device source files +Activate the build environment +`$ . ./build/envsetup.sh` + +Finally, download device specific source files +`$ breakfast DEVICE_CODENAME` + +## Start build +Full build +`$ brunch marlin` + +Kernel only +`$ mka bootimage` +