diff --git a/README.md b/README.md index bd8a2f7..dbe2fbd 100644 --- a/README.md +++ b/README.md @@ -3,31 +3,25 @@ screenshot screenshot - # Rounded Corners screenshot -# Sidebar Support -screenshot -screenshot - # How to install 1. Go to `about:support` and click the "Open Folder/Show in Finder" button for the root directory of your browser profile/s. 2. Download and copy the `chrome` folder and `user.js` into the profile folder. 3. Restart Firefox. +> **Note:** FireFox v133.0+ only + # Tweaks - To enable macOS button style, open `user.js`, find `fp.tweak.macos-button` and set it to `true`. - To disable bookmarks autohide open `user.js`, find `fp.tweak.autohide-bookmarks` and set it to `false`. - To enable or disable rounded corners, open `user.js`, find `fp.tweak.rounded-corners` and set it to `true` or `false`. -- To enable support for sidebar, open `user.js`, find `fp.tweak.sidebar-enabled` and set it to `true` or `false`. - To enable or disable White Mode, open `user.js`, find `browser.in-content.dark-mode` and set it to `true` or `false`. Then find and set `ui.systemUsesDarkTheme` to `1` or `0`. -> [!NOTE] -> To get the sidebar support you will need to install the [Sidebar Tabs](https://github.com/asamuzaK/sidebarTabs) extension. -# Experimental -Install or update Firefox Plus directly from PowerShell. + +# Install or update Firefox Plus directly from PowerShell. 1. Open PowerShell. 2. Copy and paste this command @@ -46,4 +40,4 @@ iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercon # License -This project is licensed under the MIT License. +This project is licensed under the MIT License. \ No newline at end of file diff --git a/chrome/content/common.css b/chrome/content/common.css index b868785..d210dd1 100644 --- a/chrome/content/common.css +++ b/chrome/content/common.css @@ -275,4 +275,6 @@ backdrop-filter: blur(12px); } -} \ No newline at end of file +} + + \ No newline at end of file diff --git a/chrome/global/general.css b/chrome/global/general.css index 435a368..43a9f42 100644 --- a/chrome/global/general.css +++ b/chrome/global/general.css @@ -841,4 +841,11 @@ menuitem[checked="true"]>.menu-iconic-left, .findbar-textbox[status="notfound"] { outline: 2px solid #E22850 !important; + } + + #tabbrowser-tabbox { + @media (-moz-bool-pref: "sidebar.revamp") { + outline: 0px solid transparent !important; + box-shadow: none !important + } } \ No newline at end of file diff --git a/chrome/global/rounded-corners.css b/chrome/global/rounded-corners.css index d5dba2f..3ff352b 100644 --- a/chrome/global/rounded-corners.css +++ b/chrome/global/rounded-corners.css @@ -1,4 +1,4 @@ -:root[tabsintitlebar] #titlebar:-moz-window-inactive { +:root[tabsintitlebar] #TabsToolbar:-moz-window-inactive { opacity: 1 !important; } #main-window:not([chromehidden~="toolbar"]) { diff --git a/chrome/icons/icons.css b/chrome/icons/icons.css index b48c2b6..78dec59 100644 --- a/chrome/icons/icons.css +++ b/chrome/icons/icons.css @@ -45,29 +45,27 @@ list-style-image: url("mac-close.svg") !important; } } - + .titlebar-buttonbox { + margin: 0 8px !important; + } .titlebar-button { & > .toolbarbutton-icon { - width: 24px !important; - height: 24px !important; + width: 14px !important; + height: 14px !important; } } .titlebar-button { - padding: 0 0px !important; + padding: 0 4px !important; filter: grayscale(1) brightness(6); opacity: 0.25 !important; } - #titlebar:hover .titlebar-button { + #TabsToolbar:hover .titlebar-button { filter: grayscale(0) brightness(1); opacity: 0.8 !important; } - :-moz-window-inactive .titlebar-button { - opacity: 0.5 !important; - } - - .titlebar-button:hover, + .titlebar-button:hover, .titlebar-button:not(.titlebar-close):hover { background-color: transparent !important; } @@ -75,7 +73,7 @@ toolbar[brighttext] .titlebar-close:hover:active { background-color: transparent !important; } - #titlebar .titlebar-button:hover { + #TabsToolbar .titlebar-button:hover { opacity: 1 !important; } } diff --git a/chrome/icons/mac-close.svg b/chrome/icons/mac-close.svg index 8269d72..2da498e 100644 --- a/chrome/icons/mac-close.svg +++ b/chrome/icons/mac-close.svg @@ -1,254 +1,23 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/chrome/icons/mac-maximize.svg b/chrome/icons/mac-maximize.svg index a93e8df..cff028b 100644 --- a/chrome/icons/mac-maximize.svg +++ b/chrome/icons/mac-maximize.svg @@ -1,571 +1,23 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/chrome/icons/mac-minimize.svg b/chrome/icons/mac-minimize.svg index 1fca936..506a900 100644 --- a/chrome/icons/mac-minimize.svg +++ b/chrome/icons/mac-minimize.svg @@ -1,577 +1,23 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/chrome/icons/mac-restore.svg b/chrome/icons/mac-restore.svg index 568eef7..506a900 100644 --- a/chrome/icons/mac-restore.svg +++ b/chrome/icons/mac-restore.svg @@ -1,583 +1,23 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/chrome/sidebar/sidebar-support.css b/chrome/sidebar/sidebar-support.css deleted file mode 100644 index 082c5d0..0000000 --- a/chrome/sidebar/sidebar-support.css +++ /dev/null @@ -1,102 +0,0 @@ -#sidebar-box { - position: fixed; - z-index: 3; - left: -288px; - top: 38px; - opacity: 0; - bottom: 4px; - border-radius: 8px; - width: 288px !important; - transition: all 600ms cubic-bezier(0.77, 0, 0.18, 1); - box-shadow: 4px 0px 10px 0px rgba(0, 0, 0, 0.4); -} - -#sidebar-box:hover { - left: 4px; - opacity: 1; -} - -#sidebar-box::after { - content: ""; - background-color: transparent; - width: 16px; - top: 42px; - bottom: 0; - right: -12px; - position: absolute; -} - -#sidebar-box::before { - content: ""; - background-color: transparent; - width: 12px; - top: 0; - bottom: 0; - left: -12px; - position: absolute; -} - -#sidebar { - border-radius: 8px; - overflow: hidden; - position: relative; - z-index: 1; -} - -#sidebar::after { - content: ""; - top: 0px; - bottom: 0; - right: 0; - position: absolute; - left: 0; - border: 1px solid #2b2a33; - border-radius: 8px; - z-index: 0; - outline: #2b2a33 solid; - outline-width: 1px; -} - -#titlebar { - height: 0; -} - -.titlebar-buttonbox-container { - position: absolute; - top: 0; - right: 0; - height: 38px; -} - -#PanelUI-menu-button { - padding-inline-end: 134px !important; -} - -#firefox-view-button { - position: absolute; - top: 0; - left: 4; - z-index: 1; - height: 38px; -} - -#nav-bar-customization-target { - padding-left: 34px !important; -} - -#TabsToolbar #TabsToolbar-customization-target> :not(#tabbrowser-tabs) { - margin: 0 !important; -} - -#TabsToolbar #firefox-view-button[open]>.toolbarbutton-icon { - box-shadow: none !important; -} - -/* Disable extension dot bug*/ -#unified-extensions-button[attention]>.toolbarbutton-icon { - background-image: none !important; -} - -#sidebar-header { - display: none !important; -} \ No newline at end of file diff --git a/chrome/sidebar/sidebar-tabs.css b/chrome/sidebar/sidebar-tabs.css deleted file mode 100644 index de5cb49..0000000 --- a/chrome/sidebar/sidebar-tabs.css +++ /dev/null @@ -1,130 +0,0 @@ -.tab-container.pinned { - display: flex !important; - overflow: hidden !important; - flex-wrap: wrap !important; - scrollbar-width: none !important; - padding: 4px !important; - resize: none !important; -} - -#pinned .tab-title { - display: none !important; -} - -#pinned .tab-content { - justify-content: center !important; -} - -.tab-container .tab-items { - border: none !important; -} - -.tab-container.pinned .tab-pinned { - display: none !important; -} - -.tab.pinned { - min-width: 64px !important; - width: 100% !important; - - border-radius: 8px !important; - flex: 1 0 !important; -} - -.tab.pinned:nth-child(n + 6) { - flex: 0 0 68px !important; -} - -.tab.pinned .tab-items { - height: 42px !important; - border-radius: 6px !important; - background: rgba(255, 255, 255, 0.1) !important; - justify-content: center !important; - align-items: center !important; - align-content: center !important; -} - -.tab.pinned.active .tab-items { - background: rgba(255, 255, 255, 0.2) !important; -} - -.tab-container.pinned .tab-icon { - width: 16px !important; - height: 16px !important; -} - -.tab-container.pinned .tab-context { - display: none !important; -} - -.tab-container:not(.pinned) .tab-items { - margin: 6px !important; -} - -.tab-container:not(.pinned):hover .tab-items .tab-close { - opacity: 1 !important; -} - -.tab-container:not(.pinned) .tab-items .tab-close { - opacity: 0 !important; - transition: all 0.3s; -} - -.group:not(.ungroup) .tab-container.tab-group:not(.pinned) .tab:not(:first-of-type) { - margin-left: 30px !important; -} - -.tab-container.tab-group:not(.pinned) .tab:first-of-type .tab-context { - background-color: transparent !important; - position: absolute; - top: 50%; - left: 12px !important; - z-index: 6; - margin-top: -4px !important; - left: 0; -} - -.tab-container:not(.pinned) .tab-title { - padding-left: 8px !important; -} - -.tab-container.tab-group:not(.pinned) .tab:first-of-type .tab-context>.tab-toggle-icon { - width: 8px !important; - height: 8px !important; -} - -.group:not(.ungroup):is(.tab-group > :not([hidden]), :not(.tab-group) > .tab)>.tab-context { - flex: 0 0 0 !important; -} - -.tab-container.tab-group:not(.pinned) .tab:not(:first-of-type) .tab-context { - flex: 0 0 1px !important; - background-color: rgba(255, 255, 255, 0.2) !important; -} - -.group:not(.ungroup) .tab-container.tab-group:not(.pinned) .tab:first-of-type .tab-items { - padding-left: 16px !important; -} - -.tab-container:not(.tab-group):not(.pinned)>.tab>.tab-context { - flex: 0 0 0 !important -} - -#sidebar-tabs main { - scrollbar-width: none !important; -} - -.tab.newtab { - padding: var(--scale-size) !important; -} - -.tab.newtab:hover>.newtab-items { - background-color: var(--background-active-color) !important; -} - -.custom-theme { - --background-color: #1c1b22 !important; - --background-active-color: #42414d !important; - --background-hover-color: #373641 !important; - --background-hover-shadow: #f7f7f74b !important; -} \ No newline at end of file diff --git a/chrome/toolbar/personalbar.css b/chrome/toolbar/personalbar.css index e5d50e9..1db8ca4 100644 --- a/chrome/toolbar/personalbar.css +++ b/chrome/toolbar/personalbar.css @@ -92,9 +92,9 @@ toolbarbutton.bookmark-item[open="true"] > .toolbarbutton-icon{ z-index: 1; height: 34px; } -.browser-toolbar:not(.titlebar-color):not(.browser-toolba) { +/* .browser-toolbar:not(.titlebar-color):not(.browser-toolba) { background-color: var(--toolbar-bgcolor) !important; -} +} */ :root[uidensity="compact"] #PersonalToolbar{ --toolbarbutton-outer-padding: 1px !important; } @@ -119,19 +119,19 @@ toolbarbutton.bookmark-item[open="true"] > .toolbarbutton-icon{ #navigator-toolbox:is(:hover,:focus-within){ border-bottom: 0; } -#navigator-toolbox:hover > #PersonalToolbar +#navigator-toolbox:hover > #PersonalToolbar { transition-delay: 800ms !important; - transform: rotateX(var(--autohide-toolbar-hover-rotation,0)); + transform: rotateX(var(--autohide-toolbar-hover-rotation,0)) !important; } #navigator-toolbox:hover > #nav-bar:focus-within + #PersonalToolbar, -#navigator-toolbox:hover > #nav-bar:focus-within + #titlebar{ - transform: rotateX(0); +#navigator-toolbox:hover > #nav-bar:focus-within + #TabsToolbar{ + transform: rotateX(0) !important; } } - #navigator-toolbox { + z-index: 3 !important; border-bottom: 0 !important } diff --git a/chrome/toolbar/tabbar.css b/chrome/toolbar/tabbar.css index b33ff89..c74c0ae 100644 --- a/chrome/toolbar/tabbar.css +++ b/chrome/toolbar/tabbar.css @@ -2,7 +2,7 @@ --lwt-selected-tab-background-color: unset !important; --tab-block-margin: 8px !important; --tab-selected-bgcolor: var(--toolbar-bgcolor) !important; - & #titlebar { + & #TabsToolbar { --tab-min-height: 32px !important; --inline-tab-padding: 11px !important; --tab-border-radius: 8px !important; @@ -14,6 +14,11 @@ --tab-shadow-max-size: 0 !important; } } +#tabbrowser-tabs { + &[orient="horizontal"] { + min-height: var(--tab-min-height) !important; + } + } .tabbrowser-tab .tab-stack { &::before, &::after { @@ -146,11 +151,10 @@ } .tab-close-button { - margin-inline-end: 8px !important; - width: 17px !important; - height: 17px !important; + width: 16px !important; + height: 16px !important; padding: 4px !important; - border-radius: 2px !important; + border-radius: 4px !important; } .tab-throbber:not([pinned]), @@ -444,7 +448,7 @@ toolbarbutton[part="scrollbutton-down"] { box-shadow: var(--fp-tab-shadow) !important; } -#titlebar { +#TabsToolbar { box-shadow: var(--fp-titlebar-shadow) !important; z-index: 1; } @@ -455,9 +459,9 @@ toolbarbutton[part="scrollbutton-down"] { --tab-label-mask-size: 1em !important; } -.tab-content { +/* .tab-content { padding-inline: var(--inline-tab-padding) 0 !important; -} +} */ /* new private browsing indicator */ :root[privatebrowsingmode="temporary"] #TabsToolbar .toolbar-items, @@ -514,8 +518,21 @@ toolbarbutton[part="scrollbutton-down"] { > :not(.tab-icon-overlay) { opacity: 1 !important; } +.tab-icon-overlay { + &:is([soundplaying], [muted], [activemedia-blocked]) { + background-color:transparent !important; + fill: white !important; + } + &:hover, + &:hover:active { + background-color:transparent !important; + } + } .tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([selected]) { background-position: 4px 4px !important; } +.titlebar-spacer[type="post-tabs"] { + width: 0 !important; +} \ No newline at end of file diff --git a/chrome/toolbar/urlbar.css b/chrome/toolbar/urlbar.css index c0bbf41..b70ef81 100644 --- a/chrome/toolbar/urlbar.css +++ b/chrome/toolbar/urlbar.css @@ -62,11 +62,11 @@ padding-block: 8px 0 !important; } -/* breakout */ -#urlbar[breakout][breakout-extend] { + +/* #urlbar[breakout][breakout-extend] { left: 0 !important; width: 100% !important; -} +} */ #urlbar[breakout][breakout-extend] > #urlbar-input-container { padding-inline: var(--urlbar-container-padding) !important; @@ -151,7 +151,7 @@ order: 2 !important; } -#urlbar, + #searchbar { padding: 0 4px !important; } diff --git a/chrome/userChrome.css b/chrome/userChrome.css index a7b96c4..84214db 100644 --- a/chrome/userChrome.css +++ b/chrome/userChrome.css @@ -6,4 +6,3 @@ @import url("global/general.css"); @import url("icons/icons.css"); @import url("global/rounded-corners.css") (-moz-bool-pref: "fp.tweak.rounded-corners"); -@import url("sidebar/sidebar-support.css") (-moz-bool-pref: "fp.tweak.sidebar-enabled"); \ No newline at end of file diff --git a/chrome/userContent.css b/chrome/userContent.css index 5468077..b0f6504 100644 --- a/chrome/userContent.css +++ b/chrome/userContent.css @@ -1,5 +1,4 @@ @import url("content/common.css"); @import url("content/newtab.css"); @import url("content/card-container.css"); -@import url("global/tweaks.css"); -@import url("sidebar/sidebar-tabs.css") (-moz-bool-pref: "fp.tweak.sidebar-enabled"); \ No newline at end of file +@import url("global/tweaks.css"); \ No newline at end of file diff --git a/install.ps1 b/install.ps1 index 4400b46..3d2fa0f 100644 --- a/install.ps1 +++ b/install.ps1 @@ -66,10 +66,6 @@ Get-ChildItem -Path $firefoxProfilesPath | ForEach-Object { "line" = "user_pref(`"fp.tweak.rounded-corners`", true);" "desc" = "Enable rounded corners" }, - [PSCustomObject]@{ - "line" = "user_pref(`"fp.tweak.sidebar-enabled`", true);" - "desc" = "Enable sidebar support" - }, [PSCustomObject]@{ "line" = "user_pref(`"app.update.auto`", false);" "desc" = "Enable Firefox autoupdate" diff --git a/screenshots/Screenshot 2023-12-04 144143.png b/screenshots/Screenshot 2023-12-04 144143.png index 4945d5b..829e28f 100644 Binary files a/screenshots/Screenshot 2023-12-04 144143.png and b/screenshots/Screenshot 2023-12-04 144143.png differ diff --git a/screenshots/sidebar-demo-video.00_00_17_07.Still001.png b/screenshots/sidebar-demo-video.00_00_17_07.Still001.png deleted file mode 100644 index 9bcb950..0000000 Binary files a/screenshots/sidebar-demo-video.00_00_17_07.Still001.png and /dev/null differ diff --git a/screenshots/sidebar-demo-video.gif b/screenshots/sidebar-demo-video.gif deleted file mode 100644 index 3ec8197..0000000 Binary files a/screenshots/sidebar-demo-video.gif and /dev/null differ diff --git a/screenshots/sidebar-demo.png b/screenshots/sidebar-demo.png deleted file mode 100644 index a84c0b8..0000000 Binary files a/screenshots/sidebar-demo.png and /dev/null differ diff --git a/user.js b/user.js index 19b126b..cdd1675 100644 --- a/user.js +++ b/user.js @@ -9,7 +9,6 @@ user_pref("browser.tabs.tabClipWidth", 86); user_pref("fp.tweak.autohide-bookmarks", true); user_pref("fp.tweak.macos-button", false); user_pref("fp.tweak.rounded-corners", true); -user_pref("fp.tweak.sidebar-enabled", false); // disable spell checking user_pref("layout.spellcheckDefault", 0);