diff --git a/platform/chromium/manifest.json b/platform/chromium/manifest.json index d59ada391..079a3cf8a 100644 --- a/platform/chromium/manifest.json +++ b/platform/chromium/manifest.json @@ -45,8 +45,9 @@ }, { "matches": [ - "http://*/*", - "https://*/*" + "https://filterlists.com/*", + "https://github.com/*", + "https://*.github.io/*" ], "js": [ "/js/scriptlets/subscriber.js" diff --git a/platform/firefox/manifest.json b/platform/firefox/manifest.json index 012153ffa..e5dfe9405 100644 --- a/platform/firefox/manifest.json +++ b/platform/firefox/manifest.json @@ -55,8 +55,9 @@ }, { "matches": [ - "http://*/*", - "https://*/*" + "https://filterlists.com/*", + "https://github.com/*", + "https://*.github.io/*" ], "js": [ "/js/scriptlets/subscriber.js" diff --git a/platform/opera/manifest.json b/platform/opera/manifest.json index 257de5a9a..c253590ee 100644 --- a/platform/opera/manifest.json +++ b/platform/opera/manifest.json @@ -44,15 +44,16 @@ "run_at": "document_start" }, { - "all_frames": false, - "js": [ - "js/scriptlets/subscriber.js" - ], "matches": [ - "http://*/*", - "https://*/*" + "https://filterlists.com/*", + "https://github.com/*", + "https://*.github.io/*" ], - "run_at": "document_idle" + "js": [ + "/js/scriptlets/subscriber.js" + ], + "run_at": "document_idle", + "all_frames": false } ], "default_locale": "en", diff --git a/platform/thunderbird/manifest.json b/platform/thunderbird/manifest.json index 496bf6f4f..bc81fd2b5 100644 --- a/platform/thunderbird/manifest.json +++ b/platform/thunderbird/manifest.json @@ -36,8 +36,9 @@ }, { "matches": [ - "http://*/*", - "https://*/*" + "https://filterlists.com/*", + "https://github.com/*", + "https://*.github.io/*" ], "js": [ "/js/scriptlets/subscriber.js" diff --git a/platform/webext/manifest.json b/platform/webext/manifest.json index 50f675186..3b7a7a4b5 100644 --- a/platform/webext/manifest.json +++ b/platform/webext/manifest.json @@ -49,8 +49,9 @@ }, { "matches": [ - "http://*/*", - "https://*/*" + "https://filterlists.com/*", + "https://github.com/*", + "https://*.github.io/*" ], "js": [ "/js/scriptlets/subscriber.js" diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json index e8f9bd503..79dea0903 100644 --- a/src/_locales/en/messages.json +++ b/src/_locales/en/messages.json @@ -904,8 +904,12 @@ "description": "English: Network error: {{msg}}" }, "subscriberConfirm": { - "message": "uBlock₀: Add the following URL to your custom filter lists?\n\nTitle: \"{{title}}\"\nURL: {{url}}", - "description": "English: The message seen by the user to confirm subscription to a ABP filter list" + "message": "Add the following URL to your custom filter lists?\n\nTitle: \"{{title}}\"\nURL: {{url}}", + "description": "No longer used" + }, + "subscribeButton": { + "message": "Subscribe", + "description": "For the button used to subscribe to a filter list" }, "elapsedOneMinuteAgo": { "message": "a minute ago", diff --git a/src/asset-viewer.html b/src/asset-viewer.html index c3a2badde..dfcf92c32 100644 --- a/src/asset-viewer.html +++ b/src/asset-viewer.html @@ -11,21 +11,17 @@ + - - + + +
+ + + spinner + +
diff --git a/src/css/asset-viewer.css b/src/css/asset-viewer.css new file mode 100644 index 000000000..8fb6ee337 --- /dev/null +++ b/src/css/asset-viewer.css @@ -0,0 +1,77 @@ +/** + uBlock Origin - a browser extension to block requests. + Copyright (C) 2014-present 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see {http://www.gnu.org/licenses/}. + + Home: https://github.com/gorhill/uBlock +*/ + +body { + border: 0; + display: flex; + flex-direction: column; + height: 100vh; + margin: 0; + overflow: hidden; + padding: 0; + width: 100vw; + } +#subscribe { + background-color: var(--bg-transient-notice); + display: flex; + flex-shrink: 0; + padding: 4px; + justify-content: space-between; + max-height: 6em; + } +#subscribe.hide { + display: none; + } +.logo { + flex-shrink: 0; + width: 2em; + } +#subscribePrompt { + display: inline-flex; + flex-direction: column; + padding: 0 0.5em; + } +#subscribePrompt > span { + font-weight: bold; + } +#subscribePrompt > a { + font-size: 14px; + word-break: break-all; + } +#subscribe > button { + align-self: center; + } +#subscribe > .fa-icon { + font-size: 20px; + } +body.loading #subscribe > button, +body:not(.loading) #subscribe > .fa-icon { + display: none; + } +@keyframes spin { + 0% { transform: rotate(0deg); } + 100% { transform: rotate(360deg); } + } +body.loading #subscribe > .fa-icon > svg { + animation: spin 1s steps(8) infinite; + } +#content { + flex-grow: 1; + } diff --git a/src/css/common.css b/src/css/common.css index 4a4ef2633..b91fa15f4 100644 --- a/src/css/common.css +++ b/src/css/common.css @@ -243,6 +243,16 @@ select { } } +.logo { + align-items: center; + display: inline-flex; + padding: 0 0.5em; + width: 1.25em; + } +.logo > img { + width: 100%; + } + .ubo-icon { align-items: center; background-color: transparent; diff --git a/src/css/dashboard.css b/src/css/dashboard.css index 136a2035e..a6933af6c 100644 --- a/src/css/dashboard.css +++ b/src/css/dashboard.css @@ -21,15 +21,6 @@ html, body { width: 100%; z-index: 10; } -#dashboard-nav .logo { - align-items: center; - display: inline-flex; - padding: 0 0.5em; - width: 1.25em; - } -#dashboard-nav .logo > img { - width: 100%; - } .tabButton { border: 0; border-bottom: 3px solid var(--bg-1); diff --git a/src/dashboard.html b/src/dashboard.html index 8e78909e0..0668cdf12 100644 --- a/src/dashboard.html +++ b/src/dashboard.html @@ -12,7 +12,7 @@
-