Browse Source
Merge pull request #3 from geekprojects/xofe-minor-fixes-3
Xofe minor fixes 3
pull/4/head
Ian Parker
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with
15 additions and
7 deletions
-
src/css/fa-icons.css
-
src/css/popup.css
-
src/hosts-files.html
-
src/js/matrix.js
-
src/js/popup.js
-
tools/make-chromium.sh
-
tools/make-firefox.sh
-
tools/make-opera.sh
|
|
@ -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; |
|
|
|
|
|
@ -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; |
|
|
|
|
|
@ -55,7 +55,7 @@ |
|
|
|
--><a class="fa-icon mustread" href="" target="_blank">info-circle</a>​<!-- |
|
|
|
--><span class="fa-icon status unsecure" title="http">unlock</span>​<!-- |
|
|
|
--><span class="counts dim status"></span>​<!-- |
|
|
|
--><span class="fa-icon status obsolete" title="hostsFilesExternalListObsolete">exclamation-triangle</span>​<!-- |
|
|
|
--><span class="fa-icon status obsolete" data-i18n-title="hostsFilesExternalListObsolete">exclamation-triangle</span>​<!-- |
|
|
|
--><span class="fa-icon status cache">clock</span>​<!-- |
|
|
|
--><span class="fa-icon status updating">spinner</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
|
|
|
|
|
|
|
|
// 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; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -1327,6 +1327,7 @@ const gotoExtensionURL = function(ev) { |
|
|
|
what: 'gotoExtensionURL', |
|
|
|
url, |
|
|
|
select: true, |
|
|
|
index: -1, |
|
|
|
shiftKey: ev.shiftKey, |
|
|
|
}); |
|
|
|
dropDownMenuHide(); |
|
|
|
|
|
@ -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..." |
|
|
|
|
|
@ -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..." |
|
|
|
|
|
@ -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." |