aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorgorhill <rhill@raymondhill.net>2015-05-28 16:26:01 -0400
committergorhill <rhill@raymondhill.net>2015-05-28 16:26:01 -0400
commit50f047eb45ef1b80bb7f2fa763ae1fafc3b3da91 (patch)
tree56284161170d431a2753c1a6cb55b5f6782a98f8 /src
parent446059a66d40230da64a5567138c7eb6510cd625 (diff)
downloaduBlock-50f047eb45ef1b80bb7f2fa763ae1fafc3b3da91.zip
uBlock-50f047eb45ef1b80bb7f2fa763ae1fafc3b3da91.tar.gz
uBlock-50f047eb45ef1b80bb7f2fa763ae1fafc3b3da91.tar.bz2
this fixes #250
Diffstat (limited to 'src')
-rw-r--r--src/1p-filters.html2
-rw-r--r--src/3p-filters.html4
-rw-r--r--src/css/3p-filters.css5
-rw-r--r--src/css/dashboard-common.css23
-rw-r--r--src/whitelist.html2
5 files changed, 27 insertions, 9 deletions
diff --git a/src/1p-filters.html b/src/1p-filters.html
index 93310c3..36fe3b8 100644
--- a/src/1p-filters.html
+++ b/src/1p-filters.html
@@ -11,7 +11,7 @@
<body>
<p data-i18n="1pFormatHint"></p>
-<p><button id="userFiltersApply" disabled="true" data-i18n="1pApplyChanges"></button></p>
+<p><button id="userFiltersApply" class="important" type="button" disabled="true" data-i18n="1pApplyChanges"></button></p>
<textarea class="userFilters" id="userFilters" dir="auto" spellcheck="false"></textarea>
<p><button id="importUserFiltersFromFile" data-i18n="1pImport"></button> &emsp;
<button id="exportUserFiltersToFile" data-i18n="1pExport"></button>
diff --git a/src/3p-filters.html b/src/3p-filters.html
index 57bcf2f..aed3968 100644
--- a/src/3p-filters.html
+++ b/src/3p-filters.html
@@ -10,10 +10,10 @@
<body>
-<button id="buttonApply" class="custom reloadAll disabled" data-i18n="3pApplyChanges"></button>
+<button id="buttonApply" class="important disabled" data-i18n="3pApplyChanges"></button>
<ul id="options">
<li><input type="checkbox" id="autoUpdate"><label data-i18n="3pAutoUpdatePrompt1" for="autoUpdate"></label>&ensp;
- <button class="custom reloadAll disabled" id="buttonUpdate" data-i18n="3pUpdateNow"></button>
+ <button class="important disabled" id="buttonUpdate" data-i18n="3pUpdateNow"></button>
<button id="buttonPurgeAll" class="custom disabled" data-i18n="3pPurgeAll"></button>
<li><input type="checkbox" id="parseCosmeticFilters"><label data-i18n="3pParseAllABPHideFiltersPrompt1" for="parseCosmeticFilters"></label>
<button class="whatisthis"></button>
diff --git a/src/css/3p-filters.css b/src/css/3p-filters.css
index 66f93e2..9884044 100644
--- a/src/css/3p-filters.css
+++ b/src/css/3p-filters.css
@@ -84,11 +84,6 @@ button.custom.disabled {
button.custom:hover {
opacity: 1.0;
}
-button.custom.reloadAll:not(.disabled) {
- border-color: #ffcc7f #ffcc7f hsl(36, 100%, 73%);
- background-color: hsl(36, 100%, 75%);
- background-image: linear-gradient(#ffdca8, #ffcc7f);
- }
#buttonApply {
display: initial;
margin: 1em 0;
diff --git a/src/css/dashboard-common.css b/src/css/dashboard-common.css
index b291720..5edbc09 100644
--- a/src/css/dashboard-common.css
+++ b/src/css/dashboard-common.css
@@ -25,6 +25,29 @@ div > p:last-child {
margin-bottom: 0;
}
+button.important {
+ padding: 5px;
+ border: 1px solid transparent;
+ border-color: #ffcc7f #ffcc7f hsl(36, 100%, 73%);
+ border-radius: 3px;
+ background-color: hsl(36, 100%, 75%);
+ background-image: linear-gradient(#ffdca8, #ffcc7f);
+ background-repeat: repeat-x;
+ color: #222;
+ opacity: 0.8;
+ }
+button.important[disabled],
+button.important.disabled {
+ border-color: #dddddd #dddddd hsl(36, 0%, 85%);
+ background-color: hsl(36, 0%, 72%);
+ background-image: linear-gradient(#f2f2f2, #dddddd);
+ color: #888;
+ pointer-events: none;
+ }
+button.important:hover {
+ opacity: 1.0;
+ }
+
.para {
width: 40em;
}
diff --git a/src/whitelist.html b/src/whitelist.html
index ee39202..5efbc3b 100644
--- a/src/whitelist.html
+++ b/src/whitelist.html
@@ -11,7 +11,7 @@
<body>
<p data-i18n="whitelistPrompt"></p>
-<p><button id="whitelistApply" type="button" disabled="true" data-i18n="whitelistApply"></button></p>
+<p><button id="whitelistApply" class="important" type="button" disabled="true" data-i18n="whitelistApply"></button></p>
<textarea id="whitelist" dir="auto" spellcheck="false"></textarea>
<p><button id="importWhitelistFromFile" data-i18n="whitelistImport"></button> &emsp;
<button id="exportWhitelistToFile" data-i18n="whitelistExport"></button>