From d677a65d492e6e2d7cb767212cdb4a4451844616 Mon Sep 17 00:00:00 2001 From: MS_Y Date: Fri, 14 Jan 2022 09:20:54 +0900 Subject: [PATCH 01/14] Fix: Photon Style's selected tab - remove border #307 --- userChrome.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/userChrome.css b/userChrome.css index 0ebe665..401a6f8 100644 --- a/userChrome.css +++ b/userChrome.css @@ -102,7 +102,8 @@ menu[disabled="true"] { /* Navbar Border */ #navigator-toolbox:-moz-lwtheme { - --tabs-border-color: rgba(0, 0, 0, 0.3); + --tabs-border-color: rgba(0, 0, 0, 0.3); /* Legacy: v96 */ + --lwt-tabs-border-color: rgba(0, 0, 0, 0.3); } /** OS - Compatibility ********************************************************/ @@ -3333,6 +3334,7 @@ menupopup > menu { #tabbrowser-tabs:not([movingtab]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab[beforeselected-visible]::after, #tabbrowser-tabs[movingtab] > #tabbrowser-arrowscrollbox > .tabbrowser-tab[visuallyselected]::before, .tabbrowser-tab[visuallyselected]::after { + --tabs-border-color: transparent; border-color: var(--tabs-border-color) !important; margin-top: 0 !important; margin-bottom: 0 !important; From 184a53c009f18fbbe634816df4636323434c6303 Mon Sep 17 00:00:00 2001 From: MS_Y Date: Mon, 17 Jan 2022 09:38:47 +0900 Subject: [PATCH 02/14] Fix: Theme - `:root[lwtheme-mozlightdark]` compatibility for Photon Style #288 #311 --- userChrome.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/userChrome.css b/userChrome.css index 401a6f8..d7c6904 100644 --- a/userChrome.css +++ b/userChrome.css @@ -3223,11 +3223,13 @@ menupopup > menu { } /** Selected Tab - Photon like contextline ************************************/ -:root[lwtheme-mozlightdark] #tabbrowser-tabs { +: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[lwtheme-mozlightdark]:not(:-moz-lwtheme) #tabbrowser-tabs { + :root:not(:-moz-lwtheme) #tabbrowser-tabs { --tab-line-color: Highlight !important; /* -moz-accent-color */ } } From 7bf072fa9b3a6f6bfe10794c6ce6db720e315bed Mon Sep 17 00:00:00 2001 From: MS_Y Date: Tue, 18 Jan 2022 09:05:39 +0900 Subject: [PATCH 03/14] Fix: Photon Style's Tab Bar - Apply `--tab-min-height` (`v96`) #304 --- userChrome.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/userChrome.css b/userChrome.css index d7c6904..6c8f32c 100644 --- a/userChrome.css +++ b/userChrome.css @@ -2869,6 +2869,9 @@ menuitem.openintabs-menuitem, #tabbrowser-tabs[positionpinnedtabs] > #tabbrowser-arrowscrollbox > .tabbrowser-tab[pinned] { min-height: var(--tab-min-height) !important; } +#tabbrowser-arrowscrollbox { + height: var(--tab-min-height); +} /* Top Margin */ .tab-background, From 807011947a6f1a963c12a18877ed620f8d230397 Mon Sep 17 00:00:00 2001 From: MS_Y Date: Mon, 24 Jan 2022 00:07:20 +0900 Subject: [PATCH 04/14] Clean: Tab Bar - Consistent size for `photon-style` #318 --- userChrome.css | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/userChrome.css b/userChrome.css index ba447d8..eae20f3 100644 --- a/userChrome.css +++ b/userChrome.css @@ -2852,23 +2852,16 @@ menuitem.openintabs-menuitem, } /* Toolbar Height */ -#TabsToolbar { - --tab-min-height: 33px !important; - --toolbarbutton-inner-padding: unset !important; -} -:root[uidensity="compact"] #TabsToolbar { - --tab-min-height: 29px !important; -} -:root[uidensity="touch"] #TabsToolbar { - --tab-min-height: 41px !important; -} -#tabbrowser-tabs, -#tabbrowser-arrowscrollbox, -#tabbrowser-tabs[positionpinnedtabs] > #tabbrowser-arrowscrollbox > .tabbrowser-tab[pinned] { - min-height: var(--tab-min-height) !important; -} #tabbrowser-arrowscrollbox { - height: var(--tab-min-height); + --tabbar-max-height: 33px; + max-height: calc(var(--tabbar-max-height) + var(--space-above-tabbar)); +} + +:root[uidensity="compact"] #tabbrowser-arrowscrollbox { + --tabbar-max-height: 29px; +} +:root[uidensity="touch"] #tabbrowser-arrowscrollbox { + --tabbar-max-height: 45px; } /* Top Margin */ From eb8a135ce60924309a022ff518ace91bf35199e7 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 14 Feb 2022 01:08:35 +0900 Subject: [PATCH 05/14] Fix: Tab bar - height of `photon-style` #333 --- userChrome.css | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/userChrome.css b/userChrome.css index a58945e..42302b0 100644 --- a/userChrome.css +++ b/userChrome.css @@ -2865,16 +2865,19 @@ menuitem.openintabs-menuitem, } /* Toolbar Height */ -#tabbrowser-arrowscrollbox { - --tabbar-max-height: 33px; - max-height: calc(var(--tabbar-max-height) + var(--space-above-tabbar)); +#TabsToolbar { + --tab-min-height: 33px !important; + --toolbarbutton-inner-padding: unset !important; +} +:root[uidensity="compact"] #TabsToolbar { + --tab-min-height: 29px !important; +} +:root[uidensity="touch"] #TabsToolbar { + --tab-min-height: 41px !important; } -:root[uidensity="compact"] #tabbrowser-arrowscrollbox { - --tabbar-max-height: 29px; -} -:root[uidensity="touch"] #tabbrowser-arrowscrollbox { - --tabbar-max-height: 45px; +#tabbrowser-arrowscrollbox { + max-height: calc(var(--tab-min-height) + var(--space-above-tabbar)); } /* Top Margin */ From adfd27a418b45aa9d4511026ead52b3caf6c2f37 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Thu, 17 Feb 2022 15:35:27 +0900 Subject: [PATCH 06/14] Fix: Tab Bar - pinned tab bug at `photon-style` #330 #333 --- userChrome.css | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/userChrome.css b/userChrome.css index 42302b0..4215140 100644 --- a/userChrome.css +++ b/userChrome.css @@ -2866,18 +2866,26 @@ menuitem.openintabs-menuitem, /* Toolbar Height */ #TabsToolbar { - --tab-min-height: 33px !important; - --toolbarbutton-inner-padding: unset !important; + --tab-min-height: 33px; + --toolbarbutton-inner-padding: calc((var(--tab-min-height) - 18px) / 2) !important; /* Prevent overflow pinned tab bottom margin */ } :root[uidensity="compact"] #TabsToolbar { - --tab-min-height: 29px !important; + --tab-min-height: 29px; } :root[uidensity="touch"] #TabsToolbar { - --tab-min-height: 41px !important; + --tab-min-height: 41px; } -#tabbrowser-arrowscrollbox { - max-height: calc(var(--tab-min-height) + var(--space-above-tabbar)); +#tabbrowser-arrowscrollbox, +#tabbrowser-arrowscrollbox[overflowing="true"] > .tabbrowser-tab[pinned="true"], +#tabbrowser-arrowscrollbox[overflowing="true"] > .tabbrowser-tab[pinned="true"] .tab-background { + max-height: var(--tab-min-height) !important; /* Force apply height */ +} +#tabbrowser-arrowscrollbox[overflowing="true"] > .tabbrowser-tab[pinned="true"] .tab-background { + min-height: unset !important; /* Prevent overflow pinned tab hover background overlap */ +} +#tabbrowser-arrowscrollbox[overflowing="true"] > .tabbrowser-tab[pinned="true"] .tab-content { + margin-top: auto !important; /* Fix overflow pinned tab icon to vertical center */ } /* Top Margin */ From 3e520f595e312818834c6b32e3511249275e1f2a Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Thu, 17 Feb 2022 15:57:28 +0900 Subject: [PATCH 07/14] Fix: Pinned Tab - `margin` to `z-index` at `photon-style` #330 --- userChrome.css | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/userChrome.css b/userChrome.css index 4215140..24adb40 100644 --- a/userChrome.css +++ b/userChrome.css @@ -2881,12 +2881,6 @@ menuitem.openintabs-menuitem, #tabbrowser-arrowscrollbox[overflowing="true"] > .tabbrowser-tab[pinned="true"] .tab-background { max-height: var(--tab-min-height) !important; /* Force apply height */ } -#tabbrowser-arrowscrollbox[overflowing="true"] > .tabbrowser-tab[pinned="true"] .tab-background { - min-height: unset !important; /* Prevent overflow pinned tab hover background overlap */ -} -#tabbrowser-arrowscrollbox[overflowing="true"] > .tabbrowser-tab[pinned="true"] .tab-content { - margin-top: auto !important; /* Fix overflow pinned tab icon to vertical center */ -} /* Top Margin */ .tab-background, @@ -3202,6 +3196,7 @@ menupopup > menu { } /* Remove line at Toolbar's top */ +#nav-bar, #tabbrowser-tabs { z-index: 1 !important; } From 515a0d8662405c9022b83afdd4abc79d04ad60b6 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sat, 19 Feb 2022 16:40:31 +0900 Subject: [PATCH 08/14] Fix: Tabbar - Remove `#nav-bar` z-index at `photon-style` #334 --- userChrome.css | 1 - 1 file changed, 1 deletion(-) diff --git a/userChrome.css b/userChrome.css index 3e5ffe9..abf7736 100644 --- a/userChrome.css +++ b/userChrome.css @@ -3213,7 +3213,6 @@ menupopup > menu { } /* Remove line at Toolbar's top */ -#nav-bar, #tabbrowser-tabs { z-index: 1 !important; } From f9ef014a1ef35a113fc59d1e4f3aab73e4c9d3bb Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 20 Feb 2022 00:11:22 +0900 Subject: [PATCH 09/14] Add: Divide line at `photon-style` - Reimplement for compatibility based lepton --- userChrome.css | 55 ++++++++++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/userChrome.css b/userChrome.css index abf7736..8f88e5a 100644 --- a/userChrome.css +++ b/userChrome.css @@ -3347,43 +3347,36 @@ menupopup > menu { } /** Unselected Tab - Divide line **********************************************/ -.tabbrowser-tab[first-visible-tab]::before, -.tabbrowser-tab::after, -#tabbrowser-tabs[movingtab] > #tabbrowser-arrowscrollbox > .tabbrowser-tab[visuallyselected]::before { +.tab-background::after { + /* Box Model */ content: ""; display: block; -} -.tabbrowser-tab::before, -.tabbrowser-tab::after { - --tab-divide-line: 1px solid var(--lwt-background-tab-separator-color, currentColor); - border-left: var(--tab-divide-line) !important; - margin-block: 5px 4px !important; - opacity: 0.3 !important; -} -.tabbrowser-tab::before { - margin-inline-start: -1px !important; + position: absolute; + + /* Position */ + top: 50%; + right: 0; + transform: translateY(calc(-50% + 1px)) !important; + + /* Bar shape */ + width: 1px; + height: 100%; + + /* Bar Color */ + opacity: 0.3; + background-color: var(--lwt-background-tab-separator-color, currentColor) !important; } -.tabbrowser-tab[first-visible-tab]::before, -:root[tabsintitlebar]:not([extradragspace]) #toolbar-menubar[autohide="true"] + #TabsToolbar .tabbrowser-tab::after, -.tabbrowser-tab:hover::after, -#tabbrowser-tabs:not([movingtab]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab[beforehovered]::after, -.tabbrowser-tab[multiselected]::after, -#tabbrowser-tabs:not([movingtab]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab[before-multiselected]::after { - margin-top: var(--tabs-top-border-width) !important; - margin-bottom: 0 !important; +.tabbrowser-tab[visuallyselected] .tab-background::after, +.tabbrowser-tab[beforeselected-visible] .tab-background::after { + opacity: 0; } -/* Selected - Hide */ -.tabbrowser-tab[first-visible-tab][visuallyselected]::before, -#tabbrowser-tabs:not([movingtab]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab[beforeselected-visible]::after, -#tabbrowser-tabs[movingtab] > #tabbrowser-arrowscrollbox > .tabbrowser-tab[visuallyselected]::before, -.tabbrowser-tab[visuallyselected]::after { - --tabs-border-color: transparent; - border-color: var(--tabs-border-color) !important; - margin-top: 0 !important; - margin-bottom: 0 !important; - opacity: 1 !important; +/* Animate */ +@media (prefers-reduced-motion: no-preference) { + .tab-background::after { + transition: opacity 0.2s var(--animation-easing-function); /* cubic-bezier(.07, .95, 0, 1) */ + } } /** New tab button - Smaller button *******************************************/ From 0491b3a70331fc58f74ecf8ba42f024593a3499f Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Thu, 24 Feb 2022 10:28:57 +0900 Subject: [PATCH 10/14] Fix: Divide Line - First visible tab's separator at `photon-style` --- userChrome.css | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/userChrome.css b/userChrome.css index b3022f6..7577993 100644 --- a/userChrome.css +++ b/userChrome.css @@ -3376,15 +3376,19 @@ menupopup > menu { } /** Unselected Tab - Divide line **********************************************/ +.tabbrowser-tab[first-visible-tab="true"] .tab-background::before, +.tab-background::after { + content: ""; +} + +.tab-background::before, .tab-background::after { /* Box Model */ - content: ""; display: block; position: absolute; /* Position */ top: 50%; - right: 0; transform: translateY(calc(-50% + 1px)) !important; /* Bar shape */ @@ -3395,7 +3399,11 @@ menupopup > menu { opacity: 0.3; background-color: var(--lwt-background-tab-separator-color, currentColor) !important; } +.tab-background::after { + right: 0; +} +.tabbrowser-tab[visuallyselected] .tab-background::before, .tabbrowser-tab[visuallyselected] .tab-background::after, .tabbrowser-tab[beforeselected-visible] .tab-background::after { opacity: 0; @@ -3403,6 +3411,7 @@ menupopup > menu { /* Animate */ @media (prefers-reduced-motion: no-preference) { + .tab-background::before, .tab-background::after { transition: opacity 0.2s var(--animation-easing-function); /* cubic-bezier(.07, .95, 0, 1) */ } From af691559568cedcbe5c76135d7644943b92ea7c9 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 4 Mar 2022 15:11:37 +0900 Subject: [PATCH 11/14] Fix: Selected Tab - `--tab-line-color` to `--lwt-tab-line-color` at `photon-style` FF`v96+` #337 --- userChrome.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/userChrome.css b/userChrome.css index 7577993..7aeee74 100644 --- a/userChrome.css +++ b/userChrome.css @@ -3306,8 +3306,10 @@ menupopup > menu { .tabbrowser-tab:is([selected], [multiselected]) .tab-context-line { /* Photon like color Default: var(--tab-line-color, rgb(10, 132, 255)) - Automatic: color-mix(in srgb, var(--button-primary-bgcolor) 80%, transparent) */ - background-color: var(--tab-line-color, rgb(10, 132, 255)) !important; + Automatic: color-mix(in srgb, var(--button-primary-bgcolor) 80%, transparent) + + FF v96+ replace by var(--lwt-tab-line-color) */ + background-color: var(--tab-line-color, var(--lwt-tab-line-color, rgb(10, 132, 255))) !important; } .tabbrowser-tab:hover:not([selected="true"], [multiselected]) > .tab-stack > .tab-background > .tab-context-line { From 00f806297b53c508bd4dfea87572cda6eaf99538 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 15 Mar 2022 09:01:46 +0900 Subject: [PATCH 12/14] Fix: Divide Line - Thin back to thickness at Windows `photon-style` #346 --- userChrome.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/userChrome.css b/userChrome.css index 3f96708..7e1a381 100644 --- a/userChrome.css +++ b/userChrome.css @@ -3398,12 +3398,12 @@ menupopup > menu { transform: translateY(calc(-50% + 1px)) !important; /* Bar shape */ - width: 1px; + width: 0px; height: 100%; /* Bar Color */ opacity: 0.3; - background-color: var(--lwt-background-tab-separator-color, currentColor) !important; + border-right: 1px solid var(--lwt-background-tab-separator-color, currentColor) !important; } .tab-background::after { right: 0; From cd72e5d46bd41000062ae7af429be1bf4e9c548b Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sat, 19 Mar 2022 00:57:28 +0900 Subject: [PATCH 13/14] Fix: Panel - menu image blank padding at `photon-style` https://github.com/black7375/Firefox-UI-Fix/commit/be4d88af245ddffc43b89d9750e3503489eed6cd --- userChrome.css | 1 - 1 file changed, 1 deletion(-) diff --git a/userChrome.css b/userChrome.css index ff751d8..164824c 100644 --- a/userChrome.css +++ b/userChrome.css @@ -4090,7 +4090,6 @@ menupopup > menu { #appMenu-more-button2, /* Seperate */ #appMenu-help-button2, #appMenu-quit-button2 /* Seperate */ { - padding-inline-start: var(--arrowpanel-menuimageblank-padding-horizontal) !important; padding-top: var(--arrowpanel-menuitemblank-padding) !important; padding-bottom: var(--arrowpanel-menuitemblank-padding) !important; } From 14d225bcd3e52cebabd0a86a286d7ff20e72fc2c Mon Sep 17 00:00:00 2001 From: MS_Y Date: Thu, 14 Apr 2022 09:09:19 +0900 Subject: [PATCH 14/14] Doc: typo --- README.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.org b/README.org index 19a68e9..1298463 100644 --- a/README.org +++ b/README.org @@ -1,4 +1,4 @@ -* Lepton (old name: Proton Fix) - Photon Stlyed +* Lepton (old name: Proton Fix) - Photon Styled :PROPERTIES: :TOC: :include all :END: