diff --git a/README.md b/README.md
index 2bb69079e..c158fb75e 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
* [What is uBlock?](#what-is-ublock)
-* [Getting Started](#getting-started)
+* [Getting Started & Installation](#getting-started)
* [Performance & Benchmarks](#performance)
* [Release History](#release-history)
* [Tips](#tips)
diff --git a/assets/checksums.txt b/assets/checksums.txt
index 3832fa84a..526e52c1f 100644
--- a/assets/checksums.txt
+++ b/assets/checksums.txt
@@ -1,5 +1,5 @@
f4e2b58298d1d26dd0c65f3db849a15a assets/ublock/filter-lists.json
-18ba7baebdb246100271a4cbd7100f74 assets/ublock/filters.txt
+642bdd3188cda7fd04da49bce4f005c1 assets/ublock/filters.txt
c9c5cc56bec563bc1885847f925b9be2 assets/ublock/mirror-candidates.txt
ba85c7991d208fe26c8f74f57bb5cfe1 assets/ublock/privacy.txt
0d707b2cee4a38988662107971137d13 assets/thirdparties/abp.mozilla-hispano.org/nauscopio/filtros.txt
diff --git a/assets/ublock/filters.txt b/assets/ublock/filters.txt
index f230e8eca..183647d97 100644
--- a/assets/ublock/filters.txt
+++ b/assets/ublock/filters.txt
@@ -306,4 +306,6 @@ deviantart.com##.dp-ad-chrome.dp-ad-visible
# Fixes https://github.com/chrisaljoudi/uBlock/issues/1240
# CNN
-@@||cdn.turner.com$domain=cnn.com
+# Also fixes https://github.com/chrisaljoudi/uBlock/issues/1271
+# NBA.com
+@@||cdn.turner.com/*/AdManager.js$domain=cnn.com|nba.com,script
diff --git a/src/css/3p-filters.css b/src/css/3p-filters.css
index 8d2e129b1..7b30a2269 100644
--- a/src/css/3p-filters.css
+++ b/src/css/3p-filters.css
@@ -140,10 +140,10 @@ span.new {
background-color: hsl(36, 100%, 75%);
}
#externalListsDiv {
- margin: 2em auto 0 2em;
+ margin: 2em auto 0 1em;
}
body[dir=rtl] #externalListsDiv {
- margin: 2em 2em 0;
+ margin: 2em 1em 0;
}
#externalLists {
box-sizing: border-box;
diff --git a/src/css/common.css b/src/css/common.css
index 387a68ba6..baf64e4f5 100644
--- a/src/css/common.css
+++ b/src/css/common.css
@@ -4,12 +4,13 @@
position: relative;
}
body [data-tip]:after {
- background-color: #444;
+ background-color: #333;
border-radius: 3px;
box-sizing: border-box;
color: #eee;
content: attr(data-tip);
font-size: 12px;
+ font-weight: normal;
left: 0.5em;
line-height: 130%;
opacity: 0;
@@ -24,10 +25,10 @@ body [data-tip]:after {
z-index: 20;
}
body [data-tip]:hover:after {
- opacity: 1;
+ opacity: 0.9;
position: absolute;
- transition: visibility 0s 0.6s, opacity 0.2s 0.7s;
- -webkit-transition: visibility 0s 0.6s, opacity 0.2s 0.7s;
+ transition: visibility 0s 0.3s, opacity 0.2s 0.4s;
+ -webkit-transition: visibility 0s 0.3s, opacity 0.2s 0.4s;
visibility: visible;
}
body[dir=rtl] [data-tip]:hover:after {
diff --git a/src/css/popup.css b/src/css/popup.css
index 512b0a925..fb88e334d 100644
--- a/src/css/popup.css
+++ b/src/css/popup.css
@@ -37,15 +37,18 @@ a {
padding: 4px;
padding-top: 5px;
color: #eee;
- font-weight: bold;
background-color: #444;
text-align: center;
cursor: pointer;
}
+#appname {
+ margin-left: 3px;
+ font-weight: bold;
+ }
#version {
- font-size: 11px;
- font-weight: normal;
- margin-left: 1em;
+ font-size: 75%;
+ opacity: 0.8;
+ margin-left: 5px;
}
html {
font-size: 0;
diff --git a/src/img/icons.svg b/src/img/icons.svg
index 12f06f135..c0c71abb5 100755
--- a/src/img/icons.svg
+++ b/src/img/icons.svg
@@ -12,6 +12,10 @@
eraser
+
+ preferences
+
+
eyedropper
@@ -28,15 +32,19 @@
stats
-
- view
-
-
reload
+
+ view
+
+
+
+
+
+
filter
diff --git a/src/js/3p-filters.js b/src/js/3p-filters.js
index 9a89fd690..8169b9d54 100644
--- a/src/js/3p-filters.js
+++ b/src/js/3p-filters.js
@@ -76,6 +76,9 @@ var renderFilterLists = function() {
var renderElapsedTimeToString = vAPI.i18n.renderElapsedTimeToString;
var lastUpdateString = vAPI.i18n('3pLastUpdate');
+ // Don't lose the custom filter textbox
+ uDom('#templates').append(uDom('#externalListsDiv'));
+
// Assemble a pretty blacklist name if possible
var listNameFromListKey = function(listKey) {
if ( listKey === listDetails.userFiltersPath ) {
diff --git a/src/js/background.js b/src/js/background.js
index 4d6da24d2..e2a543a3f 100644
--- a/src/js/background.js
+++ b/src/js/background.js
@@ -74,8 +74,7 @@ return {
'behind-the-scene',
'chrome-extension-scheme',
'chrome-scheme',
- 'opera-scheme',
- ''
+ 'opera-scheme'
].join('\n').trim(),
localSettings: {
diff --git a/src/js/tab.js b/src/js/tab.js
index 05cabffe9..e0ffe35f9 100644
--- a/src/js/tab.js
+++ b/src/js/tab.js
@@ -464,9 +464,6 @@ vAPI.tabs.onPopup = function(details) {
if ( pageStore ) {
pageStore.logRequest(context, result);
}
- if ( µb.userSettings.showIconBadge ) {
- µb.updateBadgeAsync(details.openerTabId);
- }
// Not blocked
if ( µb.isAllowResult(result) ) {
@@ -474,6 +471,9 @@ vAPI.tabs.onPopup = function(details) {
}
// Blocked
+ if ( µb.userSettings.showIconBadge ) {
+ µb.updateBadgeAsync(details.openerTabId);
+ }
// It is a popup, block and remove the tab.
if(details.targetTabId !== "preempt") {
diff --git a/src/popup.html b/src/popup.html
index 9c4d1691c..cc36e5ca4 100644
--- a/src/popup.html
+++ b/src/popup.html
@@ -10,7 +10,7 @@
-
+