Merge branch 'minor-fixes-3' of https://github.com/xofe/uMatrix into xofe-minor-fixes-3

xofe-minor-fixes-3
Ian Parker 4 years ago
commit e4fd3a0e93

@ -40,6 +40,9 @@
.fa-icon.disabled > .fa-icon-badge { .fa-icon.disabled > .fa-icon-badge {
display: none; display: none;
} }
.fa-icon.fa-icon-vflipped {
transform: scale(1, -1);
}
.fa-icon > svg { .fa-icon > svg {
height: 1em; height: 1em;

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

@ -55,7 +55,7 @@
--><a class="fa-icon mustread" href="" target="_blank">info-circle</a>&#8203;<!-- --><a class="fa-icon mustread" href="" target="_blank">info-circle</a>&#8203;<!--
--><span class="fa-icon status unsecure" title="http">unlock</span>&#8203;<!-- --><span class="fa-icon status unsecure" title="http">unlock</span>&#8203;<!--
--><span class="counts dim status"></span>&#8203;<!-- --><span class="counts dim status"></span>&#8203;<!--
--><span class="fa-icon status obsolete" title="hostsFilesExternalListObsolete">exclamation-triangle</span>&#8203;<!-- --><span class="fa-icon status obsolete" data-i18n-title="hostsFilesExternalListObsolete">exclamation-triangle</span>&#8203;<!--
--><span class="fa-icon status cache">clock</span>&#8203;<!-- --><span class="fa-icon status cache">clock</span>&#8203;<!--
--><span class="fa-icon status updating">spinner</span>&#8203;<!-- --><span class="fa-icon status updating">spinner</span>&#8203;<!--
--><span class="fa-icon status failed">unlink</span> --><span class="fa-icon status failed">unlink</span>

@ -388,7 +388,9 @@ Matrix.prototype.evaluateCellZ = function(srcHostname, desHostname, type) {
// srcHostname is '*' at this point // srcHostname is '*' at this point
// Preset blacklisted hostnames are blacklisted in global scope // 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; return 1;
} }

@ -1327,6 +1327,7 @@ const gotoExtensionURL = function(ev) {
what: 'gotoExtensionURL', what: 'gotoExtensionURL',
url, url,
select: true, select: true,
index: -1,
shiftKey: ev.shiftKey, shiftKey: ev.shiftKey,
}); });
dropDownMenuHide(); dropDownMenuHide();

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

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

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

Loading…
Cancel
Save