CodeMirror/uMatrix
1
0
Fork 0
mirror of https://github.com/gorhill/uMatrix.git synced 2024-05-03 20:03:27 +12:00
Code Issues Releases Wiki Activity

fix https://github.com/uBlockOrigin/uMatrix-issues/issues/70

Browse source
This commit is contained in:
Raymond Hill 2018-10-06 09:04:37 -04:00
parent b822ae72d9
commit 495dddc389
No known key found for this signature in database
GPG key ID: 25E1490B761470C2
5 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/css/common.css
View file

@ -44,12 +44,14 @@ body[dir="rtl"] {
color: black;
content: attr(data-tip);
font: 12px sans-serif;
left: -10vw;
line-height: 140%;
min-width: 25vw;
opacity: 1;
padding: 4px 6px;
pointer-events: none;
position: absolute;
right: 10vw;
text-align: start;
top: 110%;
-webkit-transition: opacity 0.15s 0.5s;
@ -59,11 +61,13 @@ body[dir="rtl"] {
}
body[dir="ltr"] .tip-anchor-left[data-i18n-tip]:hover::after,
body[dir="rtl"] .tip-anchor-right[data-i18n-tip]:hover::after {
left: -3vw;
left: 0;
right: unset;
}
body[dir="ltr"] .tip-anchor-right[data-i18n-tip]:hover::after,
body[dir="rtl"] .tip-anchor-left[data-i18n-tip]:hover::after {
right: -3vw;
left: unset;
right: 0;
}
body.noTooltips *[data-i18n-tip]::after {
display: none;

2
src/css/logger-ui.css
View file

@ -53,7 +53,6 @@ body {
overflow: hidden;
position: fixed;
right: 0;
/*top: 0;*/
z-index: 2000;
}
body.popupPanelOn #popupPanelContainer {
@ -68,6 +67,7 @@ body.popupPanelOn #popupPanelContainer {
border: 0;
padding: 0;
margin: 0;
overflow: hidden;
width: 100%;
}
#popupPanelContainer.hide > iframe {

7
src/js/logger-ui.js
View file

@ -687,9 +687,10 @@ var popupPanel = (function() {
popupObserver.disconnect();
}
popup.setAttribute('src', 'popup.html?tabId=' + tabId);
if ( popup.parentNode === null ) {
container.appendChild(popup);
}
if ( popup.parentNode !== null ) { return; }
let rect = document.getElementById('toolbar').getBoundingClientRect();
container.style.top = rect.height + 'px';
container.appendChild(popup);
};
let stop = function() {

10
src/popup.html
View file

@ -19,14 +19,14 @@
<div class="toolbar">
<span class="scope" id="specificScope"><span>&nbsp;</span></span><!--
--><span class="scope" id="globalScope" data-scope="*" data-i18n-tip="matrixGlobalScopeTip"><span><span>&#x2217;</span></span></span>
<span id="mtxSwitch_matrix-off" class="fa-icon fa-icon-badged scopeRel tip-anchor-left" data-i18n-tip="matrixMtxButtonTip">power-off</span>
<span id="mtxSwitch_matrix-off" class="fa-icon fa-icon-badged scopeRel" data-i18n-tip="matrixMtxButtonTip">power-off</span>
<span id="buttonMtxSwitches" class="fa-icon fa-icon-badged scopeRel" tabindex="-1" data-dropdown-menu="dropDownMenuSwitches">ellipsis-v</span>
<span id="buttonRecipes" class="fa-icon fa-icon-badged scopeRel tip-anchor-right" data-dropdown-menu="dropDownMenuRecipes">puzzle-piece</span>
<span id="buttonPersist" class="fa-icon fa-icon-badged scopeRel tip-anchor-left" data-i18n-tip="matrixPersistButtonTip">lock</span>
<span id="buttonRevertScope" class="fa-icon fa-icon-badged scopeRel tip-anchor-left" data-i18n-tip="matrixRevertButtonTip">reply</span>
<span id="buttonRecipes" class="fa-icon fa-icon-badged scopeRel" data-dropdown-menu="dropDownMenuRecipes">puzzle-piece</span>
<span id="buttonPersist" class="fa-icon fa-icon-badged scopeRel" data-i18n-tip="matrixPersistButtonTip">lock</span>
<span id="buttonRevertScope" class="fa-icon fa-icon-badged scopeRel" data-i18n-tip="matrixRevertButtonTip">reply</span>
</div>
<div class="toolbar">
<span id="buttonReload" class="fa-icon tip-anchor-left" data-i18n-tip="matrixReloadButton">sync-alt</span>
<span id="buttonReload" class="fa-icon tip-anchor-right" data-i18n-tip="matrixReloadButton">sync-alt</span>
</div>
<div class="toolbar">
<span id="buttonRevertAll" class="fa-icon tip-anchor-right" data-i18n-tip="matrixRevertAllEntry">reply-all</span>

13
tools/make-firefox-meta.py
View file

@ -20,16 +20,9 @@ webext_manifest_file = os.path.join(build_dir, 'manifest.json')
with open(webext_manifest_file) as f:
webext_manifest = json.load(f)
match = re.search('^(\d+\.\d+\.\d+)(\.\d+)$', version)
if match:
buildtype = int(match.group(2)[1:])
if buildtype < 100:
builttype = 'b' + str(buildtype)
else:
builttype = 'rc' + str(buildtype - 100)
webext_manifest['version'] = match.group(1) + builttype
else:
webext_manifest['version'] = version
webext_manifest['version'] = version
match = re.search('^\d+\.\d+\.\d+(b|rc)', version)
if not match:
# https://bugzilla.mozilla.org/show_bug.cgi?id=1459007
# By design Firefox opens the sidebar with new installation of
# uMatrix when sidebar_action is present in the manifest.