diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 36e2922..e5e788e 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -20,12 +20,14 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + with: + # Make sure the actual branch is checked out when running on pull requests + ref: ${{ github.head_ref }} - name: Prettify code - uses: creyD/prettier_action@v3.3 + uses: creyD/prettier_action@v4.1.1 with: # This part is also where you can pass other options, for example: prettier_options: --write . + only_changed: True commit_message: "Clean: Prettified Code!" - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.org b/README.org index aeeef0d..7f2ed00 100644 --- a/README.org +++ b/README.org @@ -97,7 +97,7 @@ bash -c "$(curl -fsSL https://raw.githubusercontent.com/black7375/Firefox-UI-Fix/master/install.sh)" #+END_SRC - Windows users: Run powershell as administrator + Windows users: Run with powershell #+BEGIN_SRC powershell Powershell -c "Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iwr https://raw.githubusercontent.com/black7375/Firefox-UI-Fix/master/install.ps1 -useb | iex" #+END_SRC @@ -167,7 +167,8 @@ Please follow the [[https://github.com/black7375/Firefox-UI-Fix/wiki/Installation-Guide][Installation Guide]], \\ or set =about:config='s =svg.context-properties.content.enabled= to =true= . - - *Some panel menu items doesn't show* \\ + - *The closed button and some panel menu icons are not visible.* \\ + [[https://user-images.githubusercontent.com/77958663/130395848-7af58241-bbbf-4273-bb62-14382c44098d.png]] [[https://user-images.githubusercontent.com/25581533/120487528-93b40200-c3a5-11eb-98ad-3498beb9f38e.png]] Please follow the [[https://github.com/black7375/Firefox-UI-Fix/wiki/Installation-Guide][Installation Guide]], \\ @@ -178,5 +179,5 @@ [[https://user-images.githubusercontent.com/25581533/123761424-5746c980-d8b1-11eb-9a0f-83fb305f9f08.png]] [[https://user-images.githubusercontent.com/25581533/123762962-d4bf0980-d8b2-11eb-8492-d497d330c72a.png]] - I didn't put all the icons like before.\\ - [[https://user-images.githubusercontent.com/25581533/123602947-dd4b0d80-d7e8-11eb-93a6-2b263bdd99f7.png]] + I didn't put all the icons like before.\\ + [[https://user-images.githubusercontent.com/25581533/123602947-dd4b0d80-d7e8-11eb-93a6-2b263bdd99f7.png]] diff --git a/install.sh b/install.sh index e44ec9c..0b0b3eb 100755 --- a/install.sh +++ b/install.sh @@ -336,9 +336,12 @@ multiselect() { #== Profile Dir ================================================================ firefoxProfileDirPaths=( "${HOME}/.mozilla/firefox" - "${HOME}/.var/app/org.mozilla.firefox/.mozilla/firefox" - "${HOME}/.firedragon/" "${HOME}/.librewolf/" + "${HOME}/.firedragon/" + "${HOME}/.var/app/org.mozilla.firefox/.mozilla/firefox" + "${HOME}/snap/firefox/common/.mozilla/firefox" + "${HOME}/snap/firefox/common/.librewolf/" + "${HOME}/snap/firefox/common/.firedragon/" "${HOME}/Library/Application Support/Firefox" "${HOME}/Library/Application Support/LibreWolf" ) diff --git a/userChrome.css b/userChrome.css index 6c8f32c..ba447d8 100644 --- a/userChrome.css +++ b/userChrome.css @@ -34,6 +34,11 @@ border-radius: 4px; } +/*= Remote Tabs Panel's Bottom Padding =======================================*/ +#PanelUI-remotetabs #PanelUI-remotetabs-main { + margin-bottom: 6px; +} + /*= Identity Popup Icon Crop =================================================*/ .identity-popup-security-connection.identity-button { padding-block: 1px !important; @@ -92,9 +97,7 @@ menu[disabled="true"] { } } :root[lwtheme-image] #navigator-toolbox:-moz-lwtheme { - background-image: var( - --lwt-additional-images - ) !important; /* Original: var(--lwt-header-image), var(--lwt-additional-images); */ + background-image: var(--lwt-header-image), var(--lwt-additional-images) !important; background-repeat: var(--lwt-background-tiling) !important; background-position: var(--lwt-background-alignment) !important; background-color: unset !important; /* Original: var(--lwt-accent-color) */ @@ -800,6 +803,9 @@ menu[disabled="true"] { --button-active-bgcolor: var(--mac-hover-bgcolor); --toolbarbutton-hover-background: var(--mac-hover-bgcolor); --toolbarbutton-active-background: var(--mac-hover-bgcolor); + + /* Prevent transparent tabbar at fullscreen hover #312 */ + background: var(--mac-bgcolor); } :root[lwt-default-theme-in-dark-mode] #urlbar { @@ -922,9 +928,9 @@ menu[disabled="true"] { --in-content-button-vertical-padding: 7px; --in-content-table-background: #f8f8fa; - --in-content-table-border-dark-color: #d1d1d1; - --in-content-table-header-background: #0a84ff; - --in-content-table-header-color: #ffffff; + --in-content-table-border-color: var(--in-content-box-border-color); /* Legacy: #d1d1d1; rgba(249, 249, 250, 0.2) */ + --in-content-table-header-background: var(--in-content-primary-button-background); /* Legacy: #0a84ff; rgb(5, 64, 150); */ + --in-content-table-header-color: var(--in-content-primary-button-text-color); /* Legacy: #ffffff; var(--in-content-page-color); */ --in-content-sidebar-width: 240px; --dialog-warning-text-color: var(--red-60); @@ -1011,9 +1017,7 @@ menu[disabled="true"] { --in-content-danger-button-background-active: #ffdfe7; --in-content-table-background: rgb(35, 34, 43); - --in-content-table-border-dark-color: rgba(249, 249, 250, 0.2); - --in-content-table-header-background: rgb(5, 64, 150); - --in-content-table-header-color: var(--in-content-page-color); + --in-content-table-border-dark-color: var(--in-content-box-border-color); --in-content-accent-color: var(--in-content-primary-button-background); --in-content-accent-color-active: var(--in-content-primary-button-background-hover); @@ -1738,7 +1742,7 @@ browser[type="content"] > html { border-bottom-left-radius: 0 !important; border-bottom-right-radius: 0 !important; padding-bottom: 1px !important; - box-shadow: inset 0 -1px var(--in-content-border-color) !important; + box-shadow: inset 0 -1px var(--in-content-table-border-color) !important; overflow: clip !important; /* Clip border-radius */ } @@ -1875,11 +1879,8 @@ browser[type="content"] > html { /*= Delete Cert ==============================================================*/ @-moz-document url("chrome://pippki/content/deletecert.xhtml") { - :root { - --in-content-border-color: color-mix(in srgb, currentColor 41%, transparent) !important; - } #certlist { - border: 1px solid var(--in-content-border-color) !important; + border: 1px solid var(--in-content-table-border-color) !important; border-radius: 4px !important; } } @@ -1887,9 +1888,6 @@ browser[type="content"] > html { /*= Cert Exeption Dialog =====================================================*/ @-moz-document url("chrome://pippki/content/exceptionDialog.xhtml") { - :root { - --in-content-border-color: color-mix(in srgb, currentColor 41%, transparent) !important; - } #locationTextBox { appearance: none !important; border: 1px solid var(--in-content-box-border-color) !important; @@ -2015,7 +2013,7 @@ browser[type="content"] > html { -moz-appearance: none !important; color: var(--in-content-table-header-color) !important; background: var(--in-content-table-header-background) !important; - border: 1px solid var(--in-content-border-color) !important; + border: 1px solid var(--in-content-table-border-color) !important; padding: 4px !important; border-spacing: 0; @@ -2027,7 +2025,7 @@ browser[type="content"] > html { -moz-appearance: none !important; color: var(--in-content-text-color) !important; background-color: var(--in-content-table-background) !important; - border: 1px solid var(--in-content-border-color) !important; + border: 1px solid var(--in-content-table-border-color) !important; } treechildren::-moz-tree-row(odd) { @@ -2043,7 +2041,7 @@ browser[type="content"] > html { } treechildren::-moz-tree-cell { - border-inline: 1px solid var(--in-content-border-color) !important; + border-inline: 1px solid var(--in-content-table-border-color) !important; border-spacing: 0 !important; padding: 4px !important; margin: 0 !important; @@ -2074,7 +2072,7 @@ browser[type="content"] > html { #topBar, #imagecontainerbox, #permList { - border-color: var(--in-content-border-color) !important; + border-color: var(--in-content-table-border-color) !important; } } diff --git a/userContent.css b/userContent.css index d181982..692e61d 100644 --- a/userContent.css +++ b/userContent.css @@ -315,9 +315,9 @@ --in-content-button-vertical-padding: 7px; --in-content-table-background: #f8f8fa; - --in-content-table-border-dark-color: #d1d1d1; - --in-content-table-header-background: #0a84ff; - --in-content-table-header-color: #ffffff; + --in-content-table-border-color: var(--in-content-box-border-color); /* Legacy: #d1d1d1; rgba(249, 249, 250, 0.2) */ + --in-content-table-header-background: var(--in-content-primary-button-background); /* Legacy: #0a84ff; rgb(5, 64, 150); */ + --in-content-table-header-color: var(--in-content-primary-button-text-color); /* Legacy: #ffffff; var(--in-content-page-color); */ --in-content-sidebar-width: 240px; --dialog-warning-text-color: var(--red-60); @@ -405,9 +405,7 @@ --in-content-danger-button-background-active: #ffdfe7; --in-content-table-background: rgb(35, 34, 43); - --in-content-table-border-dark-color: rgba(249, 249, 250, 0.2); - --in-content-table-header-background: rgb(5, 64, 150); - --in-content-table-header-color: var(--in-content-page-color); + --in-content-table-border-dark-color: var(--in-content-box-border-color); --in-content-accent-color: var(--in-content-primary-button-background); --in-content-accent-color-active: var(--in-content-primary-button-background-hover); @@ -1203,7 +1201,7 @@ url-prefix("about:cache"), url-prefix("about:checkerboard") { table { - border: 1px solid var(--in-content-border-color) !important; + border: 1px solid var(--in-content-table-border-color) !important; border-radius: 0 !important; } } @@ -1211,7 +1209,7 @@ url-prefix("about:checkerboard") { th, td { - border: 1px solid var(--in-content-border-color) !important; + border: 1px solid var(--in-content-table-border-color) !important; } th { background-color: var(--in-content-table-header-background) !important;