diff --git a/src/css/fa-icons.css b/src/css/fa-icons.css index c195292..1974879 100644 --- a/src/css/fa-icons.css +++ b/src/css/fa-icons.css @@ -40,6 +40,9 @@ .fa-icon.disabled > .fa-icon-badge { display: none; } +.fa-icon.fa-icon-vflipped { + transform: scale(1, -1); + } .fa-icon > svg { height: 1em; diff --git a/src/css/popup.css b/src/css/popup.css index bdf3309..be6ccbd 100644 --- 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/src/hosts-files.html b/src/hosts-files.html index ec3a00a..65df472 100644 --- a/src/hosts-files.html +++ b/src/hosts-files.html @@ -55,7 +55,7 @@ -->info-circleunlockexclamation-triangleexclamation-triangleclockspinnerunlink diff --git a/src/js/matrix.js b/src/js/matrix.js index 7a19b68..3fafe52 100644 --- a/src/js/matrix.js +++ b/src/js/matrix.js @@ -388,7 +388,9 @@ Matrix.prototype.evaluateCellZ = function(srcHostname, desHostname, type) { // srcHostname is '*' at this point // Preset blacklisted hostnames are blacklisted in global scope - if ( type === '*' && µm.ubiquitousBlacklistRef.matches(desHostname) !== -1 ) { + // https://github.com/uBlockOrigin/uMatrix-issues/issues/284 + // Only consider hostname blocklisted if it's a full match. + if ( type === '*' && µm.ubiquitousBlacklistRef.matches(desHostname) === 0 ) { return 1; } diff --git a/src/js/popup.js b/src/js/popup.js index b4d8e3f..88239dc 100644 --- a/src/js/popup.js +++ b/src/js/popup.js @@ -1327,6 +1327,7 @@ const gotoExtensionURL = function(ev) { what: 'gotoExtensionURL', url, select: true, + index: -1, shiftKey: ev.shiftKey, }); dropDownMenuHide(); diff --git a/tools/make-chromium.sh b/tools/make-chromium.sh index e43a2fd..0f14f9e 100755 --- 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 index 1720977..2cdf981 100755 --- 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 "*** nuTensor.firefox: Generating meta..." -python tools/make-firefox-meta.py $DES/ +python3 tools/make-firefox-meta.py $DES/ if [ "$1" = all ]; then echo "*** nuTensor.firefox: Creating package..." diff --git a/tools/make-opera.sh b/tools/make-opera.sh index eec0c2b..ffdb71a 100755 --- 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."