From a92cccfaddb20653b1b65b96ac5197eaaf7866a5 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Tue, 14 Feb 2023 15:51:51 +0800 Subject: [PATCH 1/4] Update toolbox-alt.css --- src/other/firefox/Monterey/parts/toolbox-alt.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/other/firefox/Monterey/parts/toolbox-alt.css b/src/other/firefox/Monterey/parts/toolbox-alt.css index 85e6ac70..b0d135a0 100644 --- a/src/other/firefox/Monterey/parts/toolbox-alt.css +++ b/src/other/firefox/Monterey/parts/toolbox-alt.css @@ -7,11 +7,10 @@ @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; -#nav-bar, #PersonalToolbar, #toolbar-menubar, #TabsToolbar { - border: 0 !important; +#nav-bar, #PersonalToolbar, #toolbar-menubar, #TabsToolbar, #titlebar { + border: none !important; color: var(--gnome-toolbar-color); background: var(--gnome-toolbar-background) !important; - border-bottom: none !important; } #TabsToolbar { From eb5e52a936b4d6a1fd7a753b2f4fc676c6aac0fd Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Tue, 14 Feb 2023 17:28:15 +0800 Subject: [PATCH 2/4] Fixed firefox theme issues --- .../firefox/Monterey/parts/buttons-fixes.css | 3 +- src/other/firefox/Monterey/parts/buttons.css | 15 ++++--- src/other/firefox/Monterey/parts/dialogs.css | 12 +++++- .../Monterey/parts/headerbar-urlbar.css | 1 + src/other/firefox/Monterey/parts/popups.css | 39 +++++++++---------- .../firefox/WhiteSur/parts/buttons-fixes.css | 3 +- src/other/firefox/WhiteSur/parts/buttons.css | 20 ++++++---- src/other/firefox/WhiteSur/parts/dialogs.css | 12 +++++- .../WhiteSur/parts/headerbar-urlbar.css | 1 + src/other/firefox/WhiteSur/parts/popups.css | 39 +++++++++---------- 10 files changed, 83 insertions(+), 62 deletions(-) diff --git a/src/other/firefox/Monterey/parts/buttons-fixes.css b/src/other/firefox/Monterey/parts/buttons-fixes.css index d4d4ae7c..a9abde59 100644 --- a/src/other/firefox/Monterey/parts/buttons-fixes.css +++ b/src/other/firefox/Monterey/parts/buttons-fixes.css @@ -227,6 +227,5 @@ button.close.ghost-button:active { /* Close button */ .close-icon:not(.tab-close-button) .toolbarbutton-icon { - outline: 0 !important; + outline: 0 !important; } - diff --git a/src/other/firefox/Monterey/parts/buttons.css b/src/other/firefox/Monterey/parts/buttons.css index 47ef9636..2782c565 100644 --- a/src/other/firefox/Monterey/parts/buttons.css +++ b/src/other/firefox/Monterey/parts/buttons.css @@ -41,7 +41,8 @@ button.close:not(.ghost-button), .permission-popup-permission-remove-button, .button.connect-device, #item-choose button, -#editBMPanel_newFolderButton { +#editBMPanel_newFolderButton, +button.customizationmode-button { -moz-appearance: none !important; background: var(--gnome-button-background) !important; box-shadow: var(--gnome-button-box-shadow) !important; @@ -89,7 +90,8 @@ menulist, [overflowedItem="true"]) > #appMenu-fxa-label2:not(#hack), .button.connect-device, #item-choose button, -#editBMPanel_newFolderButton { +#editBMPanel_newFolderButton, +button.customizationmode-button { padding: 2px 10px !important; text-align: center !important; } @@ -151,7 +153,8 @@ menulist:hover .menulist-label-box, .autocomplete-richlistitem[type="loginsFooter"]:hover, .dialog-button-box button:hover, .searchbar-engine-one-off-item:hover, -.permission-popup-permission-remove-button:hover { +.permission-popup-permission-remove-button:hover, +button.customizationmode-button:hover { outline: 0 !important; background: var(--gnome-button-hover-background) !important; } @@ -188,7 +191,8 @@ menulist[open] .menulist-label-box, .dialog-button:active, .autocomplete-richlistitem[type="loginsFooter"]:active, .dialog-button-box button:active, -.permission-popup-permission-remove-button:active { +.permission-popup-permission-remove-button:active, +button.customizationmode-button:active { background: var(--gnome-button-active-background) !important; box-shadow: var(--gnome-button-active-box-shadow) !important; border-color: var(--gnome-button-active-border-color) !important; @@ -197,7 +201,8 @@ menulist[open] .menulist-label-box, /* Disabled buttons */ /*#nav-bar toolbarbutton:not(#urlbar-zoom-button)[disabled],*/ #appMenu-popup .toolbaritem-combined-buttons toolbarbutton[disabled], -#context-navigation menuitem[disabled] { +#context-navigation menuitem[disabled], +button.customizationmode-button[disabled] { background: var(--gnome-button-disabled-background) !important; border-color: var(--gnome-button-disabled-border-color) !important; box-shadow: var(--gnome-button-disabled-box-shadow) !important; diff --git a/src/other/firefox/Monterey/parts/dialogs.css b/src/other/firefox/Monterey/parts/dialogs.css index 8be436fe..77277280 100644 --- a/src/other/firefox/Monterey/parts/dialogs.css +++ b/src/other/firefox/Monterey/parts/dialogs.css @@ -24,30 +24,38 @@ window { /* Dialog */ .dialogBox { border-radius: 12px !important; - margin-top: 0 !important; + margin: 0 !important; } window[role="dialog"] { background: var(--gnome-toolbar-background) !important; border: 0 !important; - box-shadow: var(--gnome-menu-shadow) !important; padding: 0 !important; } + dialog { padding: 0 !important; } +dialog[subdialog] { + border-radius: 12px !important; + border: 1px solid var(--gnome-popover-border-color) !important; + box-shadow: var(--gnome-popover-shadow) !important; +} + /* Content */ .dialog-content-box, #dialogGrid { padding: 24px; padding-bottom: 0; } + #titleContainer { padding: 6px !important; margin-top: 6px !important; justify-content: center !important; } + .titleIcon { background-color: transparent !important; } diff --git a/src/other/firefox/Monterey/parts/headerbar-urlbar.css b/src/other/firefox/Monterey/parts/headerbar-urlbar.css index 5d2872ae..0eb00c5d 100644 --- a/src/other/firefox/Monterey/parts/headerbar-urlbar.css +++ b/src/other/firefox/Monterey/parts/headerbar-urlbar.css @@ -84,6 +84,7 @@ toolbarspring { #urlbar-input { text-align: center !important; + padding: 0 28px 0 0 !important; } /* URL bar results */ diff --git a/src/other/firefox/Monterey/parts/popups.css b/src/other/firefox/Monterey/parts/popups.css index 31b97c64..044a347a 100644 --- a/src/other/firefox/Monterey/parts/popups.css +++ b/src/other/firefox/Monterey/parts/popups.css @@ -4,7 +4,9 @@ @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; /* Style menus */ -menupopup { +menupopup, panel, +:is(menupopup, panel)[type="arrow"] { + -moz-appearance: none !important; --panel-background: var(--gnome-menu-background) !important; --panel-border-color: var(--gnome-menu-border-color) !important; --arrowpanel-border-radius: 12px !important; @@ -12,8 +14,8 @@ menupopup { --arrowpanel-border-color: var(--gnome-menu-border-color) !important; --panel-border-radius: 12px !important; --panel-padding: 6px !important; - -moz-appearance: none !important; - --panel-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.06) !important; + --panel-shadow: var(--gnome-popover-shadow) !important; + --panel-shadow-margin: 3px 8px 13px !important; color: var(--gnome-toolbar-color) !important; } @@ -21,7 +23,9 @@ menupopup label { color: var(--gnome-toolbar-color) !important; } -#PlacesToolbar menupopup[placespopup="true"]::part(content), #PlacesToolbar menupopup[placespopup="true"]::part(arrowscrollbox), #PlacesToolbar menupopup { +#PlacesToolbar menupopup[placespopup="true"]::part(content), +#PlacesToolbar menupopup[placespopup="true"]::part(arrowscrollbox), +#PlacesToolbar menupopup { background: none !important; padding: 3px 4px 6px !important; margin: -3px 0 0 -12px !important; @@ -46,16 +50,6 @@ menuitem[disabled="true"]:hover, menupopup menu[disabled="true"]:hover { background: transparent !important; } -panel { - --panel-background: var(--gnome-menu-background) !important; - --panel-border-color: var(--gnome-menu-border-color) !important; -} - -:is(menupopup, panel)[type="arrow"] { - --panel-border-radius: 12px !important; - --panel-padding: 6px !important; -} - :is(panel, menupopup)::part(content) { border: none !important; } @@ -78,16 +72,19 @@ panelview { } panelview { - padding: 6px !important; - box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.06) !important; - border-radius: 12px !important; + padding: var(--panel-padding) !important; } -.panel-arrowcontent { - background: var(--gnome-popover-background) !important; - border: 1px solid var(--gnome-popover-border-color) !important; +#customization-panelWrapper > .panel-arrowcontent { + border: 1px solid var(--gnome-menu-border-color) !important; + box-shadow: var(--gnome-popover-shadow) !important; border-radius: 12px !important; - color: var(--gnome-toolbar-color) !important; + background: var(--gnome-menu-background) !important; +} + +#customization-panelWrapper > .panel-arrowbox > .panel-arrow[side="top"] { + fill: var(--gnome-menu-background) !important; + stroke: var(--gnome-menu-border-color) !important; } #BMB_bookmarksPopup { diff --git a/src/other/firefox/WhiteSur/parts/buttons-fixes.css b/src/other/firefox/WhiteSur/parts/buttons-fixes.css index d4d4ae7c..a9abde59 100644 --- a/src/other/firefox/WhiteSur/parts/buttons-fixes.css +++ b/src/other/firefox/WhiteSur/parts/buttons-fixes.css @@ -227,6 +227,5 @@ button.close.ghost-button:active { /* Close button */ .close-icon:not(.tab-close-button) .toolbarbutton-icon { - outline: 0 !important; + outline: 0 !important; } - diff --git a/src/other/firefox/WhiteSur/parts/buttons.css b/src/other/firefox/WhiteSur/parts/buttons.css index 69bde3f2..e83c4a99 100644 --- a/src/other/firefox/WhiteSur/parts/buttons.css +++ b/src/other/firefox/WhiteSur/parts/buttons.css @@ -41,7 +41,8 @@ button.close:not(.ghost-button), .permission-popup-permission-remove-button, .button.connect-device, #item-choose button, -#editBMPanel_newFolderButton { +#editBMPanel_newFolderButton, +button.customizationmode-button { -moz-appearance: none !important; background: var(--gnome-button-background) !important; box-shadow: var(--gnome-button-box-shadow) !important; @@ -89,7 +90,8 @@ menulist, [overflowedItem="true"]) > #appMenu-fxa-label2:not(#hack), .button.connect-device, #item-choose button, -#editBMPanel_newFolderButton { +#editBMPanel_newFolderButton, +button.customizationmode-button { padding: 2px 10px !important; text-align: center !important; } @@ -151,7 +153,8 @@ menulist:hover .menulist-label-box, .autocomplete-richlistitem[type="loginsFooter"]:hover, .dialog-button-box button:hover, .searchbar-engine-one-off-item:hover, -.permission-popup-permission-remove-button:hover { +.permission-popup-permission-remove-button:hover, +button.customizationmode-button:hover { outline: 0 !important; background: var(--gnome-button-hover-background) !important; } @@ -188,7 +191,8 @@ menulist[open] .menulist-label-box, .dialog-button:active, .autocomplete-richlistitem[type="loginsFooter"]:active, .dialog-button-box button:active, -.permission-popup-permission-remove-button:active { +.permission-popup-permission-remove-button:active, +button.customizationmode-button:active { background: var(--gnome-button-active-background) !important; box-shadow: var(--gnome-button-active-box-shadow) !important; border-color: var(--gnome-button-active-border-color) !important; @@ -197,7 +201,8 @@ menulist[open] .menulist-label-box, /* Disabled buttons */ /*#nav-bar toolbarbutton:not(#urlbar-zoom-button)[disabled],*/ #appMenu-popup .toolbaritem-combined-buttons toolbarbutton[disabled], -#context-navigation menuitem[disabled] { +#context-navigation menuitem[disabled], +button.customizationmode-button[disabled] { background: var(--gnome-button-disabled-background) !important; border-color: var(--gnome-button-disabled-border-color) !important; box-shadow: var(--gnome-button-disabled-box-shadow) !important; @@ -286,7 +291,7 @@ button.close, .search-panel-one-offs .searchbar-engine-one-off-item:not(:last-child) { border-top-right-radius: 0 !important; border-bottom-right-radius: 0 !important; - border-right-width: 0 !important; + border-right-width: 1px !important; margin-right: 0 !important; } @@ -299,6 +304,7 @@ button.close, .search-panel-one-offs .searchbar-engine-one-off-item:not(:first-child) { border-top-left-radius: 0 !important; border-bottom-left-radius: 0 !important; + border-left-width: 0 !important; margin-left: 0 !important; } @@ -339,7 +345,7 @@ button.popup-notification-primary-button.popup-notification-button:active, border-color: var(--gnome-button-destructive-action-border-color) !important; border-bottom-color: var(--gnome-button-destructive-action-border-accent-color) !important; box-shadow: var(--gnome-button-destructive-action-box-shadow) !important; - text-shadow: 0 -1px rgba(0, 0, 0, 0.558275) !important; + text-shadow: 0 -1px rgba(0, 0, 0, 0.5) !important; } #editBookmarkPanelRemoveButton:hover, diff --git a/src/other/firefox/WhiteSur/parts/dialogs.css b/src/other/firefox/WhiteSur/parts/dialogs.css index 8be436fe..77277280 100644 --- a/src/other/firefox/WhiteSur/parts/dialogs.css +++ b/src/other/firefox/WhiteSur/parts/dialogs.css @@ -24,30 +24,38 @@ window { /* Dialog */ .dialogBox { border-radius: 12px !important; - margin-top: 0 !important; + margin: 0 !important; } window[role="dialog"] { background: var(--gnome-toolbar-background) !important; border: 0 !important; - box-shadow: var(--gnome-menu-shadow) !important; padding: 0 !important; } + dialog { padding: 0 !important; } +dialog[subdialog] { + border-radius: 12px !important; + border: 1px solid var(--gnome-popover-border-color) !important; + box-shadow: var(--gnome-popover-shadow) !important; +} + /* Content */ .dialog-content-box, #dialogGrid { padding: 24px; padding-bottom: 0; } + #titleContainer { padding: 6px !important; margin-top: 6px !important; justify-content: center !important; } + .titleIcon { background-color: transparent !important; } diff --git a/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css b/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css index 35f02c01..fda1fb0e 100644 --- a/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css +++ b/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css @@ -62,6 +62,7 @@ toolbarspring { #urlbar-input { text-align: center !important; + padding: 0 28px 0 0 !important; } /* URL bar results */ diff --git a/src/other/firefox/WhiteSur/parts/popups.css b/src/other/firefox/WhiteSur/parts/popups.css index 31b97c64..044a347a 100644 --- a/src/other/firefox/WhiteSur/parts/popups.css +++ b/src/other/firefox/WhiteSur/parts/popups.css @@ -4,7 +4,9 @@ @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; /* Style menus */ -menupopup { +menupopup, panel, +:is(menupopup, panel)[type="arrow"] { + -moz-appearance: none !important; --panel-background: var(--gnome-menu-background) !important; --panel-border-color: var(--gnome-menu-border-color) !important; --arrowpanel-border-radius: 12px !important; @@ -12,8 +14,8 @@ menupopup { --arrowpanel-border-color: var(--gnome-menu-border-color) !important; --panel-border-radius: 12px !important; --panel-padding: 6px !important; - -moz-appearance: none !important; - --panel-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.06) !important; + --panel-shadow: var(--gnome-popover-shadow) !important; + --panel-shadow-margin: 3px 8px 13px !important; color: var(--gnome-toolbar-color) !important; } @@ -21,7 +23,9 @@ menupopup label { color: var(--gnome-toolbar-color) !important; } -#PlacesToolbar menupopup[placespopup="true"]::part(content), #PlacesToolbar menupopup[placespopup="true"]::part(arrowscrollbox), #PlacesToolbar menupopup { +#PlacesToolbar menupopup[placespopup="true"]::part(content), +#PlacesToolbar menupopup[placespopup="true"]::part(arrowscrollbox), +#PlacesToolbar menupopup { background: none !important; padding: 3px 4px 6px !important; margin: -3px 0 0 -12px !important; @@ -46,16 +50,6 @@ menuitem[disabled="true"]:hover, menupopup menu[disabled="true"]:hover { background: transparent !important; } -panel { - --panel-background: var(--gnome-menu-background) !important; - --panel-border-color: var(--gnome-menu-border-color) !important; -} - -:is(menupopup, panel)[type="arrow"] { - --panel-border-radius: 12px !important; - --panel-padding: 6px !important; -} - :is(panel, menupopup)::part(content) { border: none !important; } @@ -78,16 +72,19 @@ panelview { } panelview { - padding: 6px !important; - box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.06) !important; - border-radius: 12px !important; + padding: var(--panel-padding) !important; } -.panel-arrowcontent { - background: var(--gnome-popover-background) !important; - border: 1px solid var(--gnome-popover-border-color) !important; +#customization-panelWrapper > .panel-arrowcontent { + border: 1px solid var(--gnome-menu-border-color) !important; + box-shadow: var(--gnome-popover-shadow) !important; border-radius: 12px !important; - color: var(--gnome-toolbar-color) !important; + background: var(--gnome-menu-background) !important; +} + +#customization-panelWrapper > .panel-arrowbox > .panel-arrow[side="top"] { + fill: var(--gnome-menu-background) !important; + stroke: var(--gnome-menu-border-color) !important; } #BMB_bookmarksPopup { From a655db34f8ed53b8d0363e677ddaf6a94986a2d0 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Tue, 14 Feb 2023 18:00:15 +0800 Subject: [PATCH 3/4] update --- shell/lib-install.sh | 4 +- .../firefox/Monterey/parts/video-player.css | 75 +++++++++++++++++++ src/other/firefox/WhiteSur/colors/dark.css | 2 +- src/other/firefox/WhiteSur/icons/icon.svg | 60 +++++++++++++++ src/other/firefox/WhiteSur/pages/newtab.css | 9 +++ .../WhiteSur/pages/privatebrowsing.css | 16 ++++ .../firefox/WhiteSur/parts/video-player.css | 75 +++++++++++++++++++ src/other/firefox/WhiteSur/theme.css | 5 +- src/other/firefox/userContent-Monterey.css | 5 ++ src/other/firefox/userContent-WhiteSur.css | 5 ++ 10 files changed, 253 insertions(+), 3 deletions(-) create mode 100644 src/other/firefox/Monterey/parts/video-player.css create mode 100644 src/other/firefox/WhiteSur/icons/icon.svg create mode 100644 src/other/firefox/WhiteSur/pages/newtab.css create mode 100644 src/other/firefox/WhiteSur/pages/privatebrowsing.css create mode 100644 src/other/firefox/WhiteSur/parts/video-player.css create mode 100644 src/other/firefox/userContent-Monterey.css create mode 100644 src/other/firefox/userContent-WhiteSur.css diff --git a/shell/lib-install.sh b/shell/lib-install.sh index 7b76e9f2..9c056ca1 100755 --- a/shell/lib-install.sh +++ b/shell/lib-install.sh @@ -678,7 +678,8 @@ install_firefox_theme() { if [[ "${monterey}" == 'true' ]]; then udo cp -rf "${FIREFOX_SRC_DIR}"/Monterey "${TARGET_DIR}" - udo cp -rf "${FIREFOX_SRC_DIR}"/WhiteSur/{icons,titlebuttons} "${TARGET_DIR}"/Monterey + udo cp -rf "${FIREFOX_SRC_DIR}"/WhiteSur/{icons,titlebuttons,pages} "${TARGET_DIR}"/Monterey + udo cp -rf "${FIREFOX_SRC_DIR}"/userContent-Monterey.css "${TARGET_DIR}"/userContent.css if [[ "${alttheme}" == 'true' ]]; then udo cp -rf "${FIREFOX_SRC_DIR}"/userChrome-Monterey-alt.css "${TARGET_DIR}"/userChrome.css else @@ -687,6 +688,7 @@ install_firefox_theme() { else udo cp -rf "${FIREFOX_SRC_DIR}"/WhiteSur "${TARGET_DIR}" udo cp -rf "${FIREFOX_SRC_DIR}"/userChrome-WhiteSur.css "${TARGET_DIR}"/userChrome.css + udo cp -rf "${FIREFOX_SRC_DIR}"/userContent-WhiteSur.css "${TARGET_DIR}"/userContent.css fi config_firefox diff --git a/src/other/firefox/Monterey/parts/video-player.css b/src/other/firefox/Monterey/parts/video-player.css new file mode 100644 index 00000000..bc8a6a03 --- /dev/null +++ b/src/other/firefox/Monterey/parts/video-player.css @@ -0,0 +1,75 @@ +@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); +@namespace html url("http://www.w3.org/1999/xhtml"); + +/** Video player **/ + +.progressBar::-moz-progress-bar { + background-color: #fff !important; +} + +.scrubber:hover::-moz-range-thumb, +.volumeControl:hover::-moz-range-thumb { + background-color: #ccc !important; +} + +.scrubber:active::-moz-range-thumb, +.volumeControl:active::-moz-range-thumb { + background-color: #bbb !important; +} + +.controlBar { + border-radius: 5px; + margin: auto; + margin-bottom: 5px; + width: 98.5%; + max-width: 800px; + height: 30px !important; + background-color: rgba(20,20,20,0.8) !important; +} + +.controlBar > .button:enabled:hover { + fill: #ccc !important; +} + +.controlBar > .button:enabled:hover:active { + fill: #bbb !important; +} + +.scrubberStack { + margin: 0 10px; +} + +.playButton { + scale: 0.8; +} + + + +/** Vertical Volume Bar **/ +/* I'm to stupid to get this working. Wasn't able to set proper position relative to mute button */ + +/* .muteButton:hover ~ .volumeStack{ + margin-bottom: 129px !important; + } + .volumeStack:hover { + margin-bottom: 129px !important; + } + + .volumeStack { + transform: rotate(270deg); + max-height: 33px !important; + min-width: 100px !important; + position:absolute !important; + margin-bottom: -150px !important; + background-color: rgba(20,20,20,0.8) !important; + border-bottom-right-radius: 5px !important; + border-top-right-radius: 5px !important; + transition-property: margin-bottom; + transition-duration: 0.13s; + transition-timing-function: linear; + } + + .volumeControl{ + width: 92% !important; + margin-left: 5px !important; +} */ diff --git a/src/other/firefox/WhiteSur/colors/dark.css b/src/other/firefox/WhiteSur/colors/dark.css index b09e295d..8d74239a 100644 --- a/src/other/firefox/WhiteSur/colors/dark.css +++ b/src/other/firefox/WhiteSur/colors/dark.css @@ -8,7 +8,7 @@ @media (prefers-color-scheme: dark) { :root { /* Browser area before a page starts loading */ - --gnome-browser-before-load-background: #333333; + --gnome-browser-before-load-background: #242424; --theme-primary-color: #315bef; /* Toolbars */ diff --git a/src/other/firefox/WhiteSur/icons/icon.svg b/src/other/firefox/WhiteSur/icons/icon.svg new file mode 100644 index 00000000..c832d960 --- /dev/null +++ b/src/other/firefox/WhiteSur/icons/icon.svg @@ -0,0 +1,60 @@ + + + + + + + + + + + diff --git a/src/other/firefox/WhiteSur/pages/newtab.css b/src/other/firefox/WhiteSur/pages/newtab.css new file mode 100644 index 00000000..1c94e842 --- /dev/null +++ b/src/other/firefox/WhiteSur/pages/newtab.css @@ -0,0 +1,9 @@ +/* about:newtab */ + +@-moz-document url("about:newtab"), url("about:home") { + body { + --newtab-background-color: var(--gnome-browser-before-load-background) !important; + --newtab-background-color-secondary: var(--gnome-menu-background) !important; + --newtab-primary-action-background: var(--gnome-accent) !important; + } +} diff --git a/src/other/firefox/WhiteSur/pages/privatebrowsing.css b/src/other/firefox/WhiteSur/pages/privatebrowsing.css new file mode 100644 index 00000000..e1600ec4 --- /dev/null +++ b/src/other/firefox/WhiteSur/pages/privatebrowsing.css @@ -0,0 +1,16 @@ +/* about:privatebrowsing */ + +@-moz-document url("about:privatebrowsing") { + html.private { + --in-content-page-background: var(--gnome-private-in-content-page-background) !important; + + /* Used by headings in promo boxes Firefox shows (like an ad for Firefox Focus) */ + --in-content-text-color: var(--gnome-private-text-primary-color) !important; + } + .wordmark { + fill: var(--gnome-private-wordmark) !important; + } + .showPrivate { + color: var(--gnome-private-text-primary-color); + } +} diff --git a/src/other/firefox/WhiteSur/parts/video-player.css b/src/other/firefox/WhiteSur/parts/video-player.css new file mode 100644 index 00000000..bc8a6a03 --- /dev/null +++ b/src/other/firefox/WhiteSur/parts/video-player.css @@ -0,0 +1,75 @@ +@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); +@namespace html url("http://www.w3.org/1999/xhtml"); + +/** Video player **/ + +.progressBar::-moz-progress-bar { + background-color: #fff !important; +} + +.scrubber:hover::-moz-range-thumb, +.volumeControl:hover::-moz-range-thumb { + background-color: #ccc !important; +} + +.scrubber:active::-moz-range-thumb, +.volumeControl:active::-moz-range-thumb { + background-color: #bbb !important; +} + +.controlBar { + border-radius: 5px; + margin: auto; + margin-bottom: 5px; + width: 98.5%; + max-width: 800px; + height: 30px !important; + background-color: rgba(20,20,20,0.8) !important; +} + +.controlBar > .button:enabled:hover { + fill: #ccc !important; +} + +.controlBar > .button:enabled:hover:active { + fill: #bbb !important; +} + +.scrubberStack { + margin: 0 10px; +} + +.playButton { + scale: 0.8; +} + + + +/** Vertical Volume Bar **/ +/* I'm to stupid to get this working. Wasn't able to set proper position relative to mute button */ + +/* .muteButton:hover ~ .volumeStack{ + margin-bottom: 129px !important; + } + .volumeStack:hover { + margin-bottom: 129px !important; + } + + .volumeStack { + transform: rotate(270deg); + max-height: 33px !important; + min-width: 100px !important; + position:absolute !important; + margin-bottom: -150px !important; + background-color: rgba(20,20,20,0.8) !important; + border-bottom-right-radius: 5px !important; + border-top-right-radius: 5px !important; + transition-property: margin-bottom; + transition-duration: 0.13s; + transition-timing-function: linear; + } + + .volumeControl{ + width: 92% !important; + margin-left: 5px !important; +} */ diff --git a/src/other/firefox/WhiteSur/theme.css b/src/other/firefox/WhiteSur/theme.css index 091f0194..ed471a76 100644 --- a/src/other/firefox/WhiteSur/theme.css +++ b/src/other/firefox/WhiteSur/theme.css @@ -13,12 +13,15 @@ @import "parts/remove-white-flash.css"; @import "parts/custom-icons.css"; @import "parts/icons.css"; +@import "parts/video-player.css"; @import "colors/light.css"; @import "colors/dark.css"; @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; /* Set theme version text in customization panel */ #customization-footer::before { + background: url(icons/icon.svg) no-repeat; + background-size: contain; content: "Firefox WhiteSur theme"; - padding: 10px; + padding: 10px 10px 10px 50px; } diff --git a/src/other/firefox/userContent-Monterey.css b/src/other/firefox/userContent-Monterey.css new file mode 100644 index 00000000..a66975c2 --- /dev/null +++ b/src/other/firefox/userContent-Monterey.css @@ -0,0 +1,5 @@ +@import "Monterey/colors/light.css"; +@import "Monterey/colors/dark.css"; + +@import "Monterey/pages/newtab.css"; +@import "Monterey/pages/privatebrowsing.css"; diff --git a/src/other/firefox/userContent-WhiteSur.css b/src/other/firefox/userContent-WhiteSur.css new file mode 100644 index 00000000..36d88313 --- /dev/null +++ b/src/other/firefox/userContent-WhiteSur.css @@ -0,0 +1,5 @@ +@import "WhiteSur/colors/light.css"; +@import "WhiteSur/colors/dark.css"; + +@import "WhiteSur/pages/newtab.css"; +@import "WhiteSur/pages/privatebrowsing.css"; From ca29dc428402e9db78b68d9cb55fe97d1f5c059d Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Tue, 14 Feb 2023 18:12:53 +0800 Subject: [PATCH 4/4] update --- src/other/firefox/Monterey/theme-alt.css | 4 +++- src/other/firefox/Monterey/theme.css | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/other/firefox/Monterey/theme-alt.css b/src/other/firefox/Monterey/theme-alt.css index 169c1676..6be65657 100644 --- a/src/other/firefox/Monterey/theme-alt.css +++ b/src/other/firefox/Monterey/theme-alt.css @@ -21,6 +21,8 @@ /* Set theme version text in customization panel */ #customization-footer::before { + background: url(icons/icon.svg) no-repeat; + background-size: contain; content: "Firefox Monterey theme"; - padding: 10px; + padding: 10px 10px 10px 50px; } diff --git a/src/other/firefox/Monterey/theme.css b/src/other/firefox/Monterey/theme.css index 8f331955..b6d60141 100644 --- a/src/other/firefox/Monterey/theme.css +++ b/src/other/firefox/Monterey/theme.css @@ -21,6 +21,8 @@ /* Set theme version text in customization panel */ #customization-footer::before { + background: url(icons/icon.svg) no-repeat; + background-size: contain; content: "Firefox Monterey theme"; - padding: 10px; + padding: 10px 10px 10px 50px; }