diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 00000000..be772634 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: '' +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I don't like this design that [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 00000000..ce5e692f --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,36 @@ +on: + push: + tags: + - "v*" # push events to matching v*, i.e. v1.0, v20.15.10 + +jobs: + upload-files: + runs-on: ubuntu-latest + strategy: + matrix: + include: + - name: "Lepton" + branch: "master" + - name: "Lepton-Phton-Style" + branch: "photon-style" + steps: + - uses: actions/checkout@v2 + with: + ref: ${{ matrix.branch }} + + - name: Release Structure + run: | + mkdir -v chrome + + shopt -s extglob + mv -v !(chrome|user.js) chrome/ + + zip -rv ${{ matrix.name }}.zip chrome user.js + + - uses: softprops/action-gh-release@v1 # actions/create-release, actions/upload-release-asset is deprecated + if: startsWith(github.ref, 'refs/tags/') + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + files: | + ${{ matrix.name }}.zip diff --git a/CREDITS b/CREDITS new file mode 100644 index 00000000..04c77782 --- /dev/null +++ b/CREDITS @@ -0,0 +1,84 @@ + This is at least a partial credits-file of people that have contributed to the 'Firefox-UI-Fix' project. + It is sorted by name. + The fields are: name (N), email (E), web-address(W), license(L). + Thanks, + + black7375 +---------- + Reference Projects & Resources + +N: Compact Mode Firefox Css +W: https://github.com/Godiesc/compactmodefirefoxcss +L: MPL 2.0 + +N: EdgeFox +W: https://github.com/23Bluemaster23/EdgeFox + +N: EdgeTabSeparater.userChrome.css +W: https://gist.github.com/mmis1000/08d8de4bbe70c04423f0b966bcc286b1 +L: MIT + +N: firefox-csshacks +W: https://github.com/MrOtherGuy/firefox-csshacks +L: MPL 2.0 + +N: gecko-dev +W: https://hg.mozilla.org/ +L: MPL 2.0 + +N: MaterialFox +W: https://github.com/muckSponge/MaterialFox +L: MIT + +N: Multi-Account-Containers +W: https://github.com/mozilla/multi-account-containers +L: MPL 2.0 + +N: quietfox +W: https://github.com/coekuss/quietfox +L: MIT + +N: SVG Repo +E: info@svgrepo.com +W: https://www.svgrepo.com +L: CC0 + +N: uc.css.js +W: https://github.com/aminomancer/uc.css.js +L: CC BY-NC-SA 4.0 + +N: userChrome.csshacks +W: https://gist.github.com/DCzajkowski/baaf7bc81aae5278d690eaae951a823b +L: CC0 + +N: userChrome.css +W: https://gist.github.com/Dragoner7/ec2319e5038a6b4722d3e692713f9471 +L: MPL 2.0 + +---------- + Major Contributors + +N: Jan Janssen +E: medhefgo@web.de +W: https://github.com/medhefgo + +---------- + Contributors + +N: 7k5x +W: https://github.com/7k5x + +N: mamen +W: https://www.mamen.at + +N: Rahul Ramkumar +E: rahulram226@gmail.com +W: https://rahulramkumar.dev + +N: Roel +E: Nyubis@gmail.com +W: https://github.com/Nyubis + +N: Yunsup Sim +E: pedogunu@gmail.com +W: https://ethansup.net diff --git a/Install.sh b/Install.sh new file mode 100755 index 00000000..e87dcfd2 --- /dev/null +++ b/Install.sh @@ -0,0 +1,19 @@ +autocopy() { + local file=${1} + local target=${2} + + if [ -e "${target}" ]; then + echo "${target} alreay exist." + echo "Now Backup.." + autocopy "${target}" "${target}.bak" + echo"" + fi + + cp -v "${file}" "${target}" +} + +install_lepton() { + local userConfig="user.js" + autocopy "${userConfig}" "../${userConfig}" +} +install_lepton diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..a612ad98 --- /dev/null +++ b/LICENSE @@ -0,0 +1,373 @@ +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. diff --git a/README.org b/README.org index ab25719b..91cb5d84 100644 --- a/README.org +++ b/README.org @@ -1,15 +1,36 @@ -* Firefox UI FIX - [[https://wiki.mozilla.org/Firefox/Proton][proton]] is firefox's new design. \\ - I want to fix some flaws. - - /Disclaimer:/ It works *firefox 89* above!! - | *Wiki* | | | - | [[https://github.com/black7375/Firefox-UI-Fix/wiki/Screenshots][Screenshots]] | [[https://github.com/black7375/Firefox-UI-Fix/wiki/Compatibility-Issues-Solution][Compatibility Issues Solution]] | [[https://github.com/black7375/Firefox-UI-Fix/wiki/Tips][Tips]] | - - [[https://user-images.githubusercontent.com/25581533/117615662-8d8d8580-b159-11eb-8b92-7d249e31d8f3.png]] - - (Fixed proton design) - +* Lepton (old name: Proton Fix) + :PROPERTIES: + :TOC: :include all + :END: + +*Table of Contents* +:CONTENTS: +- [[#lepton-old-name-proton-fix][Lepton (old name: Proton Fix)]] + - [[#introduction][Introduction]] + - [[#installation-guide][Installation Guide]] + - [[#why-proton][WHY Proton?]] + - [[#why-not-proton][WHY Not Proton?]] + - [[#padding-comparisons][Padding Comparisons]] +:END: + + +** Introduction + [[https://wiki.mozilla.org/Firefox/Proton][Proton]] is Firefox's new design, starting from Firefox 89. \\ + [[https://design.firefox.com/photon/][Photon]] is the old design of Firefox which was used until version 88. + + Proton's [[#why-proton][overall feel is good]], but there were a few things I [[#why-not-proton][didn't like]] and wanted to improve. \\ + That's why this project was born, and Lepton to denote light theme layer. + + /Disclaimer:/ It works *Firefox 89* and above!! + | *Wiki* | | | | + | [[https://github.com/black7375/Firefox-UI-Fix/wiki/Installation-Guide][Installation Guide]] | [[https://github.com/black7375/Firefox-UI-Fix/wiki/Screenshots][Screenshots]] | [[https://github.com/black7375/Firefox-UI-Fix/wiki/Compatibility-Issues-Solution][Compatibility Issues Solution]] | [[https://github.com/black7375/Firefox-UI-Fix/wiki/Tips][Tips]] | + + [[https://user-images.githubusercontent.com/25581533/119774062-20942280-beb1-11eb-80aa-c18dd52f18d7.png]] + + (Lepton's design :arrow_up:) + + - *Color* + - Windows system theme support - *Icons* - Panel - *Padding Narrower* @@ -23,11 +44,14 @@ - Selected: - Box Shadow: Highlight the selected tab - Bottom Rounding: Natural + - MultiSelected + - Adjust Color: Easily recognizable. - Unselect: - Divide Line: React to hover like chrome - Clipped: - Cleary Text: Adjusted clipped gradation - Sound: + - Remove Second Label - Show Favicon: Always show favicon - Pinned: - Combinded Close Button: Replace favicon to close button at selected @@ -39,26 +63,30 @@ - Icons: - Size: Fill it up -** How to Install? +** Installation Guide + + 1. Download files + - Click the green ":arrow_down: Code"-button above + - Select ":package: Download Zip" + 2. Find your profile directory + - Open =about:support= in a new tab + - Find the =Profile Folder= entry and click the =Open Folder= button + 3. Copy downloaded files + - Extract the downloaded zip file + - Copy the =user.js= file to the previously opened profile directory + - Create a new directory inside your profile directory called =chrome= + - Copy the remaining files from the extracted zip-file into previously created the =chrome= directory + 4. Restart Firefox + - Click the =Clear startup cache...= at the top of =about:support= - 1. Enable =userChrome.css= Support. - - Go to =about:config= - - =toolkit.legacyUserProfileCustomizations.stylesheets= to =true= - - =svg.context-properties.content.enabled= to =true= - 2. Find Profile Directory. - - Go to =about:support= - - Open Profile Directory - 3. Copy File - - create =chrome= directory at profile - - copy files - 4. Restart + If you prefer Photon, see [[https://github.com/black7375/Firefox-UI-Fix/tree/photon-style][Lepton's photon-style]]. ** WHY Proton? I think a lot has improved. - [[https://user-images.githubusercontent.com/25581533/116493283-ecb3e600-a88d-11eb-8cf4-d1cf428dbb0e.png]] + [[https://user-images.githubusercontent.com/25581533/119773764-a6639e00-beb0-11eb-8023-498b6293c4b2.png]] - (pure proton design) + (Proton's design :arrow_up:) - Neatly organized menu - Icon beautiful enough to remind you of Edge @@ -69,9 +97,9 @@ ** WHY Not Proton? However, there are also many flaws. - [[https://user-images.githubusercontent.com/25581533/117529680-69e70580-afc8-11eb-8ecb-bd1e0cfc1e97.png]] + [[https://user-images.githubusercontent.com/25581533/119773812-b5e2e700-beb0-11eb-923c-55ae1a8ca249.png]] - (proton before design) + (Photon's design :arrow_up:) - Is it a tab or a button? - Where are the menu icons? @@ -80,11 +108,11 @@ - :warning: Address bar 3-point menu, screenshot moves to toolbar (can't fix) ** Padding Comparisons - [[https://user-images.githubusercontent.com/25581533/116781608-75d84200-aa73-11eb-9c75-27d8a82d6382.png]] - [[https://user-images.githubusercontent.com/25581533/116781611-7a9cf600-aa73-11eb-88d8-dc202474e743.png]] + [[https://user-images.githubusercontent.com/25581533/120262626-8c97d180-c289-11eb-87a6-68e285d6d77c.png]] + [[https://user-images.githubusercontent.com/25581533/120253257-6ae11f00-c276-11eb-93cf-393f9845f30b.png]] [[https://user-images.githubusercontent.com/25581533/118402352-1e33fc00-b659-11eb-89fc-3cb38207fe39.png]] [[https://user-images.githubusercontent.com/25581533/116781623-930d1080-aa73-11eb-8fc7-14c238b73bfe.png]] - Photon (Quantum) - Proton - - Proton Fix + - Lepton diff --git a/user.js b/user.js new file mode 100644 index 00000000..5f2e5ca1 --- /dev/null +++ b/user.js @@ -0,0 +1,19 @@ +// ** Theme Related Options **************************************************** +// userchrome.css usercontent.css activate +user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", true); + +// Fill SVG Color +user_pref("svg.context-properties.content.enabled", true); + +// CSS Blur Filter - 88 Above +user_pref("layout.css.backdrop-filter.enabled", true); + +// Restore Compact Mode - 89 Above +user_pref("browser.compactmode.show", true); + +// about:home Search Bar +// user_pref("browser.newtabpage.activity-stream.improvesearch.handoffToAwesomebar", false); + +// ** Useful Options *********************************************************** +// Integrated calculator at urlbar +user_pref("browser.urlbar.suggest.calculator", true); diff --git a/userChrome.css b/userChrome.css index cbccdf55..f5aae5ff 100644 --- a/userChrome.css +++ b/userChrome.css @@ -1,7 +1,36 @@ @media (-moz-proton) { /** Darkmode - Color lighter ************************************************/ - :root[style*="--lwt-accent-color:rgb(12, 12, 13); --lwt-text-color:rgba(249, 249, 250);"] { - --toolbar-bgcolor: rgba(43, 42, 51, 5) !important; + :root[style*="--lwt-accent-color:rgb(12, 12, 13); --lwt-text-color:rgba(249, 249, 250);"], + :root[style*="--lwt-accent-color:rgb(28, 27, 34); --lwt-text-color:rgba(251, 251, 254);"] { + --toolbar-bgcolor: rgba(43, 42, 51, 5) !important; /* Original: rgba(43, 42, 51, 1) */ + } + + /** Windows System Default Theme - Use acccent color ************************/ + @media (-moz-windows-accent-color-in-titlebar) { + /* Tab Bar */ + :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme) .titlebar-color, + :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) .titlebar-color { + color: -moz-accent-color-foreground; + background-color: -moz-accent-color; + } + + :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme) .toolbar-items, + :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) .toolbar-items { + --toolbarbutton-icon-fill: -moz-accent-color-foreground; + --toolbarbutton-hover-background: color-mix(in srgb, -moz-accent-color-foreground 10%, transparent); + --toolbarbutton-active-background: color-mix(in srgb, -moz-accent-color-foreground 15%, transparent); + } + + /* URL Bar */ + :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme), + :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) { + --focus-outline-color: -moz-accent-color !important; + } + + :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme) #urlbar[open] > #urlbar-background, + :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) #urlbar[open] > #urlbar-background { + border-color: color-mix(in srgb, -moz-accent-color 50%, transparent) !important; /* Like: --toolbar-field-focus-border-color */ + } } /** Root - Reduce Padding ***************************************************/ @@ -56,8 +85,8 @@ padding-right: var(--newtab-button-width-padding) !important; } - :root[uidensity=compact] #tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab[first-visible-unpinned-tab] { - margin-inline-start: 0 !important; + #tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab[first-visible-unpinned-tab] { + margin-inline-start: 1px !important; } :root:not([uidensity=touch]) #tabbrowser-arrowscrollbox { @@ -149,15 +178,34 @@ } /** Selected Tab - Color like toolbar ***************************************/ - #tabbrowser-tabs:not([movingtab]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab > .tab-stack > .tab-background[multiselected="true"]:-moz-lwtheme, #tabbrowser-tabs:not([movingtab]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab > .tab-stack > .tab-background[selected="true"]:-moz-lwtheme { +#tabbrowser-tabs:not([movingtab]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab > .tab-stack > .tab-background[selected="true"]:-moz-lwtheme { + /* Original: linear-gradient(var(--lwt-selected-tab-background-color, transparent), var(--lwt-selected-tab-background-color, transparent)), linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor)), var(--lwt-header-image, none) + */ + background-image: linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor)), var(--lwt-header-image, none) !important; + } + + /* Multi Selected Color */ + #tabbrowser-tabs:not([movingtab]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab > .tab-stack > .tab-background[multiselected]:not([selected]):-moz-lwtheme { background-image: linear-gradient(var(--toolbar-bgcolor, transparent), var(--toolbar-bgcolor, transparent)), linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor)), var(--lwt-header-image, none) !important; } + .tab-background[multiselected="true"]:not([selected="true"]) > .tab-loading-burst:not([bursting]) { + background: color-mix(in srgb, currentColor 65%, transparent); + opacity: .3; + } + #TabsToolbar[brighttext] .tab-background[multiselected="true"]:not([selected="true"]) > .tab-loading-burst:not([bursting]) { + opacity: .15; + } + /** Selected Tab - Box Shadow ***********************************************/ - #TabsToolbar[brighttext] #tabbrowser-tabs:not([noshadowfortests]) .tabbrowser-tab:is([visuallyselected="true"], - [multiselected]) > .tab-stack > .tab-background:-moz-lwtheme { + #TabsToolbar[brighttext] #tabbrowser-tabs:not([noshadowfortests]) .tabbrowser-tab[visuallyselected="true"] > .tab-stack > .tab-background:-moz-lwtheme { + /* Origina: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9)) + Bright: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9)), 0 0 4px rgba(128,128,142,0.5) */ box-shadow: 0 0 1px var(--toolbar-color) !important; } + #TabsToolbar[brighttext] #tabbrowser-tabs:not([noshadowfortests]) .tabbrowser-tab[multiselected]:not([visuallyselected]) > .tab-stack > .tab-background:-moz-lwtheme { + box-shadow: 0 0 1px color-mix(in srgb, var(--toolbar-color) 80%, transparent) !important; + } /* Pinned Tab - tabbrowser-arrowscrollbox overflowing */ #tabbrowser-tabs[positionpinnedtabs] > #tabbrowser-arrowscrollbox > .tabbrowser-tab[pinned] { @@ -228,7 +276,7 @@ } .tabbrowser-tab[last-visible-tab] .tab-background::after { right: 0; - transform: translateX(2.5px) translateY(calc(-50% + 1px)) !important; + transform: translateX(.5px) translateY(calc(-50% + 1px)) !important; } .tabbrowser-tab:is([visuallyselected], [multiselected], :hover) + .tabbrowser-tab:not([visuallyselected]) .tab-background::before, @@ -239,7 +287,7 @@ /* Latest Tab & New tab margin */ #tabbrowser-arrowscrollbox:not([overflowing]) .tabbrowser-tab[last-visible-tab] { - margin-inline-end: 8px !important; + margin-inline-end: 4px !important; } /** Clipped tabs - Letters cleary *******************************************/ @@ -371,51 +419,6 @@ margin-left: 0px !important; } - /** Pinned Tab - Replace Favicon to Close Button at Selected ****************/ - .tabbrowser-tab[pinned][visuallyselected]:not([busy]) .tab-close-button { - display: -moz-box !important; - -moz-box-ordinal-group: 0 !important; - transform: translateX(-1px); - - /* Looks like hover */ - width: 24px !important; - height: 24px !important; - padding: 7px !important; - } - .tabbrowser-tab[pinned][visuallyselected] .tab-icon-image { - display: none !important; - } - - /* Left Padding - Assume the icon size is 17px */ - .tabbrowser-tab[pinned][visuallyselected]:not([busy]) .tab-content { - padding-inline: 7.5px !important; /* Original: 10px */ - } - - /* Right Padding - Assume the icon size is 17px */ - .tabbrowser-tab[pinned][visuallyselected]:not([busy]) .tab-icon-stack { - width: 8.5px !important; - } - .tabbrowser-tab[pinned][visuallyselected]:not([busy]) .tab-content { - padding-inline-end: 0px !important; - } - - .tabbrowser-tab[pinned][visuallyselected][busy] .tab-content { - padding-inline-end: 9.5px !important; - } - .tabbrowser-tab[pinned][busy] .tab-content { - padding-inline: 10.5px !important; - } - - /* Sound Tab - Don't move overlay */ - .tabbrowser-tab[pinned][busy] .tab-icon-overlay:is([soundplaying], [muted], [activemedia-blocked]) { - transform: translateX(.5px) translateY(-2px) !important; - } - - .tabbrowser-tab[pinned][visuallyselected]:not([busy]) .tab-icon-overlay { - transform: translateX(-9px) translateY(-2px) !important; - left: 0 !important; - } - /** Container Tab - Color line at icon's bottom *****************************/ .tab-context-line { display: none; @@ -428,27 +431,6 @@ border-bottom: 2px solid var(--identity-icon-color); } - /* None exist favicon & Pinned to select */ - .tabbrowser-tab:not([image]):not([pinned], [sharing], [crashed]):not([soundplaying], [muted], [activemedia-blocked]) .tab-content::before, - .tabbrowser-tab[pinned][visuallyselected]:not([busy]):not(:hover) .tab-content::before { - /* Box Model */ - content: ''; - display: block; - position: absolute !important; - transition: 0.2s !important; - transform: translateY(10px) !important; - - /* Shape */ - border-bottom: 2px solid var(--identity-icon-color); - width: 16px; - } - .tabbrowser-tab:not([image]):not([pinned], [sharing], [crashed]):not([soundplaying], [muted], [activemedia-blocked]) .tab-content::before { - transform: translateY(10px) !important; /* None exist favicon */ - } - .tabbrowser-tab[pinned][visuallyselected]:not([busy]):not(:hover) .tab-content::before { - transform: translateX(2.5px) translateY(10px) !important; /* Pinned to select */ - } - /* None exist favicon - With Sound */ .tabbrowser-tab:not([image]) .tab-icon-overlay:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked]) { box-sizing: content-box; @@ -543,12 +525,13 @@ /** Panel - Icons ***********************************************************/ /* Padding */ :root { - --arrowpanel-menublank-padding: calc(var(--arrowpanel-menuicon-padding) * 2 + 8px); - --arrowpanel-menuimageblank-padding: calc(var(--arrowpanel-menuitem-padding) - 2px); + --arrowpanel-menublank-padding: calc(var(--arrowpanel-menuicon-padding) * 2 + 8px) !important; + --arrowpanel-menuimageblank-padding: calc(var(--arrowpanel-menuitem-padding) - 2px) !important; } + #downloadsHistory .button-text, .subviewbutton > .toolbarbutton-text { - padding-inline-start: var(--arrowpanel-menuicon-padding); + padding-inline-start: var(--arrowpanel-menuicon-padding) !important; } #panelMenu_bookmarksMenu .subviewbutton[disabled=true] .toolbarbutton-text, #appMenu_historyMenu .subviewbutton[disabled=true] .toolbarbutton-text { @@ -562,11 +545,11 @@ #appMenu-proton-update-banner::before { display: -moz-inline-box; margin-inline-end: var(--arrowpanel-menuicon-padding); - width: 16px; - height: 16px; + width: 16px !important; + height: 16px !important; } #appMenu-proton-update-banner { - margin-bottom: 2px; + margin-bottom: 2px !important; } #appMenu-proton-update-banner::before { margin-inline-start: var(--arrowpanel-menuitem-padding) !important; @@ -577,17 +560,27 @@ padding-top: var(--arrowpanel-menuimageblank-padding) !important; padding-bottom: var(--arrowpanel-menuimageblank-padding) !important; } + #appMenu-zoom-controls2::before { + margin-inline-end: 0 !important; + } /* Icons Color */ #appMenu-multiView .subviewbutton::before, #appMenu-proton-update-banner::before, + #downloadsHistory .button-icon, .subviewbutton > image { - fill: currentColor; - fill-opacity: var(--toolbarbutton-icon-fill-opacity); - -moz-context-properties: fill; + fill: currentColor !important; + fill-opacity: var(--toolbarbutton-icon-fill-opacity) !important; + -moz-context-properties: fill !important; } /* Panel - Main */ + #appMenu-proton-addon-banners > .addon-banner-item > .toolbarbutton-icon { + display: -moz-inline-box !important; + margin-inline-start: var(--arrowpanel-menuicon-padding); + -moz-box-ordinal-group: 0 !important; + } + #appMenu-proton-update-banner::before { content: url(chrome://browser/skin/whatsnew.svg); } @@ -600,6 +593,8 @@ #appMenu-fxa-status2[fxastatus=signedin] #appMenu-fxa-label2::before { /* url("https://profile.accounts.firefox.com/v1/avatar/a") */ content: ''; + border-radius: 50% !important; + background-size: 16px !important; background-image: var(--avatar-image-url) !important; } @@ -783,23 +778,23 @@ #appmenu-developer-tools-view .subviewbutton:nth-child(5) { /* Browser Content Toolbaox - */ list-style-image: url(./icons/command-frames.svg); } - #appmenu-developer-tools-view .subviewbutton:nth-child(6) { /* Browser Console */ + #appmenu-developer-tools-view .subviewbutton:nth-last-child(5) { /* Browser Console */ list-style-image: url(chrome://devtools/skin/images/command-console.svg); } - #appmenu-developer-tools-view .subviewbutton:nth-child(7) { /* Responsive Design Mode */ + #appmenu-developer-tools-view .subviewbutton:nth-last-child(4) { /* Responsive Design Mode */ list-style-image: url(./icons/command-responsivemode.svg); } - #appmenu-developer-tools-view .subviewbutton:nth-child(8) { /* Eyedropper */ + #appmenu-developer-tools-view .subviewbutton:nth-last-child(3) { /* Eyedropper */ list-style-image: url(chrome://devtools/skin/images/command-eyedropper.svg); } - #appmenu-developer-tools-view .subviewbutton:nth-child(9) { /* Page Source - Edge file-search.svg */ + #appmenu-developer-tools-view .subviewbutton:nth-last-child(2) { /* Page Source - Edge file-search.svg */ list-style-image: url(./icons/search-file.svg); } - #appmenu-developer-tools-view .subviewbutton:nth-child(10) { /* Extensions for Devel */ + #appmenu-developer-tools-view .subviewbutton:nth-last-child(1) { /* Extensions for Devel */ list-style-image: url(chrome://devtools/skin/images/debugging-addons.svg); } #appmenu-developer-tools-view .subviewbutton:last-child { - margin-bottom: 6px; + margin-bottom: 6px !important; } /* Panel - Help */ @@ -836,6 +831,11 @@ list-style-image: url(chrome://browser/skin/downloads/downloads.svg); } + /* Panel - Downloads */ + #downloadsHistory { + list-style-image: url(chrome://browser/skin/downloads/downloads.svg); + } + /* Toolbar - Overflow Menu */ #overflowMenu-customize-button { list-style-image: url(chrome://browser/skin/customize.svg);