From 4545739a39278798e76bdb3ac55c698dfb8fa9d2 Mon Sep 17 00:00:00 2001 From: RealStickman Date: Sun, 24 Apr 2022 20:45:17 +0200 Subject: [PATCH] Update to Lepton 4.6.3 --- .../firefox/default-release/chrome/LEPTON | 2 +- .../firefox/default-release/chrome/README.org | 24 +++- .../default-release/chrome/icons/blank.svg | 2 + .../chrome/icons/private-favicon.svg | 9 ++ .../default-release/chrome/icons/undo.svg | 6 + .../default-release/chrome/userChrome.css | 114 ++++++++++++------ .../default-release/chrome/userContent.css | 2 +- 7 files changed, 116 insertions(+), 43 deletions(-) create mode 100644 arch-config/.mozilla/firefox/default-release/chrome/icons/blank.svg create mode 100644 arch-config/.mozilla/firefox/default-release/chrome/icons/private-favicon.svg create mode 100644 arch-config/.mozilla/firefox/default-release/chrome/icons/undo.svg diff --git a/arch-config/.mozilla/firefox/default-release/chrome/LEPTON b/arch-config/.mozilla/firefox/default-release/chrome/LEPTON index ac6de02e..28f1c6f1 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/LEPTON +++ b/arch-config/.mozilla/firefox/default-release/chrome/LEPTON @@ -1,3 +1,3 @@ [Info] -Ver=v4.6.2 +Ver=v4.6.3 Branch=photon-style diff --git a/arch-config/.mozilla/firefox/default-release/chrome/README.org b/arch-config/.mozilla/firefox/default-release/chrome/README.org index 9bde6d19..1298463a 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/README.org +++ b/arch-config/.mozilla/firefox/default-release/chrome/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: @@ -12,9 +12,18 @@ - [[#why-proton][WHY Proton?]] - [[#why-not-proton][WHY Not Proton?]] - [[#padding-comparisons][Padding Comparisons]] + - [[#contributors][Contributors]] - [[#faq][FAQ]] :END: +----- + +🔔🔔 A project redesign is in progress. #351 + +It's built with SCSS and all configured as options. \\ +It's in beta testing, and I'am looking forward to hearing from you. + +----- ** Introduction [[https://wiki.mozilla.org/Firefox/Proton][Proton]] is Firefox's new design, starting from Firefox 89. \\ @@ -33,6 +42,8 @@ (Lepton's Photon styled design :arrow_up:) + @@html:
@@@@html:@@ *Feature List (Click)* @@html:@@ + - *Color* - Default light/dark theme contrast enhancement - Colorful context menu @@ -94,6 +105,8 @@ - Activate calculator at address bar - Mouse pointer for each context +@@html:
@@ + ** Installation Guide *Script Installation (experimental)* @@ -165,6 +178,15 @@ - Proton - Lepton + +** Contributors + +Thanks to all contributors to this project for providing help and developing features! + +[[https://github.com/black7375/Firefox-UI-Fix/graphs/contributors][@@html:@@]] + +A list of all contributors can be found in [[./CREDITS][CREDITS]]. + ** FAQ - *Black pixels around the selected tab bottom corners* \\ diff --git a/arch-config/.mozilla/firefox/default-release/chrome/icons/blank.svg b/arch-config/.mozilla/firefox/default-release/chrome/icons/blank.svg new file mode 100644 index 00000000..51f9a4c9 --- /dev/null +++ b/arch-config/.mozilla/firefox/default-release/chrome/icons/blank.svg @@ -0,0 +1,2 @@ + + diff --git a/arch-config/.mozilla/firefox/default-release/chrome/icons/private-favicon.svg b/arch-config/.mozilla/firefox/default-release/chrome/icons/private-favicon.svg new file mode 100644 index 00000000..48e4a3bc --- /dev/null +++ b/arch-config/.mozilla/firefox/default-release/chrome/icons/private-favicon.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/arch-config/.mozilla/firefox/default-release/chrome/icons/undo.svg b/arch-config/.mozilla/firefox/default-release/chrome/icons/undo.svg new file mode 100644 index 00000000..5f6c0b69 --- /dev/null +++ b/arch-config/.mozilla/firefox/default-release/chrome/icons/undo.svg @@ -0,0 +1,6 @@ + + + + diff --git a/arch-config/.mozilla/firefox/default-release/chrome/userChrome.css b/arch-config/.mozilla/firefox/default-release/chrome/userChrome.css index db8aadcb..e3e72489 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/userChrome.css +++ b/arch-config/.mozilla/firefox/default-release/chrome/userChrome.css @@ -223,6 +223,22 @@ menu[disabled="true"] { } } +/*= Windows 10 - Top border of accent color at ESR #358 ======================*/ +@media (-moz-os-version: windows-win10), /* Legacy - v99 */ + (-moz-platform: windows-win10) { + :root[sizemode=normal][tabsintitlebar] #navigator-toolbox { + border-top: .5px solid rgb(47, 47, 47) !important; + } + :root[sizemode=normal][tabsintitlebar]:-moz-window-inactive #navigator-toolbox { + border-top-color: rgb(57, 57, 57) !important; + } + @media (-moz-windows-accent-color-in-titlebar) { + :root[sizemode=normal][tabsintitlebar] #navigator-toolbox { + border-top-color: -moz-accent-color !important; + } + } +} + @media (-moz-gtk-csd-available) { /*= Linux - Global Menubar Active Color ====================================*/ #main-menubar > menu[open="true"], @@ -296,6 +312,7 @@ menu[disabled="true"] { (-moz-platform: windows-win7) { #TabsToolbar:not(:-moz-lwtheme) { --background-color: rgb(229, 229, 235); + --toolbarseparator-color: transparent; } #TabsToolbar:not(:-moz-lwtheme) .tabbrowser-tab @@ -522,6 +539,13 @@ menu[disabled="true"] { --panel-separator-color: var(--win-border-color) !important; } + @media (-moz-windows-accent-color-in-titlebar) { + :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme), + :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) { + --toolbarseparator-color: color-mix(in srgb, currentColor 20%, transparent) !important; /* As default */ + } + } + /*- Menu -------------------------------------------------------------------*/ html#main-window menupopup:not(:-moz-lwtheme) { --menu-color: var(--win-text-color) !important; @@ -2943,29 +2967,6 @@ menuitem.openintabs-menuitem, ); /* Compact: 28px, Normal: 33px, Touch: 38px */ } -/* Pinned Tab - Titlechanged Indicator position fix */ -.tabbrowser-tab:is([image], [pinned]) > .tab-stack > .tab-content[attention]:not([selected="true"]), -.tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([selected="true"]) { - /* Original: center bottom calc(6.5px + var(--tabs-navbar-shadow-size)); */ - background-position-y: bottom calc(2.5px + var(--tabs-navbar-shadow-size)) !important; -} -:root[uidensity="compact"] - .tabbrowser-tab:is([image], [pinned]) - > .tab-stack - > .tab-content[attention]:not([selected="true"]), -:root[uidensity="compact"] .tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([selected="true"]) { - /* Original: center bottom calc(6.5px + var(--tabs-navbar-shadow-size)); */ - background-position-y: bottom calc(0.5px + var(--tabs-navbar-shadow-size)) !important; -} -:root[uidensity="touch"] - .tabbrowser-tab:is([image], [pinned]) - > .tab-stack - > .tab-content[attention]:not([selected="true"]), -:root[uidensity="touch"] .tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([selected="true"]) { - /* Original: center bottom calc(6.5px + var(--tabs-navbar-shadow-size)); */ - background-position-y: bottom calc(4.5px + var(--tabs-navbar-shadow-size)) !important; -} - /*= Tool Bar - Button Padding ================================================*/ :root[uidensity="compact"] { --toolbarbutton-outer-padding: 2px !important; /* Original: 3px, General is 2px */ @@ -3675,12 +3676,21 @@ menupopup > menu { } /** Container Tab - Color line at icon's bottom *******************************/ +.tabbrowser-tab { + --container-position-y: 11px; +} +:root[uidensity="compact"] .tabbrowser-tab { + --container-position-y: 10px; +} +:root[uidensity="touch"] .tabbrowser-tab { + --container-position-y: 12px; +} .tab-content:not([titlechanged])::before { /* Box Model */ content: ""; display: block; position: absolute !important; - transform: translate(9px, 12px) !important; + transform: translate(9px, var(--container-position-y)) !important; /* Shape */ border-bottom: 2px solid var(--identity-icon-color); @@ -3705,7 +3715,7 @@ menupopup > menu { /* Pinned Tab */ .tabbrowser-tab[pinned] .tab-content::before { - transform: translateY(12px) !important; + transform: translateY(var(--container-position-y)) !important; width: 16px; } @@ -3734,6 +3744,12 @@ menupopup > menu { background-position-x: 30%, 50%, 70% !important; } +.tabbrowser-tab:is([image], [pinned]) > .tab-stack > .tab-content[attention]:not([selected="true"]), +.tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([selected="true"]) { + /* Original: center bottom calc(6.5px + var(--tabs-navbar-shadow-size)); */ + background-position-y: top calc(0.5px + 50% + var(--container-position-y)) !important; +} + /* Pinned Tab - Titlechanged & soundplaying */ .tabbrowser-tab:is([image], [pinned])[usercontextid]:is([soundplaying], [muted], [activemedia-blocked]) > .tab-stack @@ -3760,7 +3776,7 @@ menupopup > menu { } /** Fullscreen - Overlap toolbar **********************************************/ -@supports not -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { +@supports -moz-bool-pref("browser.fullscreen.autohide") { :root[sizemode="fullscreen"] #navigator-toolbox { position: fixed !important; /* Needed for content to take up entire height */ display: block !important; /* Needed for content to take up entire height */ @@ -4365,7 +4381,7 @@ panelMenuBookmarkThisPage[starred] { /*= Tabbar - All Tab Menu ====================================================*/ #allTabsMenu-undoCloseTab { - list-style-image: url("chrome://global/skin/icons/undo.svg"); + list-style-image: url("./icons/undo.svg"); } #allTabsMenu-searchTabs { list-style-image: url("chrome://global/skin/icons/search-glass.svg"); @@ -4485,6 +4501,7 @@ menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #histo menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu, menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) > menuitem, +.openintabs-menuitem, #blockedPopupDontShowMessage { /* Color */ -moz-context-properties: fill, fill-opacity !important; @@ -4504,7 +4521,7 @@ menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) :not(menu, #ContentSelectDropdown) > menupopup > menu:not(.menu-iconic, [type="checkbox"], [checked="true"], .in-menulist) { - list-style-image: var(--menuitem-image) !important; + list-style-image: var(--menuitem-image, url("./icons/blank.svg")) !important; } } @@ -4522,6 +4539,7 @@ menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #histo menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu, menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) > menuitem, +.openintabs-menuitem, #blockedPopupDontShowMessage { background-position: left var(--context-menu-background-padding) center !important; padding-inline-start: var(--context-menu-background-padding) !important; @@ -4583,6 +4601,7 @@ menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu, menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) > menuitem, + .openintabs-menuitem, #blockedPopupDontShowMessage { background-position: left var(--context-menu-background-padding) center !important; padding-inline-start: 0 !important; @@ -4609,6 +4628,7 @@ menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu, menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) > menuitem, + .openintabs-menuitem, #blockedPopupDontShowMessage { padding-inline-start: var(--menu-background-padding-default) !important; margin-left: 0 !important; @@ -4655,6 +4675,16 @@ menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menu:not(.menu-iconic) { padding-inline-start: calc(var(--context-menu-background-padding) + var(--context-menu-mac-padding)) !important; } + + /* Global Menu */ + /* Disabled. some icons not appear + menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) + menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"], .bookmark-item), + menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) + menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]) { + list-style-image: var(--menuitem-image, url("./icons/blank.svg")); + } + */ } /*= Bookmark Menu - Layout ===================================================*/ @@ -4813,10 +4843,15 @@ menupopup menupopup[emptyplacesresult] .menu-text, #context_closeTabOptions { } #context_undoCloseTab { - --menuitem-image: url("chrome://global/skin/icons/undo.svg"); + --menuitem-image: url("./icons/undo.svg"); } /*= new-tab-button-popup =====================================================*/ +#new-tab-button-popup > menuitem[command="Browser:NewUserContextTab"], +.new-tab-popup > menuitem[command="Browser:NewUserContextTab"] { + --menuitem-image: url("./icons/container-openin-16.svg"); +} + #new-tab-button-popup > menuitem[command="Browser:OpenAboutContainers"], .new-tab-popup > menuitem[command="Browser:OpenAboutContainers"] { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); @@ -4858,7 +4893,7 @@ menupopup menupopup[emptyplacesresult] .menu-text, --menuitem-image: url("./icons/tab-multiple.svg"); } #toolbar-context-undoCloseTab { - --menuitem-image: url("chrome://global/skin/icons/undo.svg"); + --menuitem-image: url("./icons/undo.svg"); } #toggle_toolbar-menubar { @@ -4916,7 +4951,7 @@ menuitem.viewCustomizeToolbar { --menuitem-image: url("./icons/book-add.svg"); } #spell-undo-add-to-dictionary { - --menuitem-image: url("chrome://global/skin/icons/undo.svg"); + --menuitem-image: url("./icons/undo.svg"); } #context-openlinkincurrent { @@ -5064,7 +5099,7 @@ menuitem.viewCustomizeToolbar { } #context-undo { - --menuitem-image: url("chrome://global/skin/icons/undo.svg"); + --menuitem-image: url("./icons/undo.svg"); } #context-redo { } @@ -5342,7 +5377,7 @@ menuitem.viewCustomizeToolbar { /*= SyncedTabsSidebarTabsFilterContext =======================================*/ #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_undo"] { - --menuitem-image: url("chrome://global/skin/icons/undo.svg"); + --menuitem-image: url("./icons/undo.svg"); } #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_cut"] { --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); @@ -5367,7 +5402,7 @@ menuitem.viewCustomizeToolbar { /*= urlbar-input-container ===================================================*/ #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_undo"] { - --menuitem-image: url("chrome://global/skin/icons/undo.svg"); + --menuitem-image: url("./icons/undo.svg"); } #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_redo"] { } @@ -5393,7 +5428,7 @@ menuitem.viewCustomizeToolbar { /*= textbox-contextmenu ======================================================*/ /* Browser's Searchbar, Libray's Searchbar, Page Info */ .textbox-contextmenu > menuitem[data-l10n-id="text-action-undo"] { - --menuitem-image: url("chrome://global/skin/icons/undo.svg"); + --menuitem-image: url("./icons/undo.svg"); } .textbox-contextmenu > menuitem[data-l10n-id="text-action-redo"] { } @@ -5537,7 +5572,7 @@ menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) /*= menu_EditPopup ===========================================================*/ #menu_undo { - --menuitem-image: url("chrome://global/skin/icons/undo.svg"); + --menuitem-image: url("./icons/undo.svg"); } #menu_redo { } @@ -5685,6 +5720,7 @@ menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) #sync-unverifieditem { } #sync-syncnowitem { + --menuitem-image: url("chrome://browser/skin/sync.svg"); } #sync-reauthitem { } @@ -5770,7 +5806,7 @@ menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) } #orgUndo { - --menuitem-image: url("chrome://global/skin/icons/undo.svg"); + --menuitem-image: url("./icons/undo.svg"); } #orgRedo { } @@ -5832,9 +5868,7 @@ menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) } menuitem.privatetab-icon { - list-style-image: url("./icons/priavate-favicon.svg") !important; - fill: currentColor; - -moz-context-properties: fill; + --menuitem-image: url("./icons/private-favicon.svg"); } /* New Folder Button */ diff --git a/arch-config/.mozilla/firefox/default-release/chrome/userContent.css b/arch-config/.mozilla/firefox/default-release/chrome/userContent.css index 10ffaa3d..c6af7103 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/userContent.css +++ b/arch-config/.mozilla/firefox/default-release/chrome/userContent.css @@ -1862,7 +1862,7 @@ video { } #orgUndo { - --menuitem-image: url("chrome://global/skin/icons/undo.svg"); + --menuitem-image: url("./icons/undo.svg"); } #orgRedo { }