-
- - - +
+
+ + + +
! will be ignored. Invalid URLs will be silently ignored.",
+ "description":"Short information about how to use the textarea to import external filter lists by URL"
},
"3pExternalListObsolete":{
"message":"Out of date.",
@@ -400,8 +400,8 @@
"description":"used as a tooltip for error icon beside a list"
},
"1pFormatHint":{
- "message":"One filter per line. A filter can be a plain hostname, or an Adblock Plus-compatible filter. Lines prefixed with ‘!’ will be ignored.",
- "description":"English: One filter per line. A filter can be a plain hostname, or an Adblock Plus-compatible filter. Lines prefixed with ‘!’ will be ignored."
+ "message":"One filter per line. A filter can be a plain hostname, or an Adblock Plus-compatible filter. Lines prefixed with ! will be ignored.",
+ "description":"Short information about how to create custom filters"
},
"1pImport":{
"message":"Import and append",
diff --git a/src/about.html b/src/about.html
index e929c5542..c343b51c7 100644
--- a/src/about.html
+++ b/src/about.html
@@ -10,22 +10,24 @@
-
- -
- -
+
diff --git a/src/css/1p-filters.css b/src/css/1p-filters.css index 54f991f32..2048139e8 100644 --- a/src/css/1p-filters.css +++ b/src/css/1p-filters.css @@ -1,11 +1,8 @@ -div > p:first-child { - margin-top: 0; - } -div > p:last-child { - margin-bottom: 0; +body { + overflow: hidden; } #userFilters { - height: 60vh; + height: 75vh; text-align: left; width: 100%; word-wrap: normal; diff --git a/src/css/advanced-settings.css b/src/css/advanced-settings.css index 1bb73055c..42c593577 100644 --- a/src/css/advanced-settings.css +++ b/src/css/advanced-settings.css @@ -1,9 +1,3 @@ -div > p:first-child { - margin-top: 0; - } -div > p:last-child { - margin-bottom: 0; - } textarea { box-sizing: border-box; height: 60vh; diff --git a/src/css/codemirror.css b/src/css/codemirror.css index 38216e70f..f6e0b31a6 100644 --- a/src/css/codemirror.css +++ b/src/css/codemirror.css @@ -4,7 +4,6 @@ position: relative; } .CodeMirror { - border: 1px solid #ddd; box-sizing: border-box; flex-grow: 1; height: 100%; diff --git a/src/css/common.css b/src/css/common.css index 255d1d18e..6927997ef 100644 --- a/src/css/common.css +++ b/src/css/common.css @@ -20,6 +20,10 @@ body { color: black; font: 14px sans-serif; } +code { + background-color: #eee; + padding: 0 0.25em; + } textarea { font-size: 90%; } @@ -35,8 +39,18 @@ button.custom { color: #000; opacity: 0.8; } +button.custom:hover { + opacity: 1.0; + } +button.custom.important { + border-color: #ffcc7f #ffcc7f hsl(36, 100%, 73%); + background-color: hsl(36, 100%, 75%); + background-image: linear-gradient(#ffdca8, #ffcc7f); + } button.custom.disabled, -button.custom[disabled] { +button.custom[disabled], +button.custom.important.disabled, +button.custom.important[disabled] { border-color: #ddd #ddd hsl(36, 0%, 85%); background-color: hsl(36, 0%, 72%); background-image: linear-gradient(#f2f2f2, #dddddd); @@ -44,25 +58,25 @@ button.custom[disabled] { opacity: 0.6; pointer-events: none; } -button.custom:hover { - opacity: 1.0; +button.custom.iconifiable > .fa { + padding-right: 0.5em; } -button.important { - padding: 0.6em 1em; - 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; +body[dir="rtl"] button.custom.iconifiable > .fa { + padding-left: 0.5em; } -button.important:hover { - opacity: 1.0; - } -.hiddenFileInput { +.hidden { + display: none; height: 0; visibility: hidden; width: 0; } + +@media (max-width: 640px) { + button.custom.iconifiable > .fa { + font-size: 150%; + padding: 0; + } + button.custom.iconifiable > [data-i18n] { + display: none; + } + } diff --git a/src/css/dashboard-common.css b/src/css/dashboard-common.css index 25895f46e..a15c1ed21 100644 --- a/src/css/dashboard-common.css +++ b/src/css/dashboard-common.css @@ -1,5 +1,15 @@ body { + box-sizing: border-box; + left: 0; + height: 100vh; margin: 0; + overflow: auto; + padding: 0; + position: absolute; + right: 0; + top: 0; + } +body > div.body { padding: 0 0.5em 0.5em 0.5em; } @media screen and (max-device-width: 960px) { @@ -33,12 +43,6 @@ a.info.important { button { padding: 0.33em; } -div > p:first-child { - margin-top: 0; - } -div > p:last-child { - margin-bottom: 0; - } input[type="number"] { width: 5em; } diff --git a/src/css/dyna-rules.css b/src/css/dyna-rules.css index 5b5fbb6dc..f5ddc4a73 100644 --- a/src/css/dyna-rules.css +++ b/src/css/dyna-rules.css @@ -1,11 +1,7 @@ body { - bottom: 0; display: flex; - left: 0; - position: absolute; - right: 0; - top: 0; flex-direction: column; + overflow: hidden; } #diff { border: 0; @@ -42,53 +38,16 @@ body { #ruleFilter .fa { color: #888; } -body[dir="ltr"] #revertButton:after { - content: '\2009\f061'; - font-family: FontAwesome; - font-style: normal; - font-weight: normal; - line-height: 1; - vertical-align: baseline; - display: inline-block; - } -body[dir="rtl"] #revertButton:after { - content: '\2009\f060'; - font-family: FontAwesome; - font-style: normal; - font-weight: normal; - line-height: 1; - vertical-align: baseline; - display: inline-block; - } -body[dir="ltr"] #commitButton:before { - content: '\f060\2009'; - font-family: FontAwesome; - font-style: normal; - font-weight: normal; - line-height: 1; - vertical-align: baseline; - display: inline-block; - } -body[dir="rtl"] #commitButton:before { - content: '\f061\2009'; - font-family: FontAwesome; - font-style: normal; - font-weight: normal; - line-height: 1; - vertical-align: baseline; - display: inline-block; - } #revertButton, #commitButton, #diff.editing #exportButton, -#diff.editing #importButton, -#editSaveButton { +#diff.editing #importButton { opacity: 0.25; pointer-events: none; } #diff.dirty:not(.editing) #revertButton, #diff.dirty:not(.editing) #commitButton, -#diff.editing #editSaveButton { +#diff.editing { opacity: 1; pointer-events: auto; } diff --git a/src/css/whitelist.css b/src/css/whitelist.css index b86296046..292e75d1f 100644 --- a/src/css/whitelist.css +++ b/src/css/whitelist.css @@ -1,11 +1,8 @@ -div > p:first-child { - margin-top: 0; - } -div > p:last-child { - margin-bottom: 0; +body { + overflow: hidden; } #whitelist { - height: 60vh; + height: 75vh; text-align: left; width: 100%; } diff --git a/src/dyna-rules.html b/src/dyna-rules.html index eb68ef50e..87bc10a0c 100644 --- a/src/dyna-rules.html +++ b/src/dyna-rules.html @@ -16,26 +16,27 @@ - - - -- - -
-
-
+ + +
+
+