diff --git a/Makefile b/Makefile index 77a76a6..b6ab6b8 100644 --- a/Makefile +++ b/Makefile @@ -149,7 +149,6 @@ build-launcher: check-arch package-linux: python3 scripts/package.py linux \ --includes \ - settings/chrome.css \ settings/camoucfg.jvv \ settings/properties.json \ bundle/fontconfigs \ @@ -161,7 +160,6 @@ package-linux: package-macos: python3 scripts/package.py macos \ --includes \ - settings/chrome.css \ settings/camoucfg.jvv \ settings/properties.json \ --version $(version) \ @@ -172,7 +170,6 @@ package-macos: package-windows: python3 scripts/package.py windows \ --includes \ - settings/chrome.css \ settings/camoucfg.jvv \ settings/properties.json \ ~/.mozbuild/vs/VC/Redist/MSVC/14.38.33135/$(vcredist_arch)/Microsoft.VC143.CRT/*.dll \ diff --git a/patches/config.patch b/patches/config.patch index cfb28c6..6b64c17 100644 --- a/patches/config.patch +++ b/patches/config.patch @@ -21,7 +21,6 @@ index e69de29bb2..208184547e 100644 @@ -0,0 +1,14 @@ +FINAL_TARGET_FILES += [ + "omegafox.cfg", -+ "chrome.css", + "properties.json" +] + diff --git a/patches/global-style-sheets.patch b/patches/global-style-sheets.patch index 09aa164..af1c462 100644 --- a/patches/global-style-sheets.patch +++ b/patches/global-style-sheets.patch @@ -33,14 +33,3 @@ index 13d65c2d3e..c51f1da030 100644 return; } -@@ -470,8 +475,8 @@ void GlobalStyleSheetCache::InitFromProfile() { - return; - } - -- contentFile->Append(u"userContent.css"_ns); -- chromeFile->Append(u"userChrome.css"_ns); -+ contentFile->Append(u"content.css"_ns); -+ chromeFile->Append(u"chrome.css"_ns); - - mUserContentSheet = LoadSheetFile(contentFile, eUserSheetFeatures); - mUserChromeSheet = LoadSheetFile(chromeFile, eUserSheetFeatures); diff --git a/scripts/copy-additions.sh b/scripts/copy-additions.sh index 37f17a2..b3ad1be 100644 --- a/scripts/copy-additions.sh +++ b/scripts/copy-additions.sh @@ -35,7 +35,6 @@ pushd lw > /dev/null run 'cp -v ../../settings/omegafox.cfg .' run 'cp -v ../../settings/distribution/policies.json .' run 'cp -v ../../settings/defaults/pref/local-settings.js .' -run 'cp -v ../../settings/chrome.css .' run 'cp -v ../../settings/properties.json .' run 'touch moz.build' popd > /dev/null diff --git a/settings/chrome.css b/settings/chrome.css deleted file mode 100644 index cc91747..0000000 --- a/settings/chrome.css +++ /dev/null @@ -1,173 +0,0 @@ -/* - Minimalistic theme - Based on https://github.com/Jamir-boop/minimalisticfox -*/ - -:root { - --tab-block-margin: 0 !important; -} -.tabbrowser-tab { - padding-inline: 0 !important; - max-height: 30px !important; -} -.tab-context-line { - display: none !important; -} -*/ .tab-background { - /* border-block: 2px solid var(--identity-icon-color,transparent) !important; */ - border-radius: 0px !important; - max-height: 30px !important; -} - -/* Disable tab dragging and use it for window movement */ -#TabsToolbar { - -moz-window-dragging: drag !important; -} - -.tabbrowser-tab { - -moz-window-dragging: inherit !important; -} - -.tab-content { - pointer-events: none !important; -} - -/* Tab and url height */ - -:root { - --tab-min-height: 25px !important; - --tab-max-height: 25px !important; - --toolbar-field-focus-border-color: transparent !important; -} - -#navigator-toolbox :-moz-any(#nav-bar) { - min-height: 30px !important; - max-height: 30px !important; - margin-top: 0px !important; - z-index: 5 !important; -} - -/* fix urlbar being too high in ff 74 */ -* { - --urlbar-toolbar-height: 30px !important; -} - -/* Center tab icons */ -.tab-background { - min-height: 0 !important; -} -.tabbrowser-tab[fadein] { - max-width: 100% !important; -} -.tab-text { - margin: 0 auto !important; -} - -/* Center tab icon */ -.tab-icon-stack { - margin-inline-start: auto; -} -.tab-label-container { - max-width: min-content; - margin-inline-end: auto; -} - -/* Window handles */ -.titlebar-spacer[type="pre-tabs"] { - width: 100px !important; -} - -.titlebar-buttonbox-container { - width: 100px !important; - display: flex !important; - justify-content: flex-end !important; -} - -.titlebar-spacer[type="post-tabs"] { - width: 0px !important; -} - -/* Keeps the .titlebar-spacer[type="pre-tabs"] and [type="post-tabs"] consistent in all window sizes */ -:root:not([sizemode="normal"]) .titlebar-spacer[type="pre-tabs"] { - display: block !important; -} -@media (max-width: 500px) { - .titlebar-spacer[type="post-tabs"] { - display: block !important; - } -} - -/* Deactivating close, minimize and maximize buttons */ -.tab-close-button, -#TabsToolbar .toolbarbutton-1 { - display: none !important; -} - -/* Context menu */ -menupopup, -panel { - --panel-border-radius: 0px !important; -} - -/* Set menu popups to black on dark mode */ -@media (prefers-color-scheme: dark) { - menupopup, - panel { - --panel-background: black !important; - } -} - -/* - * Items inside menu - * menu, menuitem:where([_moz-menuactive]:not([disabled="true"])){ - * background-color: #242429 !important; - * } - */ - -#nav-bar toolbarspring { - min-width: 0px !important; - max-width: 0px !important; -} - -/* Make URL bar black when not focused */ -#urlbar-container { - --urlbar-container-height: 30px !important; -} - -#urlbar { - --urlbar-height: 30px !important; - --urlbar-toolbar-height: 30px !important; - min-height: 30px !important; - max-height: 30px !important; -} - -#urlbar:not(:focus-within):not([open]) > #urlbar-background { - background-color: transparent !important; - border: none !important; -} - -#urlbar:not(:focus-within):not([open]) .urlbar-icon:not([open]) { - fill: white !important; - fill-opacity: 0.6 !important; -} - -/* Make tab background transparent when focused */ -.tabbrowser-tab[selected="true"] .tab-background { - background-color: transparent !important; - outline: none !important; - box-shadow: none !important; -} - -/* Cleanup menu bar */ -#tracking-protection-icon-container, -#tab-notification-deck, -#star-button-box, -#urlbar-go-button, -#unified-extensions-button, -.customize-context-pinToToolbar, -#PersonalToolbar, -toolbar#nav-bar > .titlebar-buttonbox-container, -toolbar#nav-bar > .titlebar-spacer, -#appMenu-library-remotetabs-button { - display: none !important; -}