diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json index c554648..c621379 100644 --- a/src/_locales/en/messages.json +++ b/src/_locales/en/messages.json @@ -91,6 +91,14 @@ "message": "No net traffic seen for this tab so far.", "description": "" }, + "matrixLocalScopeTip" : { + "message": "Select a local scope to see/create rules which apply only in that scope", + "description": "Tool tip for the local scope button" + }, + "matrixGlobalScopeTip" : { + "message": "Select the global scope to see/create rules which apply everywhere", + "description": "Tool tip for the global scope button" + }, "matrixMtxButtonTip" : { "message": "Disable/enable matrix filtering for this scope", "description": "Tool tip for matrix button" @@ -104,7 +112,7 @@ "description": "Tool tip for the revert local permission button" }, "matrixReloadButton" : { - "message": "Reload the page.\n Press Shift to bypass the browser cache.", + "message": "Reload the page. \nPress Shift to bypass the browser cache.", "description": "Tool tip for the reload button" }, "matrix1stPartyLabel" : { @@ -282,13 +290,9 @@ "message": "Text size:", "description": "" }, - "settingsMatrixDisplayTextSizeNormal" : { - "message": "Normal", - "description": "" - }, - "settingsMatrixDisplayTextSizeLarge" : { - "message": "Large", - "description": "" + "settingsIconBadgeEnabled":{ + "message":"Show the number of distinct requests on the icon", + "description":"" }, "settingsMatrixDisplayColorBlind" : { "message": "Color-blind friendly", @@ -342,10 +346,6 @@ "message": "Opacity", "description": "English: Opacity" }, - "settingsIconBadgeEnabled":{ - "message":"Show the number of distinct requests on the icon", - "description":"English: Show the number of distinct requests on the icon" - }, "settingsCollapseBlocked" : { "message": "Collapse placeholder of blocked elements", "description": "English: Collapse placeholder of blocked elements" @@ -362,6 +362,10 @@ "message": "Enable cloud storage support", "description": "" }, + "settingsMatrixNoTooltips" : { + "message": "Disable tooltips", + "description": "" + }, "privacyPageTitle" : { "message": "uMatrix – Privacy", @@ -516,7 +520,7 @@ "description":"" }, "hostsFilesExternalListsHint":{ - "message":"Import external assets here:\n One URL per line; invalid URLs will be silently ignored.", + "message":"Import external assets here: \nOne URL per line; invalid URLs will be silently ignored.", "description":"" }, "hostsFilesExternalListsParse":{ diff --git a/src/css/common.css b/src/css/common.css index 225aa30..c029bdd 100644 --- a/src/css/common.css +++ b/src/css/common.css @@ -43,11 +43,11 @@ body[dir="rtl"] { position: relative; cursor: pointer; } -*[data-i18n-tip]:after { +*[data-i18n-tip]::after { content: ""; opacity: 0; } -*[data-i18n-tip]:hover:after { +*[data-i18n-tip]:hover::after { background-color: #fffffa; border: 1px solid gray; border-radius: 3px; @@ -68,14 +68,18 @@ body[dir="rtl"] { white-space: pre-line; z-index: 20; } -body[dir="ltr"] .tip-anchor-left[data-i18n-tip]:hover:after, -body[dir="rtl"] .tip-anchor-right[data-i18n-tip]:hover:after { +body[dir="ltr"] .tip-anchor-left[data-i18n-tip]:hover::after, +body[dir="rtl"] .tip-anchor-right[data-i18n-tip]:hover::after { left: -3vw; } -body[dir="ltr"] .tip-anchor-right[data-i18n-tip]:hover:after, -body[dir="rtl"] .tip-anchor-left[data-i18n-tip]:hover:after { +body[dir="ltr"] .tip-anchor-right[data-i18n-tip]:hover::after, +body[dir="rtl"] .tip-anchor-left[data-i18n-tip]:hover::after { right: -3vw; } +body.noTooltips *[data-i18n-tip]::after { + display: none; + } + button.custom { padding: 0.6em 1em; border: 1px solid transparent; diff --git a/src/js/background.js b/src/js/background.js index d5d282e..97794b5 100644 --- a/src/js/background.js +++ b/src/js/background.js @@ -181,6 +181,7 @@ return { externalRecipeFiles: [], iconBadgeEnabled: false, maxLoggedRequests: 1000, + noTooltips: false, popupCollapseAllDomains: false, popupCollapseBlacklistedDomains: false, popupScopeLevel: 'domain', diff --git a/src/js/messaging.js b/src/js/messaging.js index df72435..94a51b9 100644 --- a/src/js/messaging.js +++ b/src/js/messaging.js @@ -196,6 +196,7 @@ var matrixSnapshot = function(pageStore, details) { userSettings: { colorBlindFriendly: µmuser.colorBlindFriendly, displayTextSize: µmuser.displayTextSize, + noTooltips: µmuser.noTooltips, popupScopeLevel: µmuser.popupScopeLevel } }; diff --git a/src/js/popup.js b/src/js/popup.js index 32a71b2..2382924 100644 --- a/src/js/popup.js +++ b/src/js/popup.js @@ -1,7 +1,7 @@ /******************************************************************************* uMatrix - a Chromium browser extension to black/white list requests. - Copyright (C) 2014-2017 Raymond Hill + Copyright (C) 2014-2018 Raymond Hill This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1070,11 +1070,15 @@ function initMenuEnvironment() { 'font-size', getUserSetting('displayTextSize') ); + uDom.nodeFromId('version').textContent = matrixSnapshot.appVersion || ''; document.body.classList.toggle( 'colorblind', getUserSetting('colorBlindFriendly') ); - uDom.nodeFromId('version').textContent = matrixSnapshot.appVersion || ''; + document.body.classList.toggle( + 'noTooltips', + getUserSetting('noTooltips') + ); var prettyNames = matrixHeaderPrettyNames; var keys = Object.keys(prettyNames); diff --git a/src/js/settings.js b/src/js/settings.js index 70492fa..26fe414 100644 --- a/src/js/settings.js +++ b/src/js/settings.js @@ -1,7 +1,7 @@ /******************************************************************************* uMatrix - a Chromium browser extension to black/white list requests. - Copyright (C) 2014-2017 Raymond Hill + Copyright (C) 2014-2018 Raymond Hill This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -101,6 +101,7 @@ function onInputChanged(ev) { case 'deleteLocalStorage': case 'deleteUnusedSessionCookies': case 'iconBadgeEnabled': + case 'noTooltips': case 'processHyperlinkAuditing': changeUserSettings(target.id, target.checked); break; diff --git a/src/popup.html b/src/popup.html index 1a15cee..ca4a6a0 100644 --- a/src/popup.html +++ b/src/popup.html @@ -16,7 +16,7 @@
 ∗ + -->∗ diff --git a/src/settings.html b/src/settings.html index ee07026..d60adcd 100644 --- a/src/settings.html +++ b/src/settings.html @@ -45,6 +45,9 @@ ul > li.separator {
  • +
  • + +