diff --git a/chrome/.github/workflows/ESR_VERSION b/chrome/.github/workflows/ESR_VERSION new file mode 100644 index 0000000..2702ba3 --- /dev/null +++ b/chrome/.github/workflows/ESR_VERSION @@ -0,0 +1 @@ +115 \ No newline at end of file diff --git a/chrome/.github/workflows/create_relnotes.py b/chrome/.github/workflows/create_relnotes.py new file mode 100644 index 0000000..bce0e15 --- /dev/null +++ b/chrome/.github/workflows/create_relnotes.py @@ -0,0 +1,41 @@ +'''# zapsCoolPhotonTheme for Firefox 126 and Firefox 115.11esr +`zapsCoolPhotonTheme-v126.zip` is for Firefox 126. +`zapsCoolPhotonTheme-115esr.zip` is for Firefox 115esr. + +### Changes +* Add `uc.always-show-close-button` which always shows the tab close button even when overflowing.(#3) +* The sidebar should now respect your color theme. (#4) +* Search bar has now been photonized. +* Padding adjustements and fixes. +* Other fixes for Firefox 127. +____ + +Corresponding Webextension Version: [v0.0.0](https://github.com/zapSNH/zcpt-webextension/releases/tag/v0.0.0) + +____ +**Full Changelog**: https://github.com/zapSNH/zapsCoolPhotonTheme/compare/v125...v126''' +import sys + +def create_relnotes(ver_v): + current_esr = open(".github/workflows/ESR_VERSION", 'r').read() + ver = ver_v.replace("v", "") + ver_string = "v" + str(int(ver)-1) + "...v" + ver + notes = \ +f'''# zapsCoolPhotonTheme for Firefox {ver} and Firefox {current_esr}esr +`zapsCoolPhotonTheme-v{ver}.zip` is for Firefox {ver}. +`zapsCoolPhotonTheme-v{ver}-esr.zip` is for Firefox {current_esr}esr. + +### Changes +* TBA +____ + +Corresponding Webextension Version: [v0.0.0](https://github.com/zapSNH/zcpt-webextension/releases/tag/v0.0.0) + +____ +**Full Changelog**: https://github.com/zapSNH/zapsCoolPhotonTheme/compare/{ver_string}''' + f = open('relnotes.md', 'w') + f.write(notes) + f.close() + +if __name__ == '__main__': + globals()[sys.argv[1]](sys.argv[2]) \ No newline at end of file diff --git a/chrome/.github/workflows/release.yml b/chrome/.github/workflows/release.yml new file mode 100644 index 0000000..a2b46b8 --- /dev/null +++ b/chrome/.github/workflows/release.yml @@ -0,0 +1,57 @@ +on: + push: + tags: + - "v*" + +jobs: + release: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: check current esr version + id: getesr + run: | + echo "version=$(cat ./.github/workflows/ESR_VERSION)" >> $GITHUB_OUTPUT + + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + ref: ${{ steps.getesr.outputs.version }}esr + + - name: add gh bot creds + run: | + git config user.name 'github-actions[bot]' + git config user.email 'github-actions[bot]@users.noreply.github.com' + + - name: zip files & stash + run: | + rm -rf ./.github + zip -r -FS zapsCoolPhotonTheme-${{ github.ref_name }}-esr.zip * + git add zapsCoolPhotonTheme-${{ github.ref_name }}-esr.zip + git stash push zapsCoolPhotonTheme-${{ github.ref_name }}-esr.zip + + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + ref: main + + - name: release notes + run: | + python3 .github/workflows/create_relnotes.py create_relnotes ${{ github.ref_name }} + + - name: zip files + run: | + rm -rf ./.github + zip -r -FS zapsCoolPhotonTheme-${{ github.ref_name }}.zip * + git stash pop + + - name: release + uses: softprops/action-gh-release@v2 + env: + GITHUB_TOKEN: ${{ secrets.TOKEN }} + with: + body_path: relnotes.md + files: | + zapsCoolPhotonTheme-${{ github.ref_name }}.zip + zapsCoolPhotonTheme-${{ github.ref_name }}-esr.zip diff --git a/chrome/resources/content.css b/chrome/resources/content.css index 500f477..47449a5 100644 --- a/chrome/resources/content.css +++ b/chrome/resources/content.css @@ -292,6 +292,16 @@ content: url(./icons/forks/waterfox/waterfox-grayscale.svg) !important; } } + @media (-moz-bool-pref: "uc.librewolf") { + img[src="chrome://devtools/skin/images/aboutdebugging-firefox-logo.svg"] { + content: url(./icons/forks/librewolf/librewolf-grayscale.svg) !important; + } + } + @media (-moz-bool-pref: "uc.tor") { + img[src="chrome://devtools/skin/images/aboutdebugging-firefox-logo.svg"] { + content: url(./icons/forks/tor/tor-grayscale.svg) !important; + } + } } @-moz-document url("about:privatebrowsing") { * { diff --git a/chrome/resources/icons.css b/chrome/resources/icons.css index 57e1536..119a202 100644 --- a/chrome/resources/icons.css +++ b/chrome/resources/icons.css @@ -11,10 +11,11 @@ @media (-moz-bool-pref: "uc.waterfox") { --grayscale-logo: url(./icons/forks/waterfox/waterfox-grayscale.svg) !important; } - /* TODO: LibreWolf and Tor Browser icons */ @media (-moz-bool-pref: "uc.librewolf") { + --grayscale-logo: url(./icons/forks/librewolf/librewolf-grayscale.svg) !important; } @media (-moz-bool-pref: "uc.tor") { + --grayscale-logo: url(./icons/forks/tor/tor-grayscale.svg) !important; } } * { @@ -844,6 +845,9 @@ .urlbarView-favicon[src="chrome://global/skin/icons/clipboard.svg"] { content: url(./icons/edit-paste.svg) !important; } +.urlbarView-favicon[src="chrome://global/skin/icons/trending.svg"] { + content: url(./icons/trending.svg) !important; +} #translations-button-locale { margin: 0px !important; } diff --git a/chrome/resources/icons/forks/librewolf/librewolf-grayscale.svg b/chrome/resources/icons/forks/librewolf/librewolf-grayscale.svg new file mode 100644 index 0000000..b16adef --- /dev/null +++ b/chrome/resources/icons/forks/librewolf/librewolf-grayscale.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/chrome/resources/icons/forks/tor/tor-grayscale.svg b/chrome/resources/icons/forks/tor/tor-grayscale.svg new file mode 100644 index 0000000..7094723 --- /dev/null +++ b/chrome/resources/icons/forks/tor/tor-grayscale.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/chrome/resources/icons/trending.svg b/chrome/resources/icons/trending.svg new file mode 100644 index 0000000..e2dd85d --- /dev/null +++ b/chrome/resources/icons/trending.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/chrome/resources/tabs-and-urlbar.css b/chrome/resources/tabs-and-urlbar.css index a9ef172..95adc8b 100644 --- a/chrome/resources/tabs-and-urlbar.css +++ b/chrome/resources/tabs-and-urlbar.css @@ -505,22 +505,22 @@ tabs[closebuttons^="activetab"] tab:not([visuallyselected]) .tab-icon-stack { :root:not([uidensity="touch"]) #urlbar[breakout-extend="true"] { translate: 0 1px !important; } -#urlbar-input-container { +.urlbar-input-container { margin-top: -1px !important; } -:root[uidensity="touch"] #urlbar-input-container { +:root[uidensity="touch"] .urlbar-input-container { margin-top: 0px !important; } -#urlbar:not([breakout-extend="true"]) #urlbar-input-container { +#urlbar:not([breakout-extend="true"]) .urlbar-input-container { padding-inline: 0 !important; } -#urlbar[breakout-extend="true"] #urlbar-input-container { +#urlbar[breakout-extend="true"] .urlbar-input-container { padding-right: 5px !important; } -#urlbar-input-container { +.urlbar-input-container { padding-left: 5px !important; } -:root:is([sizemode="maximized"], [sizemode="fullscreen"]) #urlbar-input-container { +:root:is([sizemode="maximized"], [sizemode="fullscreen"]) .urlbar-input-container { padding-right: 5px !important; } .urlbarView-favicon { @@ -592,7 +592,7 @@ tabs[closebuttons^="activetab"] tab:not([visuallyselected]) .tab-icon-stack { :root[uidensity="compact"] .urlbar-page-action image { translate: 2px !important; } -:root[uidensity="compact"] #urlbar-input-container { +:root[uidensity="compact"] .urlbar-input-container { height: calc(var(--urlbar-height) + 2px) !important; } /* touch */ @@ -647,10 +647,10 @@ tabs[closebuttons^="activetab"] tab:not([visuallyselected]) .tab-icon-stack { } /* Megabar */ @media not ((-moz-bool-pref: "uc.reduced-megabar") or (-moz-bool-pref: "uc.no-megabar")) { - #urlbar[focused="true"]:not([breakout][breakout-extend]) { + #urlbar[focused=""]:not([breakout][breakout-extend]) { z-index: 3; } - #urlbar[focused="true"]:not([breakout][breakout-extend]) #urlbar-background { + #urlbar[focused=""]:not([breakout][breakout-extend]) #urlbar-background { margin-inline: -8px !important; margin-block: -7px !important; height: calc(var(--urlbar-height) + 14px) !important; @@ -662,7 +662,7 @@ tabs[closebuttons^="activetab"] tab:not([visuallyselected]) .tab-icon-stack { padding: 3px !important; margin-top: -3px !important; } - :root[uidensity="compact"] #urlbar[focused="true"]:not([breakout][breakout-extend]) #urlbar-background { + :root[uidensity="compact"] #urlbar[focused=""]:not([breakout][breakout-extend]) #urlbar-background { margin-inline: -7px !important; margin-block: -4px !important; height: calc(var(--urlbar-height) + 8px) !important; @@ -675,7 +675,7 @@ tabs[closebuttons^="activetab"] tab:not([visuallyselected]) .tab-icon-stack { padding-block-start: 4px !important; margin-top: -2px !important; } - :root[uidensity="touch"] #urlbar[focused="true"]:not([breakout][breakout-extend]) #urlbar-background { + :root[uidensity="touch"] #urlbar[focused=""]:not([breakout][breakout-extend]) #urlbar-background { margin-inline: -7px !important; margin-block: -6px !important; height: calc(var(--urlbar-height) + 12px) !important; @@ -687,7 +687,7 @@ tabs[closebuttons^="activetab"] tab:not([visuallyselected]) .tab-icon-stack { padding: 2px !important; margin-top: -2px !important; } - #nav-bar:has(#urlbar[focused="true"]:not([breakout][breakout-extend])) { + #nav-bar:has(#urlbar[focused=""]:not([breakout][breakout-extend])) { overflow: visible !important; } #urlbar[breakout-extend="true"] #urlbar-background { @@ -695,16 +695,16 @@ tabs[closebuttons^="activetab"] tab:not([visuallyselected]) .tab-icon-stack { } } @media (-moz-bool-pref: "uc.reduced-megabar") { - #urlbar[focused="true"]:not([breakout][breakout-extend]) #urlbar-background { + #urlbar[focused=""]:not([breakout][breakout-extend]) #urlbar-background { border: 1px solid var(--photon-accent-dark) !important; outline: none !important; } - :root[uidensity="compact"] #urlbar[breakout][breakout-extend="true"] #urlbar-input-container { + :root[uidensity="compact"] #urlbar[breakout][breakout-extend="true"] .urlbar-input-container { margin-top: -3px !important; } } @media (-moz-bool-pref: "uc.no-megabar") { - #urlbar[focused="true"]:not([breakout][breakout-extend]) #urlbar-background { + #urlbar[focused=""]:not([breakout][breakout-extend]) #urlbar-background { border: 1px solid var(--photon-accent-dark) !important; outline: none !important; } @@ -720,7 +720,7 @@ tabs[closebuttons^="activetab"] tab:not([visuallyselected]) .tab-icon-stack { margin-top: 4px !important; } } - :root[uidensity="compact"] #urlbar[breakout][breakout-extend="true"] #urlbar-input-container { + :root[uidensity="compact"] #urlbar[breakout][breakout-extend="true"] .urlbar-input-container { margin-top: -3px !important; } #urlbar .urlbarView { diff --git a/custom/resources/version.css b/custom/resources/version.css index 0f8673e..e6e5085 100644 --- a/custom/resources/version.css +++ b/custom/resources/version.css @@ -12,7 +12,7 @@ background-position: 4px 0; -moz-context-properties: fill; fill: currentColor; - content: "zapsCoolPhotonTheme v0.23.25 (webextension)"; + content: "zapsCoolPhotonTheme v0.23.26 (webextension)"; position: absolute; height: 48px; overflow: visible; diff --git a/manifest.json b/manifest.json index ab1a182..cb098ad 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "name": "__MSG_extensionName__", "short_name": "__MSG_extensionShortName__", "homepage_url": "https://github.com/zapSNH/zapsCoolPhotonTheme", - "version": "0.23.25.1", + "version": "0.23.26.1", "author": "zapsnh", "default_locale": "en", "description": "__MSG_extensionDescription__", diff --git a/updates.json b/updates.json index e715b08..fe63943 100644 --- a/updates.json +++ b/updates.json @@ -3,8 +3,8 @@ "coolPhotonTheme@zapsnh": { "updates": [ { - "version": "0.23.25", - "update_link": "https://github.com/zapSNH/zcpt-webextension/releases/download/v0.23.25/zapsCoolPhotonTheme-esr.xpi", + "version": "0.23.26", + "update_link": "https://github.com/zapSNH/zcpt-webextension/releases/download/v0.23.26/zapsCoolPhotonTheme-esr.xpi", "applications": { "gecko": { "strict_min_version": "115.0", @@ -13,8 +13,8 @@ } }, { - "version": "0.23.25.1", - "update_link": "https://github.com/zapSNH/zcpt-webextension/releases/download/v0.23.25/zapsCoolPhotonTheme.xpi", + "version": "0.23.26.1", + "update_link": "https://github.com/zapSNH/zcpt-webextension/releases/download/v0.23.26/zapsCoolPhotonTheme.xpi", "applications": { "gecko": { "strict_min_version": "116.0"