Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-22 18:32:45 +01:00
Code Issues Releases Wiki Activity

code review: various minor changes

Browse Source
This commit is contained in:
gorhill 2016-11-07 14:53:04 -05:00
parent 8f39f88366
commit 4d0eaf3b3c
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/_locales/en/messages.json
View File

@ -424,8 +424,8 @@
"description": "English: dynamic rule syntax and full documentation."
},
"whitelistPrompt":{
"message":"Your list of host names for which uBlock₀ will be disabled. One entry per line. Invalid host names will be silently ignored.",
"description":"English: Your list of host names for which uBlock₀ will be disabled. One host name per line. Invalid host names will be silently ignored."
"message":"The whitelist directives dictate on which web pages uBlock Origin should be disabled. One entry per line. Invalid directives will be silently ignored and commented out.",
"description":"English: An overview of the content of the dashboard's Whitelist pane."
},
"whitelistImport":{
"message":"Import and append",

2
src/css/common.css
View File

@ -15,7 +15,7 @@
body {
background-color: white;
color: black;
font: 14px "Noto Sans",sans-serif;
font: 14px sans-serif;
}
textarea {
font-size: 90%;

1
src/css/popup.css
View File

@ -95,6 +95,7 @@ body[dir="rtl"] #panes > div {
direction: rtl;
}
#panes > div:nth-of-type(2) {
font-family: Noto Sans;
overflow-y: auto;
overflow-x: hidden;
width: 24em;

4
src/js/start.js
View File

@ -99,10 +99,10 @@ var onPSLReady = function() {
// To bring older versions up to date
var onVersionReady = function(lastVersion) {
// After 1.9.16, non-advanced users can have access to the dynamic
// Starting with 1.9.17, non-advanced users can have access to the dynamic
// filtering pane in read-only mode. Still, it should not be visible by
// default.
if ( lastVersion.localeCompare('1.9.18') < 0 ) {
if ( lastVersion.localeCompare('1.9.17') < 0 ) {
if (
µb.userSettings.advancedUserEnabled === false &&
µb.userSettings.dynamicFilteringEnabled === true

6
src/whitelist.html
View File

@ -13,17 +13,15 @@
<div id="cloudWidget" class="hide" data-cloud-entry="whitelistPane"></div>
<p data-i18n="whitelistPrompt"></p>
<p><span data-i18n="whitelistPrompt"></span> <a class="fa info important" href="https://github.com/gorhill/uBlock/wiki/Dashboard:-Whitelist">&#xf05a;</a>
<p>
<button id="whitelistApply" class="custom important" type="button" disabled="true" data-i18n="whitelistApply"></button>&ensp;
<button id="whitelistRevert" class="custom" type="button" disabled="true" data-i18n="genericRevert"></button>
</p>
<p><textarea id="whitelist" dir="auto" spellcheck="false"></textarea></p>
<p><textarea id="whitelist" dir="auto" spellcheck="false"></textarea>
<p>
<button id="importWhitelistFromFile" class="custom" data-i18n="whitelistImport"></button>&ensp;
<button id="exportWhitelistToFile" class="custom" data-i18n="whitelistExport"></button>
<input id="importFilePicker" type="file" accept="text/plain" class="hiddenFileInput">
</p>
<script src="lib/punycode.js"></script>
<script src="js/vapi-common.js"></script>