From 1deae3bfe0c1379efb869b94a30d1a731292cfab Mon Sep 17 00:00:00 2001 From: gorhill Date: Tue, 19 Aug 2014 20:41:52 -0400 Subject: [PATCH] this fixes #138, next: thorough code review --- 3p-filters.html | 58 ++- _locales/de/messages.json | 22 +- _locales/en/messages.json | 24 +- _locales/fr/messages.json | 24 +- about.html | 74 +-- assets/user/filters.txt | 1 - background.html | 1 - js/3p-filters.js | 109 ++-- js/about.js | 88 ---- js/asset-updater.js | 227 --------- js/assets.js | 1007 +++++++++++++++++++++++++------------ js/background.js | 1 + js/messaging-handlers.js | 35 +- js/messaging.js | 9 +- js/pagestore.js | 4 +- js/start.js | 13 +- js/storage.js | 29 +- js/ublock.js | 21 - js/utils.js | 36 +- manifest.json | 2 +- 20 files changed, 943 insertions(+), 842 deletions(-) delete mode 100644 assets/user/filters.txt delete mode 100644 js/asset-updater.js diff --git a/3p-filters.html b/3p-filters.html index c2706f548..b404fcd78 100644 --- a/3p-filters.html +++ b/3p-filters.html @@ -36,18 +36,59 @@ ul > li > ul > li { .dim { color: #888; } -button.purge { +/* I designed the button with: http://charliepark.org/bootstrap_buttons/ */ +button.reloadAll { + border: 1px solid transparent; + border-radius: 3px; + border-color: #dddddd #dddddd hsl(36, 0%, 85%); + padding: 5px; + background-color: hsl(36, 0%, 72%) !important; + background-repeat: repeat-x; + background-image: linear-gradient(#f2f2f2, #dddddd); + color: #aaa; + } +button.reloadAll.enabled { + border-color: #ffcc7f #ffcc7f hsl(36, 100%, 73%); + color: #222; + background-color: hsl(36, 100%, 75%) !important; + background-image: linear-gradient(#ffdca8, #ffcc7f); + cursor: pointer; + opacity: 0.8; + } +button.reloadAll:hover { + opacity: 1.0; + } +#buttonApply { + display: none; + position: fixed; + right: 1em; + top: 1em; + } +#buttonApply.enabled { + display: initial; + } +span.status { margin: 0; - border: 1px solid #ccc; + border: 1px solid transparent; padding: 1px 2px; + display: inline-block; + font-size: 11px; + opacity: 0.7; +} +span.purge { + border-color: #ddd; color: #444; background-color: #eee; - font-size: 11px; - opacity: 0.6; + cursor: pointer; } -button.purge:hover { +span.purge:hover { opacity: 1; } +span.obsolete { + border-color: hsl(36, 100%, 73%); + color: #222; + background-color: hsl(36, 100%, 75%); + } #externalLists { font-size: smaller; width: 48em; @@ -59,10 +100,11 @@ button.purge:hover { +