Skip to content

Commit 4d0eaf3

Browse files
gorhillgorhill
committed
code review: various minor changes
1 parent 8f39f88 commit 4d0eaf3

5 files changed

Lines changed: 8 additions & 9 deletions

File tree

‎src/_locales/en/messages.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,8 +424,8 @@
424424
"description": "English: dynamic rule syntax and full documentation."
425425
},
426426
"whitelistPrompt":{
427-
"message":"Your list of host names for which uBlock₀ will be disabled. One entry per line. Invalid host names will be silently ignored.",
428-
"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."
427+
"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.",
428+
"description":"English: An overview of the content of the dashboard's Whitelist pane."
429429
},
430430
"whitelistImport":{
431431
"message":"Import and append",

‎src/css/common.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
body {
1616
background-color: white;
1717
color: black;
18-
font: 14px "Noto Sans",sans-serif;
18+
font: 14px sans-serif;
1919
}
2020
textarea {
2121
font-size: 90%;

‎src/css/popup.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ body[dir="rtl"] #panes > div {
9595
direction: rtl;
9696
}
9797
#panes > div:nth-of-type(2) {
98+
font-family: Noto Sans;
9899
overflow-y: auto;
99100
overflow-x: hidden;
100101
width: 24em;

‎src/js/start.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ var onPSLReady = function() {
9999
// To bring older versions up to date
100100

101101
var onVersionReady = function(lastVersion) {
102-
// After 1.9.16, non-advanced users can have access to the dynamic
102+
// Starting with 1.9.17, non-advanced users can have access to the dynamic
103103
// filtering pane in read-only mode. Still, it should not be visible by
104104
// default.
105-
if ( lastVersion.localeCompare('1.9.18') < 0 ) {
105+
if ( lastVersion.localeCompare('1.9.17') < 0 ) {
106106
if (
107107
µb.userSettings.advancedUserEnabled === false &&
108108
µb.userSettings.dynamicFilteringEnabled === true

‎src/whitelist.html‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,15 @@
1313

1414
<div id="cloudWidget" class="hide" data-cloud-entry="whitelistPane"></div>
1515

16-
<p data-i18n="whitelistPrompt"></p>
16+
<p><span data-i18n="whitelistPrompt"></span> <a class="fa info important" href="https://github.com/gorhill/uBlock/wiki/Dashboard:-Whitelist">&#xf05a;</a>
1717
<p>
1818
<button id="whitelistApply" class="custom important" type="button" disabled="true" data-i18n="whitelistApply"></button>&ensp;
1919
<button id="whitelistRevert" class="custom" type="button" disabled="true" data-i18n="genericRevert"></button>
20-
</p>
21-
<p><textarea id="whitelist" dir="auto" spellcheck="false"></textarea></p>
20+
<p><textarea id="whitelist" dir="auto" spellcheck="false"></textarea>
2221
<p>
2322
<button id="importWhitelistFromFile" class="custom" data-i18n="whitelistImport"></button>&ensp;
2423
<button id="exportWhitelistToFile" class="custom" data-i18n="whitelistExport"></button>
2524
<input id="importFilePicker" type="file" accept="text/plain" class="hiddenFileInput">
26-
</p>
2725

2826
<script src="lib/punycode.js"></script>
2927
<script src="js/vapi-common.js"></script>

0 commit comments

Comments
 (0)