From 603b7076518f726ebdfc84136b8f8eec94e34471 Mon Sep 17 00:00:00 2001 From: adamp01 Date: Mon, 24 Oct 2022 12:21:40 +0100 Subject: [PATCH 01/31] Fix: Rounding - allow squaring of additional findbar buttons --- css/leptonChrome.css | 3 ++- src/rounding/_square.scss | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 22962e4..81b21e3 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -3226,7 +3226,8 @@ /* Original: 4px */ } - button { + button, + findbar toolbarbutton { border-radius: 0 !important; } } diff --git a/src/rounding/_square.scss b/src/rounding/_square.scss index 139f7bb..35355c6 100644 --- a/src/rounding/_square.scss +++ b/src/rounding/_square.scss @@ -7,7 +7,9 @@ :root { --toolbarbutton-border-radius: 0 !important; /* Original: 4px */ } - button { + + button, + findbar toolbarbutton { border-radius: 0 !important; } } From f04799349c7837b4b7d955e6223706a656af4a71 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 24 Oct 2022 21:32:04 +0900 Subject: [PATCH 02/31] Fix: Autohide - Mac's titlebar container hide #494 --- css/leptonChrome.css | 39 +++++++++++++++++++++++++-------------- src/autohide/_tabbar.scss | 7 +++++-- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 81b21e3..8dfc4b2 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -7979,16 +7979,18 @@ will-change: margin-bottom; } + #TabsToolbar:not([customizing]) { + will-change: opacity; + } @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") { - #TabsToolbar:not([customizing]) { + #TabsToolbar:not([customizing]), + #TabsToolbar:not([customizing]) .titlebar-buttonbox-container { opacity: 0; - will-change: opacity; } } @supports -moz-bool-pref("userChrome.tabbar.on_bottom") { #TabsToolbar:not([customizing]) > *:not(.titlebar-buttonbox-container) { opacity: 0; - will-change: opacity; } } @@ -7996,7 +7998,8 @@ margin-bottom: 0px; } @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") { - #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar { + #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar, + #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar .titlebar-buttonbox-container { opacity: 1; } } @@ -8013,16 +8016,18 @@ will-change: margin-bottom; } + #TabsToolbar:not([customizing]) { + will-change: opacity; + } @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") { - #TabsToolbar:not([customizing]) { + #TabsToolbar:not([customizing]), + #TabsToolbar:not([customizing]) .titlebar-buttonbox-container { opacity: 0; - will-change: opacity; } } @supports -moz-bool-pref("userChrome.tabbar.on_bottom") { #TabsToolbar:not([customizing]) > *:not(.titlebar-buttonbox-container) { opacity: 0; - will-change: opacity; } } @@ -8030,7 +8035,8 @@ margin-bottom: 0px; } @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") { - #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar { + #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar, + #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar .titlebar-buttonbox-container { opacity: 1; } } @@ -8046,16 +8052,18 @@ will-change: margin-bottom; } + #TabsToolbar:not([customizing]) { + will-change: opacity; + } @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") { - #TabsToolbar:not([customizing]) { + #TabsToolbar:not([customizing]), + #TabsToolbar:not([customizing]) .titlebar-buttonbox-container { opacity: 0; - will-change: opacity; } } @supports -moz-bool-pref("userChrome.tabbar.on_bottom") { #TabsToolbar:not([customizing]) > *:not(.titlebar-buttonbox-container) { opacity: 0; - will-change: opacity; } } @@ -8063,7 +8071,8 @@ margin-bottom: 0px; } @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") { - #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar { + #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar, + #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar .titlebar-buttonbox-container { opacity: 1; } } @@ -8082,7 +8091,8 @@ } @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") { - #TabsToolbar:not([customizing]) { + #TabsToolbar:not([customizing]), + #TabsToolbar:not([customizing]) .titlebar-buttonbox-container { transition: opacity var(--uc-autohide-toolbar-speed) var(--animation-easing-function) var(--uc-autohide-toolbar-delay) !important; } @@ -8101,7 +8111,8 @@ transition-delay: 0s !important; } @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") { - #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar:not([customizing]) { + #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar:not([customizing]), + #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar:not([customizing]) .titlebar-buttonbox-container { transition-delay: 0s !important; } } diff --git a/src/autohide/_tabbar.scss b/src/autohide/_tabbar.scss index 3f2bda9..fe377cb 100644 --- a/src/autohide/_tabbar.scss +++ b/src/autohide/_tabbar.scss @@ -1,7 +1,10 @@ //-- Mixin --------------------------------------------------------------------- @mixin _autohide_tabbar() { @include NotOption("userChrome.tabbar.on_bottom") { - @content; + &, + & .titlebar-buttonbox-container { + @content; + } } @include Option("userChrome.tabbar.on_bottom") { > *:not(.titlebar-buttonbox-container) { @@ -20,8 +23,8 @@ #TabsToolbar:not([customizing]) { @include _autohide_tabbar { opacity: 0; - will-change: opacity; } + will-change: opacity; } #navigator-toolbox:is(:hover, :focus-within) { From c738e01009277ad175c001f75fff659e644d7c45 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 25 Oct 2022 10:43:10 +0900 Subject: [PATCH 03/31] Fix: Icons - Mac's contents area --- css/leptonChrome.css | 2 +- src/icons/context_menu/_content_area.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 8dfc4b2..bb1ad93 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -10249,7 +10249,7 @@ /* iconic */ } - @supports -moz-bool-pref("widget.macos.native-context-menus") or -moz-bool-pref("widget.gtk.native-context-menus") { + @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { #context-back { --menuitem-image: url("chrome://browser/skin/back.svg"); } diff --git a/src/icons/context_menu/_content_area.scss b/src/icons/context_menu/_content_area.scss index c74e829..14d7716 100644 --- a/src/icons/context_menu/_content_area.scss +++ b/src/icons/context_menu/_content_area.scss @@ -243,7 +243,7 @@ /* iconic */ } -@include NativeMenu { +@include OS($mac) { #context-back { --menuitem-image: url("chrome://browser/skin/back.svg"); } From b456d5ca0646469a709ed91dcaa030e9ba78a396 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Thu, 27 Oct 2022 15:47:05 +0900 Subject: [PATCH 04/31] Fix: Rounding - Square field apply for urlbar, searchbar --- css/leptonChrome.css | 5 +++++ src/rounding/_square.scss | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index bb1ad93..2e18b09 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -3271,6 +3271,11 @@ html|input { border-radius: 0 !important; } + + #urlbar-background, + #searchbar { + --toolbarbutton-border-radius: 0; + } } @supports -moz-bool-pref("userChrome.rounding.square_checklabel") { .checkbox-check, diff --git a/src/rounding/_square.scss b/src/rounding/_square.scss index 35355c6..fa92deb 100644 --- a/src/rounding/_square.scss +++ b/src/rounding/_square.scss @@ -56,6 +56,11 @@ html|input { border-radius: 0 !important; } + + #urlbar-background, + #searchbar { + --toolbarbutton-border-radius: 0; + } } @include Option("userChrome.rounding.square_checklabel") { From 1cbcb9a9f16fdf5b548000ad35fa198b587c7cfb Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Thu, 27 Oct 2022 15:55:26 +0900 Subject: [PATCH 05/31] Fix: Autohide - Urlbar over bookmarkbar --- css/leptonChrome.css | 4 ++++ src/autohide/_common.scss | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 2e18b09..11bbbdc 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -7853,6 +7853,10 @@ z-index: 3; } } + #PersonalToolbar { + z-index: -1; + } + #sidebar-box:is(:hover, :focus-within) { position: relative; z-index: 2 !important; diff --git a/src/autohide/_common.scss b/src/autohide/_common.scss index a34b0f8..185d6c9 100644 --- a/src/autohide/_common.scss +++ b/src/autohide/_common.scss @@ -45,6 +45,10 @@ } } + #PersonalToolbar { + z-index: -1; + } + #sidebar-box:is(:hover, :focus-within) { position: relative; z-index: 2 !important; From 3315105d1dd6caea9cd0ebe0b20b6cb771c9e25f Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 28 Oct 2022 18:46:15 +0900 Subject: [PATCH 06/31] Fix: Icon - Replace save file icon #496 --- css/leptonChrome.css | 10 +++++----- css/leptonContent.css | 2 +- icons/toolbarButton-download.svg | 4 ++++ src/icons/_global_menu.scss | 2 +- src/icons/_library.scss | 2 +- src/icons/_panel.scss | 2 +- src/icons/context_menu/_content_area.scss | 4 ++-- 7 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 icons/toolbarButton-download.svg diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 11bbbdc..d5b3715 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -8941,7 +8941,7 @@ @supports -moz-bool-pref("userChrome.icon.panel_full") { #appMenu-save-file-button2 { - list-style-image: url("chrome://browser/skin/save.svg"); + list-style-image: url("../icons/toolbarButton-download.svg"); } #appMenu-find-button2 { @@ -10016,7 +10016,7 @@ } #context-savelink { - --menuitem-image: url("chrome://browser/skin/save.svg"); + --menuitem-image: url("../icons/toolbarButton-download.svg"); } #context-savelinktopocket { @@ -10146,7 +10146,7 @@ } #context-savepage { - --menuitem-image: url("chrome://browser/skin/save.svg"); + --menuitem-image: url("../icons/toolbarButton-download.svg"); } #context-pocket { @@ -10744,7 +10744,7 @@ } #menu_savePage { - --menuitem-image: url("chrome://browser/skin/save.svg"); + --menuitem-image: url("../icons/toolbarButton-download.svg"); } #menu_sendLink { @@ -11112,7 +11112,7 @@ } #fileImport { - --menuitem-image: url("chrome://browser/skin/save.svg"); + --menuitem-image: url("../icons/toolbarButton-download.svg"); } #fileExport { diff --git a/css/leptonContent.css b/css/leptonContent.css index 03b4729..09697f5 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -3403,7 +3403,7 @@ } #fileImport { - --menuitem-image: url("chrome://browser/skin/save.svg"); + --menuitem-image: url("../icons/toolbarButton-download.svg"); } #fileExport { diff --git a/icons/toolbarButton-download.svg b/icons/toolbarButton-download.svg new file mode 100644 index 0000000..651e702 --- /dev/null +++ b/icons/toolbarButton-download.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/icons/_global_menu.scss b/src/icons/_global_menu.scss index fc6d034..0c20225 100644 --- a/src/icons/_global_menu.scss +++ b/src/icons/_global_menu.scss @@ -27,7 +27,7 @@ } #menu_savePage { - --menuitem-image: url("chrome://browser/skin/save.svg"); + --menuitem-image: url("../icons/toolbarButton-download.svg"); } #menu_sendLink { --menuitem-image: url("chrome://browser/skin/mail.svg"); diff --git a/src/icons/_library.scss b/src/icons/_library.scss index fc2b57b..a65d505 100644 --- a/src/icons/_library.scss +++ b/src/icons/_library.scss @@ -55,7 +55,7 @@ } #fileImport { - --menuitem-image: url("chrome://browser/skin/save.svg"); + --menuitem-image: url("../icons/toolbarButton-download.svg"); } #fileExport { --menuitem-image: url("chrome://browser/skin/open.svg"); diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss index cad45e4..9ff4cb7 100644 --- a/src/icons/_panel.scss +++ b/src/icons/_panel.scss @@ -88,7 +88,7 @@ } @include Option("userChrome.icon.panel_full") { #appMenu-save-file-button2 { - list-style-image: url("chrome://browser/skin/save.svg"); + list-style-image: url("../icons/toolbarButton-download.svg"); } #appMenu-find-button2 { list-style-image: url("chrome://global/skin/icons/search-glass.svg"); diff --git a/src/icons/context_menu/_content_area.scss b/src/icons/context_menu/_content_area.scss index 14d7716..8655845 100644 --- a/src/icons/context_menu/_content_area.scss +++ b/src/icons/context_menu/_content_area.scss @@ -45,7 +45,7 @@ --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } #context-savelink { - --menuitem-image: url("chrome://browser/skin/save.svg"); + --menuitem-image: url("../icons/toolbarButton-download.svg"); } #context-savelinktopocket { --menuitem-image: url("../icons/pocket-outline.svg"); @@ -148,7 +148,7 @@ } #context-savepage { - --menuitem-image: url("chrome://browser/skin/save.svg"); + --menuitem-image: url("../icons/toolbarButton-download.svg"); } #context-pocket { --menuitem-image: url("../icons/pocket-outline.svg"); From af94a48997b15eb73502f0f0bc1cb06c902ab44f Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 28 Oct 2022 19:13:14 +0900 Subject: [PATCH 07/31] Fix: Icon - Adjust `file save`'s size #496 --- icons/toolbarButton-download.svg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/icons/toolbarButton-download.svg b/icons/toolbarButton-download.svg index 651e702..6d64757 100644 --- a/icons/toolbarButton-download.svg +++ b/icons/toolbarButton-download.svg @@ -1,4 +1,4 @@ - - + + From 78e3fe21915c81d7be5cd7c63fe2b8f7acd7538c Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sat, 29 Oct 2022 13:03:57 +0900 Subject: [PATCH 08/31] Fix: Fully Color - Sidebar context menu hover color #495 --- css/leptonChrome.css | 1 + src/theme/_fully_color.scss | 2 ++ 2 files changed, 3 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index d5b3715..ccbf8ec 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -1420,6 +1420,7 @@ /* or var(--lwt-sidebar-highlight-background-color) If this value is used, unset is required in the default theme. */ + background-color: var(--menuitem-hover-background-color) !important; } /* Fallback background - Set to Legacy. It will be removed Next update diff --git a/src/theme/_fully_color.scss b/src/theme/_fully_color.scss index 3f230c7..fc20cf7 100644 --- a/src/theme/_fully_color.scss +++ b/src/theme/_fully_color.scss @@ -84,6 +84,8 @@ html#main-window menupopup:not(.in-menulist) { /* or var(--lwt-sidebar-highlight-background-color) If this value is used, unset is required in the default theme. */ + + background-color: var(--menuitem-hover-background-color) !important; } /* Fallback background - Set to Legacy. It will be removed Next update From d4891892a959657e3e125a952eebb5e8c40a6506 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 31 Oct 2022 20:58:35 +0900 Subject: [PATCH 09/31] Add: Separator - Bar --- css/leptonChrome.css | 51 ++++++++++++++++- src/tab/_selected_tab.scss | 12 ++++ src/tab/_unselected_tab.scss | 5 ++ .../_photon_like_contextline.scss | 11 ---- src/tab/unselected_tab/_bar_separator.scss | 55 +++++++++++++++++++ user.js | 1 + 6 files changed, 123 insertions(+), 12 deletions(-) create mode 100644 src/tab/unselected_tab/_bar_separator.scss diff --git a/css/leptonChrome.css b/css/leptonChrome.css index a419915..7ff911a 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -6592,7 +6592,7 @@ } } /*= Selected Tab - Photon like contextline ===================================*/ -@supports -moz-bool-pref("userChrome.tab.photon_like_contextline") { +@supports -moz-bool-pref("userChrome.tab.photon_like_contextline") or -moz-bool-pref("userChrome.tab.bar_separator") { :root[lwtheme-mozlightdark] #tabbrowser-tabs, :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"], :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] { @@ -6605,6 +6605,8 @@ /* -moz-accent-color */ } } +} +@supports -moz-bool-pref("userChrome.tab.photon_like_contextline") { .tab-context-line { display: -moz-inline-box !important; height: 2px !important; @@ -6912,6 +6914,53 @@ } } } +/*= Unselected Tab - Bar Separator ===========================================*/ +@supports -moz-bool-pref("userChrome.tab.bar_separator") { + .tab-stack::before { + /* Box Model */ + content: ""; + display: block; + position: absolute; + /* Position */ + top: 50%; + left: 0%; + transform: translateX(calc((var(--inline-tab-padding) - 5px) / 2)) translateY(calc(-50% + var(--tab-block-margin))); + z-index: 1; + /* Bar shape */ + width: 3px; + height: 20px; + /* Bar Color */ + background-color: var(--uc-bar-separator-color, var(--tab-line-color, var(--lwt-tab-line-color, #0a84ff))); + } + @media (prefers-reduced-motion: no-preference) { + .tab-stack::before { + transition-property: opacity, background-color; + transition-duration: 0.2s; + transition-timing-function: var(--animation-easing-function); + /* cubic-bezier(.07, .95, 0, 1) */ + } + } + + :root[sessionrestored] .tabbrowser-tab[busy] .tab-stack::before { + --uc-bar-separator-color: currentColor; + opacity: 0.7; + } + :root[sessionrestored] .tabbrowser-tab[busy][progress] .tab-stack::before { + --uc-bar-separator-color: var(--tab-loading-fill); + opacity: 1; + } + :root[sessionrestored] + #TabsToolbar[brighttext] + .tabbrowser-tab[busy][progress]:not([selected="true"]) + .tab-stack::before { + --uc-bar-separator-color: var(--lwt-tab-loading-fill-inactive, #84c1ff); + } + @supports -moz-bool-pref("userChrome.tab.unloaded") { + :root[sessionrestored] .tabbrowser-tab[pending] .tab-stack::before { + opacity: 0.7; + } + } +} /*= New tab button ============================================================*/ /*= New tab button - Looks like tab ==========================================*/ @supports -moz-bool-pref("userChrome.tab.newtab_button_like_tab") { diff --git a/src/tab/_selected_tab.scss b/src/tab/_selected_tab.scss index 8ef7dd8..c3d1e0a 100644 --- a/src/tab/_selected_tab.scss +++ b/src/tab/_selected_tab.scss @@ -19,6 +19,18 @@ } /*= Selected Tab - Photon like contextline ===================================*/ +@include Option("userChrome.tab.photon_like_contextline", "userChrome.tab.bar_separator") { + :root[lwtheme-mozlightdark] #tabbrowser-tabs, /* Legacy: v96 */ + :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"], + :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] { + --tab-line-color: rgb(10, 132, 255) !important; + } + @media (-moz-gtk-csd-available) { + :root:not(:-moz-lwtheme) #tabbrowser-tabs { + --tab-line-color: Highlight !important; /* -moz-accent-color */ + } + } +} @include Option("userChrome.tab.photon_like_contextline") { @import "selected_tab/photon_like_contextline"; } diff --git a/src/tab/_unselected_tab.scss b/src/tab/_unselected_tab.scss index 6332380..b0e4b4d 100644 --- a/src/tab/_unselected_tab.scss +++ b/src/tab/_unselected_tab.scss @@ -7,3 +7,8 @@ @include Option("userChrome.tab.static_separator") { @import "unselected_tab/static_separator"; } + +/*= Unselected Tab - Bar Separator ===========================================*/ +@include Option("userChrome.tab.bar_separator") { + @import "unselected_tab/bar_separator"; +} diff --git a/src/tab/selected_tab/_photon_like_contextline.scss b/src/tab/selected_tab/_photon_like_contextline.scss index fd1d26b..13d7644 100644 --- a/src/tab/selected_tab/_photon_like_contextline.scss +++ b/src/tab/selected_tab/_photon_like_contextline.scss @@ -1,14 +1,3 @@ -:root[lwtheme-mozlightdark] #tabbrowser-tabs, /* Legacy: v96 */ -:root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"], -:root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] { - --tab-line-color: rgb(10, 132, 255) !important; -} -@media (-moz-gtk-csd-available) { - :root:not(:-moz-lwtheme) #tabbrowser-tabs { - --tab-line-color: Highlight !important; /* -moz-accent-color */ - } -} - .tab-context-line { display: -moz-inline-box !important; height: 2px !important; diff --git a/src/tab/unselected_tab/_bar_separator.scss b/src/tab/unselected_tab/_bar_separator.scss new file mode 100644 index 0000000..ebd2b52 --- /dev/null +++ b/src/tab/unselected_tab/_bar_separator.scss @@ -0,0 +1,55 @@ +// Using --tab-line-color at photon_line_contextline + +.tab-stack::before { + $barWidth: 3px; + $barMargin: $barWidth + 2px; + + /* Box Model */ + content: ""; + display: block; + position: absolute; + + /* Position */ + top: 50%; + left: 0%; + transform: translateX(calc((var(--inline-tab-padding) - #{ $barMargin }) / 2)) translateY(calc(-50% + var(--tab-block-margin))); + z-index: 1; + + /* Bar shape */ + width: $barWidth; + height: 20px; + + /* Bar Color */ + background-color: var(--uc-bar-separator-color, var(--tab-line-color, var(--lwt-tab-line-color, rgb(10, 132, 255)))); + + @include Animate { + transition-property: opacity, background-color; + transition-duration: 0.2s; + transition-timing-function: var(--animation-easing-function); /* cubic-bezier(.07, .95, 0, 1) */ + } +} + +:root[sessionrestored] { + .tabbrowser-tab[busy] { + .tab-stack::before { + --uc-bar-separator-color: currentColor; + opacity: 0.7; + } + + &[progress] .tab-stack::before { + --uc-bar-separator-color: var(--tab-loading-fill); + opacity: 1; + } + } + #TabsToolbar[brighttext] .tabbrowser-tab[busy] { + &[progress]:not([selected=true]) .tab-stack::before { + --uc-bar-separator-color: var(--lwt-tab-loading-fill-inactive, #84c1ff); + } + } + + @include Option("userChrome.tab.unloaded") { + .tabbrowser-tab[pending] .tab-stack::before { + opacity: 0.7; + } + } +} diff --git a/user.js b/user.js index 6082a5a..c15571f 100644 --- a/user.js +++ b/user.js @@ -42,6 +42,7 @@ user_pref("userChrome.tab.photon_like_padding", false); // Photon user_pref("userChrome.tab.dynamic_separator", true); // Original, Proton user_pref("userChrome.tab.static_separator", false); // Photon user_pref("userChrome.tab.static_separator.selected_accent", false); // Just option +user_pref("userChrome.tab.bar_separator", false); // Just option user_pref("userChrome.tab.newtab_button_like_tab", true); // Original user_pref("userChrome.tab.newtab_button_smaller", false); // Photon From ebef2205517b61656a6d35b61c6d0e3052d6959f Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 1 Nov 2022 23:23:49 +0900 Subject: [PATCH 10/31] Fix: Tab Bar - Connected at `Ambiance` theme #499 --- css/leptonChrome.css | 2 +- src/tab/_connect_to_window.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index ccbf8ec..6542a87 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -6202,7 +6202,7 @@ } #TabsToolbar:not([multibar]) { - overflow: hidden; + overflow: clip; /* Prevent toolbar area over */ } diff --git a/src/tab/_connect_to_window.scss b/src/tab/_connect_to_window.scss index cd05b30..11ffa74 100644 --- a/src/tab/_connect_to_window.scss +++ b/src/tab/_connect_to_window.scss @@ -17,7 +17,7 @@ z-index: 1 !important; } #TabsToolbar:not([multibar]) { - overflow: hidden; /* Prevent toolbar area over */ + overflow: clip; /* Prevent toolbar area over */ } /* Pinned Tab - tabbrowser-arrowscrollbox overflowing */ From b4b9e295a31e6933b250c38e1c9dcd3f687a6573 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Wed, 2 Nov 2022 18:09:36 +0900 Subject: [PATCH 11/31] Add: Unified Extenstion Panel Supports - `extensions.unifiedExtensions.enabled` to `true` --- css/leptonChrome.css | 22 +++++++++++++++++++++- src/decoration/_cursor.scss | 4 +++- src/icons/_panel.scss | 5 +++++ src/icons/context_menu/_others.scss | 11 +++++++++++ 4 files changed, 40 insertions(+), 2 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 6542a87..df39d84 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -2939,7 +2939,9 @@ #protections-popup-footer .protections-popup-footer-button, #protections-popup-multiView .panel-subview-footer-button, #identity-popup-clear-sitedata-button, - #identity-popup-more-info { + #identity-popup-more-info, + #unified-extensions-manage-extensions, + .unified-extensions-item-open-menu { cursor: pointer !important; } @@ -9364,6 +9366,11 @@ #sidebarMenu-popup > .subviewbutton[data-l10n-id="sidebar-menu-close"] { list-style-image: url("chrome://global/skin/icons/close.svg"); } + + /*= unified-extensions-view ===================================================*/ + #unified-extensions-manage-extensions { + list-style-image: url("chrome://mozapps/skin/extensions/extension.svg"); + } } /** Menu - Icons Layout *******************************************************/ @supports -moz-bool-pref("userChrome.icon.menu") { @@ -10690,6 +10697,19 @@ #treestyletab_piro_sakura_ne_jp-menuitem-_context_sendTabsToDevice\:manage { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); } + + /*= unified-extensions-context-menu ==========================================*/ + .unified-extensions-context-menu-manage-extension { + --menuitem-image: url("chrome://global/skin/icons/settings.svg"); + } + + .unified-extensions-context-menu-remove-extension { + --menuitem-image: url("chrome://global/skin/icons/delete.svg"); + } + + .unified-extensions-context-menu-report-extension { + --menuitem-image: url("../icons/send.svg"); + } } @supports -moz-bool-pref("userChrome.icon.global_menubar") { /*= main-menubar =============================================================*/ diff --git a/src/decoration/_cursor.scss b/src/decoration/_cursor.scss index 7166ca9..74aec7c 100644 --- a/src/decoration/_cursor.scss +++ b/src/decoration/_cursor.scss @@ -21,7 +21,9 @@ menuitem.openintabs-menuitem, #protections-popup-footer .protections-popup-footer-button, #protections-popup-multiView .panel-subview-footer-button, #identity-popup-clear-sitedata-button, -#identity-popup-more-info { +#identity-popup-more-info, +#unified-extensions-manage-extensions, +.unified-extensions-item-open-menu { cursor: pointer !important; } diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss index 9ff4cb7..575208c 100644 --- a/src/icons/_panel.scss +++ b/src/icons/_panel.scss @@ -473,3 +473,8 @@ panelMenuBookmarkThisPage[starred] { #sidebarMenu-popup > .subviewbutton[data-l10n-id="sidebar-menu-close"] { list-style-image: url("chrome://global/skin/icons/close.svg"); } + +/*= unified-extensions-view ===================================================*/ +#unified-extensions-manage-extensions { + list-style-image: url("chrome://mozapps/skin/extensions/extension.svg"); +} diff --git a/src/icons/context_menu/_others.scss b/src/icons/context_menu/_others.scss index 25f28d8..04c48cc 100644 --- a/src/icons/context_menu/_others.scss +++ b/src/icons/context_menu/_others.scss @@ -213,3 +213,14 @@ menuitem.searchbar-clear-history { #treestyletab_piro_sakura_ne_jp-menuitem-_context_sendTabsToDevice\:manage { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); } + +/*= unified-extensions-context-menu ==========================================*/ +.unified-extensions-context-menu-manage-extension { + --menuitem-image: url("chrome://global/skin/icons/settings.svg"); +} +.unified-extensions-context-menu-remove-extension { + --menuitem-image: url("chrome://global/skin/icons/delete.svg"); +} +.unified-extensions-context-menu-report-extension { + --menuitem-image: url("../icons/send.svg"); +} From 44e8d5018a957b62e530c4e413939f50a2753f5a Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Thu, 3 Nov 2022 12:39:44 +0900 Subject: [PATCH 12/31] Fix: Counter - Tab with sound tab --- css/leptonChrome.css | 50 ++++++++++++++++++++-- src/counter/_tab.scss | 37 ++++++++++++++++ src/tab/sound_tab/_show_with_favicons.scss | 2 +- 3 files changed, 84 insertions(+), 5 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 7ff911a..5647d70 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -7367,8 +7367,7 @@ .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked]) .tab-label-container[labeldirection="rtl"], .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked]) - .tab-label-container - :not([labeldirection]):-moz-locale-dir(rtl) { + .tab-label-container:not([labeldirection]):-moz-locale-dir(rtl) { --uc-sound-tab-label-position-x: -4px; } .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked]) @@ -7388,8 +7387,7 @@ .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked]) .tab-label-container[labeldirection="rtl"], .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked]) - .tab-label-container - :not([labeldirection]):-moz-locale-dir(rtl) { + .tab-label-container:not([labeldirection]):-moz-locale-dir(rtl) { --uc-sound-tab-label-position-x: -4px; } .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked]) @@ -8214,6 +8212,50 @@ .tab-secondary-label { overflow: hidden; } + + @supports -moz-bool-pref("userChrome.tab.sound_with_favicons") { + @supports not -moz-bool-pref("userChrome.hidden.tab_icon") { + .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])[pinned] + .tab-label-container[labeldirection="ltr"], + .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])[pinned] + .tab-label-container:not([labeldirection]):-moz-locale-dir(ltr) { + --uc-sound-tab-label-position-x: 2px; + } + .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])[pinned] + .tab-label-container[labeldirection="rtl"], + .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])[pinned] + .tab-label-container:not([labeldirection]):-moz-locale-dir(rtl) { + --uc-sound-tab-label-position-x: -2px; + } + .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked]) + .tab-label-container::before { + transform: translateX(var(--uc-sound-tab-label-position-x, 0px)); + } + } + @supports -moz-bool-pref("userChrome.hidden.tab_icon") { + @supports not -moz-bool-pref("userChrome.hidden.tab_icon.always") { + .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])[pinned] + .tab-label-container[labeldirection="ltr"], + .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])[pinned] + .tab-label-container:not([labeldirection]):-moz-locale-dir(ltr) { + --uc-sound-tab-label-position-x: 2px; + } + .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])[pinned] + .tab-label-container[labeldirection="rtl"], + .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])[pinned] + .tab-label-container:not([labeldirection]):-moz-locale-dir(rtl) { + --uc-sound-tab-label-position-x: -2px; + } + .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked]) + .tab-label-container::before { + transform: translateX(var(--uc-sound-tab-label-position-x, 0px)); + } + } + } + .tab-label-container::beforee { + transition: transform 0.25s var(--animation-easing-function); + } + } } /*= Counter for Bookmark menu ================================================*/ @supports -moz-bool-pref("userChrome.counter.bookmark_menu") { diff --git a/src/counter/_tab.scss b/src/counter/_tab.scss index 108793c..baeae33 100644 --- a/src/counter/_tab.scss +++ b/src/counter/_tab.scss @@ -10,6 +10,18 @@ } } +// Copy from "../tab/sound_tab/show_with_favicons" +@mixin _hidden_tabIcon_soundTabLabel() { + @include NotOption("userChrome.hidden.tab_icon") { + @content; + } + @include Option("userChrome.hidden.tab_icon") { + @include NotOption("userChrome.hidden.tab_icon.always") { + @content; + } + } +} + //------------------------------------------------------------------------------ #tabbrowser-tabs { @@ -61,3 +73,28 @@ .tab-secondary-label { overflow: hidden; } + +// Compatibility with sound tab +@include Option("userChrome.tab.sound_with_favicons") { + @include _hidden_tabIcon_soundTabLabel { + .tabbrowser-tab:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked]) { + &[pinned] .tab-label-container { + &[labeldirection=ltr], + &:not([labeldirection]):-moz-locale-dir(ltr) { + --uc-sound-tab-label-position-x: 2px; + } + &[labeldirection=rtl], + &:not([labeldirection]):-moz-locale-dir(rtl) { + --uc-sound-tab-label-position-x: -2px; + } + } + .tab-label-container::before { + transform: translateX(var(--uc-sound-tab-label-position-x, 0px)); + } + } + } + + .tab-label-container::beforee { + transition: transform 0.25s var(--animation-easing-function); + } +} diff --git a/src/tab/sound_tab/_show_with_favicons.scss b/src/tab/sound_tab/_show_with_favicons.scss index a521b62..e38ae5c 100644 --- a/src/tab/sound_tab/_show_with_favicons.scss +++ b/src/tab/sound_tab/_show_with_favicons.scss @@ -69,7 +69,7 @@ --uc-sound-tab-label-position-x: 4px; } &[labeldirection=rtl], - :not([labeldirection]):-moz-locale-dir(rtl) { + &:not([labeldirection]):-moz-locale-dir(rtl) { --uc-sound-tab-label-position-x: -4px; } From aff13a5984c53aca5a3282a34dacb64e5014c0c7 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 4 Nov 2022 02:55:46 +0900 Subject: [PATCH 13/31] Fix: AutoHide - Adjust interaction area #501 --- css/leptonChrome.css | 11 ++++++----- src/autohide/_common.scss | 14 ++++++++------ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index df39d84..3e5bbd6 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -7841,10 +7841,15 @@ or -moz-bool-pref("userChrome.autohide.infobar") { #navigator-toolbox { position: relative; + } + #navigator-toolbox:is(:hover, :focus-within) { z-index: 2; } + #navigator-toolbox:is(:hover, :focus-within) #PersonalToolbar { + z-index: -1; + } - #navigator-toolbox:not(:hover) { + #navigator-toolbox:not(:hover):not(:focus-within) { animation: 1s keepfront; } @@ -7856,10 +7861,6 @@ z-index: 3; } } - #PersonalToolbar { - z-index: -1; - } - #sidebar-box:is(:hover, :focus-within) { position: relative; z-index: 2 !important; diff --git a/src/autohide/_common.scss b/src/autohide/_common.scss index 185d6c9..1fde6d6 100644 --- a/src/autohide/_common.scss +++ b/src/autohide/_common.scss @@ -31,9 +31,15 @@ @include Option("userChrome.autohide.tabbar", "userChrome.autohide.navbar", "userChrome.autohide.bookmarkbar", "userChrome.autohide.infobar") { #navigator-toolbox { position: relative; - z-index: 2; + &:is(:hover, :focus-within) { + z-index: 2; + + #PersonalToolbar { + z-index: -1; + } + } } - #navigator-toolbox:not(:hover) { + #navigator-toolbox:not(:hover):not(:focus-within) { animation: 1s keepfront; } @keyframes keepfront { @@ -45,10 +51,6 @@ } } - #PersonalToolbar { - z-index: -1; - } - #sidebar-box:is(:hover, :focus-within) { position: relative; z-index: 2 !important; From e64e54b67f3a96a8ccbb3878bf5cb68a0dc32dfe Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 4 Nov 2022 05:41:30 +0900 Subject: [PATCH 14/31] Add: URL View - Focus Item Border --- css/leptonChrome.css | 7 +++++++ src/urlview/_focus_item_border.scss | 4 ++++ src/urlview/_index.scss | 5 +++++ user.js | 1 + 4 files changed, 17 insertions(+) create mode 100644 src/urlview/_focus_item_border.scss diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 5647d70..b63ac83 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -7724,6 +7724,13 @@ display: block !important; } } +/*= Url View - Item Focus Border =============================================*/ +@supports -moz-bool-pref("userChrome.urlView.focus_item_border") { + .urlbarView-row:not([type="tip"], [type="dynamic"])[selected] > .urlbarView-row-inner, + .urlbarView-row-inner[selected] { + box-shadow: 3px 0 var(--toolbar-field-focus-border-color) inset !important; + } +} /** Panel UI ******************************************************************/ @supports -moz-bool-pref("userChrome.panel.remove_strip") { #appMenu-fxa-separator { diff --git a/src/urlview/_focus_item_border.scss b/src/urlview/_focus_item_border.scss new file mode 100644 index 0000000..0d608ba --- /dev/null +++ b/src/urlview/_focus_item_border.scss @@ -0,0 +1,4 @@ +.urlbarView-row:not([type="tip"], [type="dynamic"])[selected] > .urlbarView-row-inner, +.urlbarView-row-inner[selected] { + box-shadow: 3px 0 var(--toolbar-field-focus-border-color) inset !important; +} diff --git a/src/urlview/_index.scss b/src/urlview/_index.scss index 229704b..2f19fb1 100644 --- a/src/urlview/_index.scss +++ b/src/urlview/_index.scss @@ -12,3 +12,8 @@ @include Option("userChrome.urlView.go_button_when_typing") { @import "go_button_when_typing"; } + +/*= Url View - Item Focus Border =============================================*/ +@include Option("userChrome.urlView.focus_item_border") { + @import "focus_item_border"; +} diff --git a/user.js b/user.js index c15571f..8c1b616 100644 --- a/user.js +++ b/user.js @@ -142,6 +142,7 @@ user_pref("userChrome.rounding.square_tab", false); // user_pref("userChrome.urlView.always_show_page_actions", true); // user_pref("userChrome.urlView.move_icon_to_left", true); // user_pref("userChrome.urlView.go_button_when_typing", true); +// user_pref("userChrome.urlView.focus_item_border", true); // user_pref("userChrome.tabbar.as_titlebar", true); // user_pref("userChrome.tabbar.fill_width", true); From 9e81bade38ca912ae1011b1808c3ada2da215a15 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 4 Nov 2022 05:58:53 +0900 Subject: [PATCH 15/31] Fix: Icons - Tab Mix Plus's newtab icon --- css/leptonChrome.css | 12 ++++++++---- src/icons/layout/_menu.scss | 3 ++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 3e5bbd6..430310c 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -9399,7 +9399,8 @@ > menuitem, .openintabs-menuitem, #blockedPopupDontShowMessage, - #BMB_viewBookmarksToolbar { + #BMB_viewBookmarksToolbar, + #context_openANewTab.tabmix-newtab-menu-icon { /* Color */ -moz-context-properties: fill, fill-opacity !important; fill: currentColor !important; @@ -9453,7 +9454,8 @@ > menuitem, .openintabs-menuitem, #blockedPopupDontShowMessage, - #BMB_viewBookmarksToolbar { + #BMB_viewBookmarksToolbar, + #context_openANewTab.tabmix-newtab-menu-icon { background-position: var(--uc-menu-background-position) var(--context-menu-background-padding) center !important; padding-inline-start: var(--context-menu-background-padding) !important; } @@ -9512,7 +9514,8 @@ > menuitem, .openintabs-menuitem, #blockedPopupDontShowMessage, - #BMB_viewBookmarksToolbar { + #BMB_viewBookmarksToolbar, + #context_openANewTab.tabmix-newtab-menu-icon { background-position: left var(--context-menu-background-padding) center !important; padding-inline-start: 0 !important; } @@ -9544,7 +9547,8 @@ > menuitem, .openintabs-menuitem, #blockedPopupDontShowMessage, - #BMB_viewBookmarksToolbar { + #BMB_viewBookmarksToolbar, + #context_openANewTab.tabmix-newtab-menu-icon { padding-inline-start: var(--menu-background-padding-default) !important; margin-left: 0 !important; } diff --git a/src/icons/layout/_menu.scss b/src/icons/layout/_menu.scss index 894bef4..6a5e388 100644 --- a/src/icons/layout/_menu.scss +++ b/src/icons/layout/_menu.scss @@ -7,7 +7,8 @@ $_layoutCommonMenus: ( $_libraryMenuitem, $_libraryMenu, $_sendTabMenuitem, - $_otherIconMenu + $_otherIconMenu, + "#context_openANewTab.tabmix-newtab-menu-icon" ); @mixin _layoutInitIconMenus() { #{$_globalMenus}, From 196fb4c23e61e33e81fe4a77141046aaa3309966 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 4 Nov 2022 07:27:52 +0900 Subject: [PATCH 16/31] Add: Rounding - URL View Item --- css/leptonChrome.css | 32 +++++++++++++++++++++++++------- src/rounding/_square.scss | 32 +++++++++++++++++++++++++------- user.js | 1 + 3 files changed, 51 insertions(+), 14 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index fc1b1c9..a6279f1 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -3273,22 +3273,34 @@ } @supports -moz-bool-pref("userChrome.rounding.square_button") { :root { - --toolbarbutton-border-radius: 0 !important; + --urlbar-icon-border-radius: 0 !important; + /* Original: calc(var(--toolbarbutton-border-radius) - 1px); */ + } + + .toolbarbutton-1, + .toolbarbutton-icon, + .panel-info-button, + .searchbar-engine-one-off-item, + .urlbarView-button, + .urlbarView-tip-button, + .urlbarView-action, + toolbarbutton.bookmark-item:not(.subviewbutton), + #sidebar-switcher-target { + --toolbarbutton-border-radius: 0; /* Original: 4px */ } button, - findbar toolbarbutton { + findbar toolbarbutton, + .notification-button { border-radius: 0 !important; } } -@supports -moz-bool-pref("userChrome.rounding.square_tab") or -moz-bool-pref("userChrome.round.square_button") { +@supports -moz-bool-pref("userChrome.rounding.square_tab") or -moz-bool-pref("userChrome.rounding.square_button") { /* Fix Tab bar button radius */ - #TabsToolbar .toolbarbutton-1:not(#tabs-newtab-button) > .toolbarbutton-icon, - #TabsToolbar .toolbarbutton-1:not(#tabs-newtab-button) > .toolbarbutton-text, - #TabsToolbar .toolbarbutton-1:not(#tabs-newtab-button) > .toolbarbutton-badge-stack, + #TabsToolbar .toolbarbutton-1:not(#tabs-newtab-button), .tab-close-button { - --tab-border-radius: var(--toolbarbutton-border-radius) !important; + --tab-border-radius: var(--toolbarbutton-border-radius); } } @supports -moz-bool-pref("userChrome.rounding.square_panel") { @@ -3323,11 +3335,17 @@ border-radius: 0 !important; } + #urlbar-input-container, #urlbar-background, #searchbar { --toolbarbutton-border-radius: 0; } } +@supports -moz-bool-pref("userChrome.rounding.square_urlView_item") { + .urlbarView-row-inner { + --toolbarbutton-border-radius: 0; + } +} @supports -moz-bool-pref("userChrome.rounding.square_checklabel") { .checkbox-check, xul|*.radio-check { diff --git a/src/rounding/_square.scss b/src/rounding/_square.scss index fa92deb..9c86f15 100644 --- a/src/rounding/_square.scss +++ b/src/rounding/_square.scss @@ -5,21 +5,32 @@ } @include Option("userChrome.rounding.square_button") { :root { - --toolbarbutton-border-radius: 0 !important; /* Original: 4px */ + --urlbar-icon-border-radius: 0 !important; /* Original: calc(var(--toolbarbutton-border-radius) - 1px); */ + } + + .toolbarbutton-1, + .toolbarbutton-icon, + .panel-info-button, + .searchbar-engine-one-off-item, + .urlbarView-button, + .urlbarView-tip-button, + .urlbarView-action, + toolbarbutton.bookmark-item:not(.subviewbutton), + #sidebar-switcher-target { + --toolbarbutton-border-radius: 0; /* Original: 4px */ } button, - findbar toolbarbutton { + findbar toolbarbutton, + .notification-button { border-radius: 0 !important; } } -@include Option("userChrome.rounding.square_tab", "userChrome.round.square_button") { +@include Option("userChrome.rounding.square_tab", "userChrome.rounding.square_button") { /* Fix Tab bar button radius */ - #TabsToolbar .toolbarbutton-1:not(#tabs-newtab-button) > .toolbarbutton-icon, - #TabsToolbar .toolbarbutton-1:not(#tabs-newtab-button) > .toolbarbutton-text, - #TabsToolbar .toolbarbutton-1:not(#tabs-newtab-button) > .toolbarbutton-badge-stack, + #TabsToolbar .toolbarbutton-1:not(#tabs-newtab-button), .tab-close-button { - --tab-border-radius: var(--toolbarbutton-border-radius) !important; + --tab-border-radius: var(--toolbarbutton-border-radius); } } @@ -57,12 +68,19 @@ border-radius: 0 !important; } + #urlbar-input-container, #urlbar-background, #searchbar { --toolbarbutton-border-radius: 0; } } +@include Option("userChrome.rounding.square_urlView_item") { + .urlbarView-row-inner { + --toolbarbutton-border-radius: 0; + } +} + @include Option("userChrome.rounding.square_checklabel") { .checkbox-check, xul|*.radio-check { diff --git a/user.js b/user.js index 8c1b616..b82ade6 100644 --- a/user.js +++ b/user.js @@ -126,6 +126,7 @@ user_pref("userChrome.rounding.square_tab", false); // user_pref("userChrome.rounding.square_menupopup", true); // user_pref("userChrome.rounding.square_menuitem", true); // user_pref("userChrome.rounding.square_field", true); +// user_pref("userChrome.rounding.square_urlView_item", true); // user_pref("userChrome.rounding.square_checklabel", true); // user_pref("userChrome.padding.first_tab", true); From aa4a261c1e589e6653e95ed8765e499420ee4548 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 4 Nov 2022 10:32:54 +0900 Subject: [PATCH 17/31] Fix: Sounded Tab - RTL selector --- css/leptonChrome.css | 2 +- src/tab/sound_tab/_show_with_favicons.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 430310c..b15f1b0 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -7205,7 +7205,7 @@ --uc-sound-tab-no-icon-label-position-x: 3px; } .tabbrowser-tab .tab-label-container[labeldirection="rtl"], - .tabbrowser-tab .tab-label-container :not([labeldirection]):-moz-locale-dir(rtl) { + .tabbrowser-tab .tab-label-container:not([labeldirection]):-moz-locale-dir(rtl) { --uc-sound-tab-no-icon-position-x: 0.5px; --uc-sound-tab-no-icon-label-position-x: -3px; } diff --git a/src/tab/sound_tab/_show_with_favicons.scss b/src/tab/sound_tab/_show_with_favicons.scss index a521b62..5f49f83 100644 --- a/src/tab/sound_tab/_show_with_favicons.scss +++ b/src/tab/sound_tab/_show_with_favicons.scss @@ -102,7 +102,7 @@ --uc-sound-tab-no-icon-label-position-x: 3px; } &[labeldirection=rtl], - :not([labeldirection]):-moz-locale-dir(rtl) { + &:not([labeldirection]):-moz-locale-dir(rtl) { --uc-sound-tab-no-icon-position-x: 0.5px; --uc-sound-tab-no-icon-label-position-x: -3px; } From a082308287bbc3fc61e56e85c1f874d168c451e3 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 4 Nov 2022 10:36:49 +0900 Subject: [PATCH 18/31] Fix: Padding - URL Bar Expanding --- css/leptonChrome.css | 2 +- src/padding/_urlview_expanding.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index b15f1b0..b6b813c 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -3732,7 +3732,7 @@ #urlbar[breakout][breakout-extend] > #urlbar-input-container { height: var(--urlbar-height) !important; padding-block: 0 !important; - padding-inline: 0 !important; + padding-inline: var(--urlbar-container-padding, 0px) !important; } #urlbar[breakout][breakout-extend] > #urlbar-background { diff --git a/src/padding/_urlview_expanding.scss b/src/padding/_urlview_expanding.scss index b2481eb..0af7884 100644 --- a/src/padding/_urlview_expanding.scss +++ b/src/padding/_urlview_expanding.scss @@ -7,7 +7,7 @@ #urlbar[breakout][breakout-extend] > #urlbar-input-container { height: var(--urlbar-height) !important; padding-block: 0 !important; - padding-inline: 0 !important; + padding-inline: var(--urlbar-container-padding, 0px) !important; } #urlbar[breakout][breakout-extend] > #urlbar-background { From b3ff0addda375cee04c0acb965788782c0a432fe Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sat, 5 Nov 2022 04:46:38 +0900 Subject: [PATCH 19/31] Fix: Fully Color - Infobar properties to `!important` --- css/leptonChrome.css | 8 ++++---- src/theme/_fully_color.scss | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index b6b813c..2237b64 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -1451,17 +1451,17 @@ } /*== Info Bar Color ==========================================================*/ .container.infobar { - background-color: var(--urlbar-box-bgcolor); + background-color: var(--urlbar-box-bgcolor) !important; } .notification-button { - background-color: var(--button-bgcolor); + background-color: var(--button-bgcolor) !important; } .notification-button:hover { - background-color: var(--button-hover-bgcolor); + background-color: var(--button-hover-bgcolor) !important; } .notification-button:hover:active { - background-color: var(--button-active-bgcolor); + background-color: var(--button-active-bgcolor) !important; } html|button.ghost-button:not(.semi-transparent):enabled:hover { diff --git a/src/theme/_fully_color.scss b/src/theme/_fully_color.scss index fc20cf7..192df25 100644 --- a/src/theme/_fully_color.scss +++ b/src/theme/_fully_color.scss @@ -117,16 +117,16 @@ html#main-window menupopup:not(.in-menulist) { /*== Info Bar Color ==========================================================*/ .container.infobar { - background-color: var(--urlbar-box-bgcolor); + background-color: var(--urlbar-box-bgcolor) !important; } .notification-button { - background-color: var(--button-bgcolor); + background-color: var(--button-bgcolor) !important; &:hover { - background-color: var(--button-hover-bgcolor); + background-color: var(--button-hover-bgcolor) !important; } &:hover:active { - background-color: var(--button-active-bgcolor); + background-color: var(--button-active-bgcolor) !important; } } From 32ddd5324038d20e056272bead933c28ae1c8d2a Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sat, 5 Nov 2022 05:33:38 +0900 Subject: [PATCH 20/31] Fix: Icons - Context Properties - Panel's Zoom buttons work with storke! --- css/leptonChrome.css | 13 ++++++------- css/leptonContent.css | 6 +++--- src/icons/_panel.scss | 4 ++-- src/icons/layout/_menu.scss | 2 +- src/icons/layout/_menu_common.scss | 2 +- src/icons/layout/_panel.scss | 3 +-- src/library/_menubar.scss | 2 +- 7 files changed, 15 insertions(+), 17 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 2237b64..bf1c130 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -8688,7 +8688,7 @@ #forward-button, #clearDownloadsButton { fill: currentColor !important; - -moz-context-properties: fill !important; + -moz-context-properties: fill, fill-opacity, stroke !important; } /* Add */ @@ -8826,13 +8826,12 @@ .subviewbutton:not(#appMenu-proton-update-banner) > image { fill: currentColor !important; fill-opacity: var(--toolbarbutton-icon-fill-opacity) !important; - -moz-context-properties: fill !important; + -moz-context-properties: fill, fill-opacity, stroke !important; } #appMenu-zoomReduce-button2 > .toolbarbutton-icon, #appMenu-zoomEnlarge-button2 > .toolbarbutton-icon { stroke: var(--zoom-controls-bgcolor, var(--button-bgcolor, ButtonFace)) !important; - -moz-context-properties: fill, stroke !important; } #appMenu-zoomReduce-button2:not([disabled], [open], :active):is(:hover) > .toolbarbutton-icon, @@ -9040,7 +9039,7 @@ /* Color */ fill: currentColor; fill-opacity: var(--toolbarbutton-icon-fill-opacity); - -moz-context-properties: fill; + -moz-context-properties: fill, fill-opacity, stroke; background-size: 16px; background-repeat: no-repeat; background-position: left center; @@ -9308,7 +9307,7 @@ /*= protections-popup ========================================================*/ #protections-popup-settings-button > .protections-popup-settings-icon, #protections-popup-show-report-button > .protections-popup-show-report-icon { - -moz-context-properties: fill; + -moz-context-properties: fill, fill-opacity, stroke; fill: currentColor; margin-inline-end: 1em; } @@ -9402,7 +9401,7 @@ #BMB_viewBookmarksToolbar, #context_openANewTab.tabmix-newtab-menu-icon { /* Color */ - -moz-context-properties: fill, fill-opacity !important; + -moz-context-properties: fill, fill-opacity, stroke !important; fill: currentColor !important; /* Layout */ background-size: 16px !important; @@ -9411,7 +9410,7 @@ } #tabContextMenu > .tabmix-newtab-menu-icon { - -moz-context-properties: fill, fill-opacity !important; + -moz-context-properties: fill, fill-opacity, stroke !important; fill: currentColor !important; } diff --git a/css/leptonContent.css b/css/leptonContent.css index 09697f5..3a97ac3 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -280,7 +280,7 @@ .context-menu-list .context-menu-item button span { /* Color */ - -moz-context-properties: fill, fill-opacity !important; + -moz-context-properties: fill, fill-opacity, stroke !important; fill: currentColor !important; /* Layout */ background-size: 16px !important; @@ -2362,7 +2362,7 @@ #forward-button, #clearDownloadsButton { fill: currentColor !important; - -moz-context-properties: fill !important; + -moz-context-properties: fill, fill-opacity, stroke !important; } /* Add */ @@ -3037,7 +3037,7 @@ > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) { /* Color */ - -moz-context-properties: fill, fill-opacity !important; + -moz-context-properties: fill, fill-opacity, stroke !important; fill: currentColor !important; /* Layout */ background-size: 16px !important; diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss index 575208c..5d1aca0 100644 --- a/src/icons/_panel.scss +++ b/src/icons/_panel.scss @@ -176,7 +176,7 @@ /* Color */ fill: currentColor; fill-opacity: var(--toolbarbutton-icon-fill-opacity); - -moz-context-properties: fill; + -moz-context-properties: fill, fill-opacity, stroke; background-size: 16px; background-repeat: no-repeat; @@ -416,7 +416,7 @@ panelMenuBookmarkThisPage[starred] { /*= protections-popup ========================================================*/ #protections-popup-settings-button > .protections-popup-settings-icon, #protections-popup-show-report-button > .protections-popup-show-report-icon { - -moz-context-properties: fill; + -moz-context-properties: fill, fill-opacity, stroke; fill: currentColor; margin-inline-end: 1em; } diff --git a/src/icons/layout/_menu.scss b/src/icons/layout/_menu.scss index 6a5e388..b0b8baf 100644 --- a/src/icons/layout/_menu.scss +++ b/src/icons/layout/_menu.scss @@ -43,7 +43,7 @@ $_layoutCommonMenus: ( @include _layout_icon_menus; } #tabContextMenu > .tabmix-newtab-menu-icon { - -moz-context-properties: fill, fill-opacity !important; + -moz-context-properties: fill, fill-opacity, stroke !important; fill: currentColor !important; } diff --git a/src/icons/layout/_menu_common.scss b/src/icons/layout/_menu_common.scss index bfe3cc5..079960a 100644 --- a/src/icons/layout/_menu_common.scss +++ b/src/icons/layout/_menu_common.scss @@ -44,7 +44,7 @@ $_initialMenus: selector.append( // Icon @mixin _layout_icon_menus() { /* Color */ - -moz-context-properties: fill, fill-opacity !important; + -moz-context-properties: fill, fill-opacity, stroke !important; fill: currentColor !important; /* Layout */ diff --git a/src/icons/layout/_panel.scss b/src/icons/layout/_panel.scss index bce5576..d15a78e 100644 --- a/src/icons/layout/_panel.scss +++ b/src/icons/layout/_panel.scss @@ -82,12 +82,11 @@ .subviewbutton:not(#appMenu-proton-update-banner) > image { fill: currentColor !important; fill-opacity: var(--toolbarbutton-icon-fill-opacity) !important; - -moz-context-properties: fill !important; + -moz-context-properties: fill, fill-opacity, stroke !important; } #appMenu-zoomReduce-button2 > .toolbarbutton-icon, #appMenu-zoomEnlarge-button2 > .toolbarbutton-icon { stroke: var(--zoom-controls-bgcolor, var(--button-bgcolor, ButtonFace)) !important; - -moz-context-properties: fill, stroke !important; } #appMenu-zoomReduce-button2:not([disabled], [open], :active):is(:hover) > .toolbarbutton-icon, #appMenu-zoomEnlarge-button2:not([disabled], [open], :active):is(:hover) > .toolbarbutton-icon { diff --git a/src/library/_menubar.scss b/src/library/_menubar.scss index c9624a5..9fd615f 100644 --- a/src/library/_menubar.scss +++ b/src/library/_menubar.scss @@ -6,7 +6,7 @@ #forward-button, #clearDownloadsButton { fill: currentColor !important; - -moz-context-properties: fill !important; + -moz-context-properties: fill, fill-opacity, stroke !important; } /* Add */ From 3a8ce747f3e16d06fa38409c19d41ff255d92946 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 6 Nov 2022 09:14:49 +0900 Subject: [PATCH 21/31] Add: Icons - Notification menu --- css/leptonChrome.css | 13 +++++++++++++ src/icons/context_menu/_others.scss | 12 ++++++++++++ 2 files changed, 25 insertions(+) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index bf1c130..8df2789 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -10463,6 +10463,19 @@ --menuitem-image: url("../icons/movetowindow-16.svg"); } + /*= Notification =============================================================*/ + #doNotDisturbMenuItem { + --menuitem-image: url(chrome://global/skin/media/pause-fill.svg); + } + + #disableForOriginMenuItem { + --menuitem-image: url("chrome://global/skin/icons/blocked.svg"); + } + + #openSettingsMenuItem { + --menuitem-image: url("chrome://global/skin/icons/settings.svg"); + } + /*= blockedPopupOptions ======================================================*/ #blockedPopupAllowSite { --menuitem-image: url("chrome://global/skin/icons/check.svg"); diff --git a/src/icons/context_menu/_others.scss b/src/icons/context_menu/_others.scss index 04c48cc..bb37ded 100644 --- a/src/icons/context_menu/_others.scss +++ b/src/icons/context_menu/_others.scss @@ -1,3 +1,15 @@ +/*= Notification =============================================================*/ +// https://github.com/mozilla/gecko-dev/blob/master/toolkit/components/alerts/alert.xhtml +#doNotDisturbMenuItem { + --menuitem-image: url(chrome://global/skin/media/pause-fill.svg); +} +#disableForOriginMenuItem { + --menuitem-image: url("chrome://global/skin/icons/blocked.svg"); +} +#openSettingsMenuItem { + --menuitem-image: url("chrome://global/skin/icons/settings.svg"); +} + /*= blockedPopupOptions ======================================================*/ #blockedPopupAllowSite { --menuitem-image: url("chrome://global/skin/icons/check.svg"); From 000ae7bedd1a24785806d290b54d29d944d5aeaa Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 6 Nov 2022 09:34:44 +0900 Subject: [PATCH 22/31] Fix: Icons - Other TabMixPlus icons --- css/leptonChrome.css | 69 ++++++++++++++++++++++- icons/merge.svg | 3 + icons/new-tab-forward.svg | 4 ++ icons/new-tab-skip-forward.svg | 3 + icons/tab-desktop-multiple-bottom.svg | 3 + icons/timer10.svg | 3 + icons/weather-snowflake.svg | 3 + src/icons/context_menu/_content_area.scss | 16 +++++- src/icons/context_menu/_tab_toolbar.scss | 17 ++++-- 9 files changed, 112 insertions(+), 9 deletions(-) create mode 100644 icons/merge.svg create mode 100644 icons/new-tab-forward.svg create mode 100644 icons/new-tab-skip-forward.svg create mode 100644 icons/tab-desktop-multiple-bottom.svg create mode 100644 icons/timer10.svg create mode 100644 icons/weather-snowflake.svg diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 8df2789..61d8f40 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -9935,13 +9935,30 @@ /*= Tab Mix Plus =============================================================*/ #context_openANewTab.tabmix-newtab-menu-icon { - list-style-image: var(--menuitem-image) !important; + list-style-image: none !important; + } + + @supports -moz-bool-pref("userChrome.icon.menu.full") { + #tm-duplicateinWin { + --menuitem-image: url("../icons/tab-desktop-multiple-bottom.svg"); + } + + #tm-mergeWindowsTab { + --menuitem-image: url("../icons/merge.svg"); + } + } + #tm-renameTab { + --menuitem-image: url("chrome://global/skin/icons/edit.svg"); } #tm-copyTabUrl { --menuitem-image: url("../icons/link.svg"); } + #tm-autoreloadTab_menu { + --menuitem-image: url("../icons/timer10.svg"); + } + #context_reloadTabOptions { --menuitem-image: url("../icons/reload.svg"); } @@ -9956,6 +9973,14 @@ } } + #tm-docShell { + --menuitem-image: url("chrome://browser/skin/permissions.svg"); + } + + #tm-freezeTab { + --menuitem-image: url("../icons/weather-snowflake.svg"); + } + #tm-protectTab { --menuitem-image: url("../icons/shield-task.svg"); } @@ -10293,13 +10318,53 @@ } /*= Tab Mix Plus =============================================================*/ #tm-autoreload_menu { - --menuitem-image: url("../icons/reload-auto.svg"); + --menuitem-image: url("../icons/timer10.svg"); + } + + #tm-linkWithhistory { + --menuitem-image: url("../icons/new-tab-skip-forward.svg"); } #tm-openAllLinks { --menuitem-image: url("../icons/new-tab-multiple.svg"); } + #tm-openinverselink { + --menuitem-image: url("../icons/new-tab-forward.svg"); + } + + #tm-content-closetab { + --menuitem-image: url("../icons/dismiss-filled.svg"); + } + + #tm-duplicateTabContext { + --menuitem-image: url("../icons/tab-copy.svg"); + } + + #tm-duplicateinWinContext { + --menuitem-image: url("../icons/tab-desktop-multiple-bottom.svg"); + } + + #tm-detachTabContext { + --menuitem-image: url("../icons/convert-range.svg"); + } + + #tm-mergeWindows { + --menuitem-image: url("../icons/merge.svg"); + } + + #tm-content-freezeTab { + --menuitem-image: url("../icons/weather-snowflake.svg"); + } + + #tm-content-protectTab { + --menuitem-image: url("../icons/shield-task.svg"); + } + + #tm-content-lockTab { + --menuitem-image: url("../icons/lock-closed.svg"); + } + #tm-content-undoCloseTab { --menuitem-image: url("../icons/undo.svg"); } diff --git a/icons/merge.svg b/icons/merge.svg new file mode 100644 index 0000000..e6060cd --- /dev/null +++ b/icons/merge.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/new-tab-forward.svg b/icons/new-tab-forward.svg new file mode 100644 index 0000000..6c87642 --- /dev/null +++ b/icons/new-tab-forward.svg @@ -0,0 +1,4 @@ + + + + diff --git a/icons/new-tab-skip-forward.svg b/icons/new-tab-skip-forward.svg new file mode 100644 index 0000000..9ab9e8a --- /dev/null +++ b/icons/new-tab-skip-forward.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/tab-desktop-multiple-bottom.svg b/icons/tab-desktop-multiple-bottom.svg new file mode 100644 index 0000000..97457b4 --- /dev/null +++ b/icons/tab-desktop-multiple-bottom.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/timer10.svg b/icons/timer10.svg new file mode 100644 index 0000000..e6311bb --- /dev/null +++ b/icons/timer10.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/weather-snowflake.svg b/icons/weather-snowflake.svg new file mode 100644 index 0000000..fe7c53f --- /dev/null +++ b/icons/weather-snowflake.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/context_menu/_content_area.scss b/src/icons/context_menu/_content_area.scss index 8655845..7821478 100644 --- a/src/icons/context_menu/_content_area.scss +++ b/src/icons/context_menu/_content_area.scss @@ -264,34 +264,44 @@ /*= Tab Mix Plus =============================================================*/ #tm-autoreload_menu { - --menuitem-image: url("../icons/reload-auto.svg"); + // --menuitem-image: url("../icons/reload-auto.svg"); + --menuitem-image: url("../icons/timer10.svg"); } #tm-linkWithhistory { + // ic_fluent_skip_forward_tab_24_regular + --menuitem-image: url("../icons/new-tab-skip-forward.svg"); } #tm-openAllLinks { --menuitem-image: url("../icons/new-tab-multiple.svg"); } #tm-openinverselink { -} -#context-openlinkinusercontext-menu { + --menuitem-image: url("../icons/new-tab-forward.svg"); } #tm-content-closetab { + --menuitem-image: url("../icons/dismiss-filled.svg"); } #tm-duplicateTabContext { + --menuitem-image: url("../icons/tab-copy.svg"); } #tm-duplicateinWinContext { + --menuitem-image: url("../icons/tab-desktop-multiple-bottom.svg"); } #tm-detachTabContext { + --menuitem-image: url("../icons/convert-range.svg"); } #tm-mergeWindows { + --menuitem-image: url("../icons/merge.svg"); } #tm-content-freezeTab { + --menuitem-image: url("../icons/weather-snowflake.svg"); } #tm-content-protectTab { + --menuitem-image: url("../icons/shield-task.svg"); } #tm-content-lockTab { + --menuitem-image: url("../icons/lock-closed.svg"); } #tm-tabsList { } diff --git a/src/icons/context_menu/_tab_toolbar.scss b/src/icons/context_menu/_tab_toolbar.scss index d0b20be..48284a4 100644 --- a/src/icons/context_menu/_tab_toolbar.scss +++ b/src/icons/context_menu/_tab_toolbar.scss @@ -222,19 +222,26 @@ menuitem.viewCustomizeToolbar { /*= Tab Mix Plus =============================================================*/ #context_openANewTab.tabmix-newtab-menu-icon { - list-style-image: var(--menuitem-image) !important; + list-style-image: none !important; } -#tm-duplicateinWin { -} -#tm-mergeWindowsTab { +@include Option("userChrome.icon.menu.full") { + #tm-duplicateinWin { + --menuitem-image: url("../icons/tab-desktop-multiple-bottom.svg"); + } + #tm-mergeWindowsTab { + --menuitem-image: url("../icons/merge.svg"); + } } #tm-renameTab { + --menuitem-image: url("chrome://global/skin/icons/edit.svg"); } #tm-copyTabUrl { --menuitem-image: url("../icons/link.svg"); } #tm-autoreloadTab_menu { + // --menuitem-image: url("../icons/reload-auto.svg"); + --menuitem-image: url("../icons/timer10.svg"); } #context_reloadTabOptions { --menuitem-image: url("../icons/reload.svg"); @@ -252,8 +259,10 @@ menuitem.viewCustomizeToolbar { } #tm-docShell { + --menuitem-image: url("chrome://browser/skin/permissions.svg"); } #tm-freezeTab { + --menuitem-image: url("../icons/weather-snowflake.svg"); } #tm-protectTab { --menuitem-image: url("../icons/shield-task.svg"); From d1b7dd6d943623ef2ef43d196a7075f12ada0b3d Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 6 Nov 2022 21:21:04 +0900 Subject: [PATCH 23/31] Fix: Icons - TabMixPlus's new tab button duplicated --- css/leptonChrome.css | 11 +++++++++-- src/icons/context_menu/_tab_toolbar.scss | 6 +++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 61d8f40..47fd4f6 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -9934,8 +9934,15 @@ } /*= Tab Mix Plus =============================================================*/ - #context_openANewTab.tabmix-newtab-menu-icon { - list-style-image: none !important; + @media (-moz-os-version: windows-win7), + (-moz-platform: windows-win7), + (-moz-os-version: windows-win8), + (-moz-platform: windows-win8), + (-moz-os-version: windows-win10), + (-moz-platform: windows-win10) { + #context_openANewTab.tabmix-newtab-menu-icon .menu-iconic-left { + display: none; + } } @supports -moz-bool-pref("userChrome.icon.menu.full") { diff --git a/src/icons/context_menu/_tab_toolbar.scss b/src/icons/context_menu/_tab_toolbar.scss index 48284a4..b704859 100644 --- a/src/icons/context_menu/_tab_toolbar.scss +++ b/src/icons/context_menu/_tab_toolbar.scss @@ -222,7 +222,11 @@ menuitem.viewCustomizeToolbar { /*= Tab Mix Plus =============================================================*/ #context_openANewTab.tabmix-newtab-menu-icon { - list-style-image: none !important; + .menu-iconic-left { + @include OS($win) { + display: none; + } + } } @include Option("userChrome.icon.menu.full") { #tm-duplicateinWin { From f0681b237d944bb3b9c5b7e2d775357532d42893 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 6 Nov 2022 23:46:07 +0900 Subject: [PATCH 24/31] Doc: CREDITS - Add Sponsors --- CREDITS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CREDITS b/CREDITS index 0a4527e..cd7460f 100644 --- a/CREDITS +++ b/CREDITS @@ -19,6 +19,13 @@ N: Yunsup Sim E: pedogunu@gmail.com W: https://ethansup.net +---------- + Sponsors + +N: nikkehtine +E: nikkehtine@int.pl +W: https://github.com/nikkehtine + ---------- Contributors From b754c9ebc5245ed568d6d6adda1632a7af2740da Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 7 Nov 2022 09:08:33 +0900 Subject: [PATCH 25/31] Fix: Padding - Compatibility --- css/leptonChrome.css | 6 +++--- src/padding/_bookmarkbar.scss | 2 +- src/padding/_panel.scss | 2 +- src/padding/_popup_panel.scss | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 47fd4f6..b9291da 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -3753,7 +3753,7 @@ /*= BookMark Bar - Reduce Height =============================================*/ @supports -moz-bool-pref("userChrome.padding.bookmarkbar") { :root[uidensity="compact"] #PersonalToolbar toolbarbutton { - margin-top: 0px; + margin-top: 0px !important; /* Original: 2px */ } } @@ -3975,7 +3975,7 @@ /*= Panel - Reduce padding ===================================================*/ @supports -moz-bool-pref("userChrome.padding.panel") { :root { - --arrowpanel-menuitem-margin: 0 var(--arrowpanel-menuicon-padding) !important; + --arrowpanel-menuitem-margin: 0 var(--arrowpanel-menuicon-padding, 8px) !important; /* Original: 0 8px */ --arrowpanel-menuitem-padding-block: 5px !important; /* Original: 8px */ @@ -4039,7 +4039,7 @@ /* not cut off for Protection popup Footer on windows */ :root[uidensity="compact"] #protections-popup-multiView #protections-popup-footer { - padding: 3px 0 10px !important; + padding: 0 !important; } /* Button and disabled category in Protection popup */ diff --git a/src/padding/_bookmarkbar.scss b/src/padding/_bookmarkbar.scss index aee9f5e..39e4d5b 100644 --- a/src/padding/_bookmarkbar.scss +++ b/src/padding/_bookmarkbar.scss @@ -1,3 +1,3 @@ :root[uidensity="compact"] #PersonalToolbar toolbarbutton { - margin-top: 0px; /* Original: 2px */ + margin-top: 0px !important; /* Original: 2px */ } diff --git a/src/padding/_panel.scss b/src/padding/_panel.scss index f8c4e76..e2caed7 100644 --- a/src/padding/_panel.scss +++ b/src/padding/_panel.scss @@ -1,5 +1,5 @@ :root { - --arrowpanel-menuitem-margin: 0 var(--arrowpanel-menuicon-padding) !important; /* Original: 0 8px */ + --arrowpanel-menuitem-margin: 0 var(--arrowpanel-menuicon-padding, 8px) !important; /* Original: 0 8px */ --arrowpanel-menuitem-padding-block: 5px !important; /* Original: 8px */ --arrowpanel-menuitem-padding-inline: 5px !important; /* Original: 8px */ --arrowpanel-menuitem-padding: var(--arrowpanel-menuitem-padding-block) var(--arrowpanel-menuitem-padding-inline) !important; /* Compatibility */ diff --git a/src/padding/_popup_panel.scss b/src/padding/_popup_panel.scss index 00b4447..8725396 100644 --- a/src/padding/_popup_panel.scss +++ b/src/padding/_popup_panel.scss @@ -25,7 +25,7 @@ } /* not cut off for Protection popup Footer on windows */ :root[uidensity="compact"] #protections-popup-multiView #protections-popup-footer { - padding: 3px 0 10px !important; + padding: 0 !important; } /* Button and disabled category in Protection popup */ :root[uidensity="compact"] #protections-popup-multiView .protections-popup-footer-button, From 73508237fa91754a34cbf396b91d8c80d51d914b Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 7 Nov 2022 09:09:12 +0900 Subject: [PATCH 26/31] Clean: Icons - Libray Menu --- css/leptonChrome.css | 5 +---- src/icons/_index.scss | 6 +----- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index b9291da..078f591 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -11157,10 +11157,7 @@ --menuitem-image: url("chrome://global/skin/icons/info.svg"); } } - } - /** Library Menu **************************************************************/ - @supports -moz-bool-pref("userChrome.icon.library") { - @supports -moz-bool-pref("userChrome.icon.menu") { + @supports -moz-bool-pref("userChrome.icon.library") { /*= organizeButtonPopup ======================================================*/ #newbookmark { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); diff --git a/src/icons/_index.scss b/src/icons/_index.scss index 06fe4fe..ee4a326 100644 --- a/src/icons/_index.scss +++ b/src/icons/_index.scss @@ -23,11 +23,7 @@ @include Option("userChrome.icon.global_menu") { @import "global_menu"; } -} - -/** Library Menu **************************************************************/ -@include Option("userChrome.icon.library") { - @include Option("userChrome.icon.menu") { + @include Option("userChrome.icon.library") { @import "library"; } } From 3a5800a352a8219002bfaeb7a9b850a4794bf01f Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 8 Nov 2022 06:04:23 +0900 Subject: [PATCH 27/31] Fix: Separator - Dyniamic's margin adjust, Static's accent color provide --- css/leptonChrome.css | 20 ++++++++++--------- src/tab/_selected_tab.scss | 13 ++++++++++++ .../newtab_button/_proton_like_button.scss | 7 ------- .../_photon_like_contextline.scss | 11 ---------- .../unselected_tab/_dynamic_separator.scss | 7 +++++++ 5 files changed, 31 insertions(+), 27 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 078f591..9647c1d 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -6428,7 +6428,7 @@ } } /*= Selected Tab - Photon like contextline ===================================*/ -@supports -moz-bool-pref("userChrome.tab.photon_like_contextline") { +@supports -moz-bool-pref("userChrome.tab.photon_like_contextline") or -moz-bool-pref("userChrome.tab.static_separator") { :root[lwtheme-mozlightdark] #tabbrowser-tabs, :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"], :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] { @@ -6441,6 +6441,8 @@ /* -moz-accent-color */ } } +} +@supports -moz-bool-pref("userChrome.tab.photon_like_contextline") { .tab-context-line { display: -moz-inline-box !important; height: 2px !important; @@ -6668,6 +6670,14 @@ .tab-background::before { opacity: 0 !important; } + + :root:not([uidensity="compact"]) #tabs-newtab-button > .toolbarbutton-icon { + margin-left: 2px; + } + + :root[uidensity="compact"] #tabs-newtab-button > .toolbarbutton-icon { + margin-left: 1px; + } } /* Animate */ @media (prefers-reduced-motion: no-preference) { @@ -6848,14 +6858,6 @@ :root:not([uidensity="touch"]) #tabs-newtab-button > .toolbarbutton-icon { --toolbarbutton-inner-padding: calc((var(--tab-min-height) - 16px) / 2 - 1px); } - - :root:not([uidensity="compact"]) #tabs-newtab-button > .toolbarbutton-icon { - margin-left: 2px; - } - - :root[uidensity="compact"] #tabs-newtab-button > .toolbarbutton-icon { - margin-left: 1px; - } } /*= Unloaded Tab - Contents Opacity ===========================================*/ @supports -moz-bool-pref("userChrome.tab.unloaded") { diff --git a/src/tab/_selected_tab.scss b/src/tab/_selected_tab.scss index 8ef7dd8..b3006a6 100644 --- a/src/tab/_selected_tab.scss +++ b/src/tab/_selected_tab.scss @@ -19,6 +19,19 @@ } /*= Selected Tab - Photon like contextline ===================================*/ +@include Option("userChrome.tab.photon_like_contextline", "userChrome.tab.static_separator") { + :root[lwtheme-mozlightdark] #tabbrowser-tabs, /* Legacy: v96 */ + :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"], + :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] { + --tab-line-color: rgb(10, 132, 255) !important; + } + @media (-moz-gtk-csd-available) { + :root:not(:-moz-lwtheme) #tabbrowser-tabs { + --tab-line-color: Highlight !important; /* -moz-accent-color */ + } + } +} + @include Option("userChrome.tab.photon_like_contextline") { @import "selected_tab/photon_like_contextline"; } diff --git a/src/tab/newtab_button/_proton_like_button.scss b/src/tab/newtab_button/_proton_like_button.scss index 3fd1017..1e24617 100644 --- a/src/tab/newtab_button/_proton_like_button.scss +++ b/src/tab/newtab_button/_proton_like_button.scss @@ -1,10 +1,3 @@ :root:not([uidensity="touch"]) #tabs-newtab-button > .toolbarbutton-icon { --toolbarbutton-inner-padding: calc((var(--tab-min-height) - 16px) / 2 - 1px); } - -:root:not([uidensity="compact"]) #tabs-newtab-button > .toolbarbutton-icon { - margin-left: 2px; -} -:root[uidensity="compact"] #tabs-newtab-button > .toolbarbutton-icon { - margin-left: 1px; -} diff --git a/src/tab/selected_tab/_photon_like_contextline.scss b/src/tab/selected_tab/_photon_like_contextline.scss index fd1d26b..13d7644 100644 --- a/src/tab/selected_tab/_photon_like_contextline.scss +++ b/src/tab/selected_tab/_photon_like_contextline.scss @@ -1,14 +1,3 @@ -:root[lwtheme-mozlightdark] #tabbrowser-tabs, /* Legacy: v96 */ -:root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"], -:root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] { - --tab-line-color: rgb(10, 132, 255) !important; -} -@media (-moz-gtk-csd-available) { - :root:not(:-moz-lwtheme) #tabbrowser-tabs { - --tab-line-color: Highlight !important; /* -moz-accent-color */ - } -} - .tab-context-line { display: -moz-inline-box !important; height: 2px !important; diff --git a/src/tab/unselected_tab/_dynamic_separator.scss b/src/tab/unselected_tab/_dynamic_separator.scss index 0916947..ba59667 100644 --- a/src/tab/unselected_tab/_dynamic_separator.scss +++ b/src/tab/unselected_tab/_dynamic_separator.scss @@ -126,6 +126,13 @@ .tab-background::before { opacity: 0 !important; } + + :root:not([uidensity="compact"]) #tabs-newtab-button > .toolbarbutton-icon { + margin-left: 2px; + } + :root[uidensity="compact"] #tabs-newtab-button > .toolbarbutton-icon { + margin-left: 1px; + } } /* Animate */ From 91fd045783cf229e310ffd0b9148e0b9e6b3f377 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 8 Nov 2022 17:17:44 +0900 Subject: [PATCH 28/31] Fix: UserContent - Newtab option, accounts.com darkmode --- css/leptonContent.css | 5 ++++- src/contents/_activity_stream.scss | 2 +- src/contents/dark_mode/_accounts_com.scss | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/css/leptonContent.css b/css/leptonContent.css index 3a97ac3..c1e82c0 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -417,7 +417,7 @@ } } /** Activity Stream - Home Search Bar looks like proton *********************/ - @supports -moz-bool-pref("userContent.newTab.animate") { + @supports -moz-bool-pref("userContent.newTab.searchbar") { /* Dropdown Colors */ #root { --newtab-search-background-color: rgba(255, 255, 255, 1); @@ -1680,6 +1680,7 @@ .input-row input[type="tel"], .input-row input[type="text"], .input-row input::placeholder, + .input-text, .firefox-family-services > ul > .firefox-service, .faint, .faint a, @@ -1704,7 +1705,9 @@ .input-row input[type="password"], .input-row input[type="tel"], .input-row input[type="text"], + .input-text, header, + .card, .bg-white:not(nav) { background: var(--in-content-box-background) !important; } diff --git a/src/contents/_activity_stream.scss b/src/contents/_activity_stream.scss index acc839e..9fe952b 100644 --- a/src/contents/_activity_stream.scss +++ b/src/contents/_activity_stream.scss @@ -101,7 +101,7 @@ } /** Activity Stream - Home Search Bar looks like proton *********************/ - @include Option("userContent.newTab.animate") { + @include Option("userContent.newTab.searchbar") { /* Dropdown Colors */ #root { --newtab-search-background-color: rgba(255, 255, 255, 1); /* Same as light theme's --panel-background */ diff --git a/src/contents/dark_mode/_accounts_com.scss b/src/contents/dark_mode/_accounts_com.scss index 7fef1fd..9796370 100644 --- a/src/contents/dark_mode/_accounts_com.scss +++ b/src/contents/dark_mode/_accounts_com.scss @@ -46,6 +46,7 @@ .input-row input[type="tel"], .input-row input[type="text"], .input-row input::placeholder, + .input-text, .firefox-family-services > ul > .firefox-service, .faint, .faint a, @@ -68,7 +69,9 @@ .input-row input[type="password"], .input-row input[type="tel"], .input-row input[type="text"], + .input-text, header, + .card, .bg-white:not(nav) { background: var(--in-content-box-background) !important; } From cc4a534592a78b7f5300ef83cd445b650cd9dfcc Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Wed, 9 Nov 2022 07:50:15 +0900 Subject: [PATCH 29/31] Doc: CREDITS - Update sponsor --- CREDITS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CREDITS b/CREDITS index cd7460f..6c59f6d 100644 --- a/CREDITS +++ b/CREDITS @@ -22,6 +22,10 @@ W: https://ethansup.net ---------- Sponsors +N: Jani Haiko +E: haiko.jani@gmail.com +W: https://github.com/ojaha065 + N: nikkehtine E: nikkehtine@int.pl W: https://github.com/nikkehtine From f39405eb1bdfc98e0ff81173ec912f63f3f8f8ef Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Wed, 9 Nov 2022 08:45:16 +0900 Subject: [PATCH 30/31] Fix: User.js - Remove Proton Tooltip #468 --- user.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/user.js b/user.js index 0a3bd3c..63c2998 100644 --- a/user.js +++ b/user.js @@ -5,9 +5,6 @@ user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", true); // Proton Enabled #127 || Removed at 97 #328 (Maintained for compatibility with ESR) user_pref("browser.proton.enabled", true); -// Proton Tooltip -user_pref("browser.proton.places-tooltip.enabled", true); - // Fill SVG Color user_pref("svg.context-properties.content.enabled", true); From 66c4ee7e9a4ae922a05326254b60b9f5272a4eb4 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Thu, 10 Nov 2022 10:54:21 +0900 Subject: [PATCH 31/31] Fix: AutoHide - Tab opacity with unload tab --- css/leptonChrome.css | 2 +- src/tab/_unload_tab.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 9647c1d..3212665 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -6861,7 +6861,7 @@ } /*= Unloaded Tab - Contents Opacity ===========================================*/ @supports -moz-bool-pref("userChrome.tab.unloaded") { - #tabbrowser-tabs .tabbrowser-tab[pending] .tab-content { + .tabbrowser-tab[pending] .tab-content { opacity: 0.7; } } diff --git a/src/tab/_unload_tab.scss b/src/tab/_unload_tab.scss index 8b918f2..fbf5541 100644 --- a/src/tab/_unload_tab.scss +++ b/src/tab/_unload_tab.scss @@ -1,3 +1,3 @@ -#tabbrowser-tabs .tabbrowser-tab[pending] .tab-content { +.tabbrowser-tab[pending] .tab-content { opacity: 0.7; }