Skip to content
This repository has been archived by the owner on Jul 21, 2021. It is now read-only.

Minor fixes #1015

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/css/fa-icons.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 4 additions & 2 deletions src/css/popup.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -374,6 +374,7 @@ body.tabless .needtab {
font-weight: 100;
}
.paneContent .matrix .matRow > .matCell:first-child > b {
display: contents;
font-weight: normal;
}

Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/hosts-files.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
--><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="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 updating">spinner</span>&#8203;<!--
 --><span class="fa-icon status failed">unlink</span>
Expand Down
4 changes: 3 additions & 1 deletion src/js/matrix.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
1 change: 1 addition & 0 deletions src/js/popup.js
Original file line number Diff line number Diff line change
Expand Up @@ -1327,6 +1327,7 @@ const gotoExtensionURL = function(ev) {
what: 'gotoExtensionURL',
url,
select: true,
index: -1,
shiftKey: ev.shiftKey,
});
dropDownMenuHide();
Expand Down
2 changes: 1 addition & 1 deletion tools/make-chromium.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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..."
Expand Down
2 changes: 1 addition & 1 deletion tools/make-firefox.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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..."
Expand Down
2 changes: 1 addition & 1 deletion tools/make-opera.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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."