Merge pull request #1 from weMatrix/master

Fork begins
ssdef1q1 · Apr 7, 2023 · 92dfff1 · 92dfff1
2 parents 59d9183 + 30de1e9
commit 92dfff1
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,10 @@
-## uMatrix<br>[<img src="https://travis-ci.org/gorhill/uMatrix.svg?branch=master" height="16">](https://travis-ci.org/gorhill/uMatrix)
+## weMatrix
 
-Definitely for advanced users.
+A fork of the discontinued uMatrix browser extension.
+
+***
+
+The point of this fork is to steadily maintain uMatrix by fixing bugs and implementing modest feature requests.
 
 ***
 
@@ -10,7 +14,7 @@ Forked and refactored from [HTTP Switchboard](https://github.com/gorhill/httpswi
 
 Install [manually](https://github.com/gorhill/uMatrix/blob/master/doc/README.md) the [latest release](https://github.com/gorhill/uMatrix/releases), or install from:
 - [Firefox AMO](https://addons.mozilla.org/firefox/addon/umatrix/)
-    - To help find issues with ongoing development: [uMatrix dev build in _Releases_](https://github.com/gorhill/uMatrix/releases) (click the latest `uMatrix.webext.signed.xpi` link of the last pre-resease.)
+    - To help find issues with ongoing development: [uMatrix dev build in _Releases_](https://github.com/gorhill/uMatrix/releases) (click the latest `uMatrix.webext.signed.xpi` link of the last pre-release.)
 - [Chrome store](https://chrome.google.com/webstore/detail/µmatrix/ogfcmafjalglgifnmanfmnieipoejdcf)
     - To help find issues with ongoing development: [uMatrix dev build in Chrome store](https://chrome.google.com/webstore/detail/umatrix-dev-build/eckgcipdkhcfghnmincccnhpdmnbefki)
 - [Opera store](https://addons.opera.com/en-gb/extensions/details/umatrix/)

diff --git a/src/css/popup.css b/src/css/popup.css
@@ -347,10 +347,10 @@ body.tabless .needtab {
     text-align: left;
     }
 .matRow {
-    align-items: flex-start;
     display: flex;
     }
 .matCell {
+    align-items: center;
     box-sizing: content-box;
     display: inline-flex;
     flex-shrink: 0;
@@ -374,6 +374,7 @@ body.tabless .needtab {
     font-weight: 100;
     }
 .paneContent .matrix .matRow > .matCell:first-child > b {
+    display: contents;
     font-weight: normal;
     }
 
@@ -383,9 +384,10 @@ body.tabless .needtab {
     flex-grow: 1;
     flex-shrink: 1;
     justify-content: flex-end;
+    text-align: right;
     unicode-bidi: embed;
     width: 16em;
-    word-break: keep-all;
+    word-break: break-all;
     }
 .matrix .matGroup.g4 .matRow.ro > .matCell:first-child {
     direction: inherit;

diff --git a/tools/make-chromium.sh b/tools/make-chromium.sh
@@ -19,7 +19,7 @@ cp    ./platform/chromium/manifest.json $DES/
 cp    LICENSE.txt                       $DES/
 
 echo "*** uMatrix.chromium: Generating meta..."
-python tools/make-chromium-meta.py $DES/
+python3 tools/make-chromium-meta.py $DES/
 
 if [ "$1" = all ]; then
     echo "*** uMatrix.chromium: Creating package..."

diff --git a/tools/make-firefox.sh b/tools/make-firefox.sh
@@ -21,7 +21,7 @@ cp    platform/firefox/*.js                 $DES/js/
 cp    platform/firefox/manifest.json        $DES/
 
 echo "*** uMatrix.firefox: Generating meta..."
-python tools/make-firefox-meta.py           $DES/
+python3 tools/make-firefox-meta.py          $DES/
 
 if [ "$1" = all ]; then
     echo "*** uMatrix.firefox: Creating package..."

diff --git a/tools/make-opera.sh b/tools/make-opera.sh
@@ -34,6 +34,6 @@ cp -R ./src/_locales/tr    $DES/_locales/
 cp -R ./src/_locales/zh_TW $DES/_locales/
 
 echo "*** uMatrix.opera: Generating meta..."
-python tools/make-opera-meta.py         $DES/
+python3 tools/make-opera-meta.py        $DES/
 
 echo "*** uMatrix.opera: Package done."