From b08cb433b979d646a7498374bf3bbc1ec31e7be5 Mon Sep 17 00:00:00 2001 From: overdodactyl Date: Sat, 14 Apr 2018 17:11:58 -0600 Subject: [PATCH 01/17] generic styling initial commit --- .../webextension-tweaks/dark_mode.css | 2 +- .../webextension-tweaks/decentraleyes.css | 2 +- .../webextension-tweaks/generic_style.css | 75 +++++++++++++++++++ .../webextension-tweaks/https_everywhere.css | 2 +- .../multi_account_containers.css | 2 +- .../multiple_tab_handler.css | 10 --- .../webextension-tweaks/neat_url.css | 28 ------- .../webextension-tweaks/request_control.css | 2 +- .../webextension-tweaks/skip_redirect.css | 2 +- .../webextension-tweaks/smart_referer.css | 20 ----- .../webextension-tweaks/tab_suspender.css | 24 ------ .../webextension-tweaks/tree_style_tab.css | 2 +- .../webextension-tweaks/tridactyl.css | 2 +- .../webextension-tweaks/ublock_origin.css | 2 +- .../webextension-tweaks/ubo_scope.css | 2 +- .../webextension-tweaks/umatrix.css | 2 +- .../webextension-tweaks/violentmonkey.css | 2 +- scripts/add_UUIDs.sh | 10 ++- scripts/remove_UUIDs.sh | 6 +- scripts/webextension_mappings.txt | 5 ++ userContent_imports.css | 1 + 21 files changed, 106 insertions(+), 97 deletions(-) create mode 100644 css/userContent-files/webextension-tweaks/generic_style.css delete mode 100644 css/userContent-files/webextension-tweaks/multiple_tab_handler.css delete mode 100644 css/userContent-files/webextension-tweaks/neat_url.css delete mode 100644 css/userContent-files/webextension-tweaks/smart_referer.css delete mode 100644 css/userContent-files/webextension-tweaks/tab_suspender.css diff --git a/css/userContent-files/webextension-tweaks/dark_mode.css b/css/userContent-files/webextension-tweaks/dark_mode.css index d0bac61..f0f04e0 100644 --- a/css/userContent-files/webextension-tweaks/dark_mode.css +++ b/css/userContent-files/webextension-tweaks/dark_mode.css @@ -19,4 +19,4 @@ .highlight { background-color: var(--in-content-box-border-color)!important } -} \ No newline at end of file +} diff --git a/css/userContent-files/webextension-tweaks/decentraleyes.css b/css/userContent-files/webextension-tweaks/decentraleyes.css index d139133..6dea68f 100644 --- a/css/userContent-files/webextension-tweaks/decentraleyes.css +++ b/css/userContent-files/webextension-tweaks/decentraleyes.css @@ -16,4 +16,4 @@ .button:hover { background-color: var(--in-content-page-background)!important } -} \ No newline at end of file +} diff --git a/css/userContent-files/webextension-tweaks/generic_style.css b/css/userContent-files/webextension-tweaks/generic_style.css new file mode 100644 index 0000000..3e01568 --- /dev/null +++ b/css/userContent-files/webextension-tweaks/generic_style.css @@ -0,0 +1,75 @@ +@-moz-document url-prefix("moz-extension://1_click_youtube_video_downloader_UUID"), + url-prefix("moz-extension://autocopy_UUID"), + url-prefix("moz-extension://custom_titlebar_text_UUID"), + url-prefix("moz-extension://octopatcher_UUID"), + url-prefix("moz-extension://text_link_UUID"), + url-prefix("moz-extension://multiple_tab_handler_UUID/"), + url-prefix("moz-extension://neat_url_UUID/"), + url-prefix("moz-extension://smart_referer_UUID/"), + url-prefix("moz-extension://tab_suspender_UUID/"), + url-prefix("moz-extension://generic_styling_1_UUID"), + url-prefix("moz-extension://generic_styling_2_UUID"), + url-prefix("moz-extension://generic_styling_3_UUID"), + url-prefix("moz-extension://generic_styling_4_UUID"), + url-prefix("moz-extension://generic_styling_5_UUID") { + * { + color: var(--in-content-page-color) !important; + background-color: var(--in-content-page-background)!important; + border-color: var(--in-content-box-border-color)!important; + text-shadow: none!important + } + select { + color: black !important; + } + select * { + background-color: var(--in-content-box-background) !important; + } + a { + color: var(--in-content-link-color) !important; + } + h1, h2, h3, h4, h5, h6 { + color: var(--in-content-category-text-selected)!important + } + fieldset { + border: 2px solid!important; + border-color: var(--in-content-box-border-color)!important + } + input:not([type=checkbox]) { + background: var(--in-content-box-background)!important; + color: var(--in-content-page-color)!important; + } + + textarea, + input[type="input"], + input[type="text"], + input[type="number"], + input[type="url"], + input[type="textbox"] { + -moz-appearance: none!important; + background: var(--in-content-box-background)!important; + color: var(--in-content-page-color)!important; + border: 1px solid!important; + border-color: var(--in-content-box-border-color)!important; + margin-left: 3px !important; + padding-left: 3px !important; + } + textarea { + padding: 5px 5px 5px 5px !important; + } + button, + input[type="submit"] { + -moz-appearance: none!important; + background-image: none!important; + background-color: var(--in-content-page-background)!important; + color: var(--in-content-page-color)!important; + border: 1px solid!important; + border-color: var(--in-content-box-border-color)!important; + border-radius: 3px!important + } + button:hover, + input[type="submit"]:hover { + background-color: var(--in-content-box-background-hover)!important + } +} + +/* Pop Up Background Fixes */ diff --git a/css/userContent-files/webextension-tweaks/https_everywhere.css b/css/userContent-files/webextension-tweaks/https_everywhere.css index 518f664..b49844f 100644 --- a/css/userContent-files/webextension-tweaks/https_everywhere.css +++ b/css/userContent-files/webextension-tweaks/https_everywhere.css @@ -14,4 +14,4 @@ h3 { color: var(--tone-4)!important } -} \ No newline at end of file +} diff --git a/css/userContent-files/webextension-tweaks/multi_account_containers.css b/css/userContent-files/webextension-tweaks/multi_account_containers.css index 90ccee9..e02f3fd 100644 --- a/css/userContent-files/webextension-tweaks/multi_account_containers.css +++ b/css/userContent-files/webextension-tweaks/multi_account_containers.css @@ -116,4 +116,4 @@ background-image: url(chrome://global/skin/in-content/check.svg)!important; background-color: var(--tone-6)!important } -} \ No newline at end of file +} diff --git a/css/userContent-files/webextension-tweaks/multiple_tab_handler.css b/css/userContent-files/webextension-tweaks/multiple_tab_handler.css deleted file mode 100644 index 0c0e9b1..0000000 --- a/css/userContent-files/webextension-tweaks/multiple_tab_handler.css +++ /dev/null @@ -1,10 +0,0 @@ -/*! Alters the webextension Multiple Tab Handler - IMPORTANT: change the Internal UUID */ -@-moz-document url-prefix("moz-extension://multiple_tab_handler_UUID/") { - h1, - p, - ul, - ul li { - color: var(--tone-4)!important - } -} \ No newline at end of file diff --git a/css/userContent-files/webextension-tweaks/neat_url.css b/css/userContent-files/webextension-tweaks/neat_url.css deleted file mode 100644 index 0e75fc4..0000000 --- a/css/userContent-files/webextension-tweaks/neat_url.css +++ /dev/null @@ -1,28 +0,0 @@ -/*! Alters the webextension Neat URL - IMPORTANT: change the Internal UUID */ -@-moz-document url-prefix("moz-extension://neat_url_UUID/") { - body, - h2, - label { - color: var(--tone-4)!important - } - input, - textarea { - -moz-appearance: none!important; - background: var(--tone-6)!important; - color: var(--tone-4)!important; - border-color: var(--tone-5)!important; - padding: 5px!important - } - a:link { - color: var(--accent-1)!important - } - button { - background-color: var(--tone-8)!important; - color: var(--tone-4)!important; - border-color: var(--tone-5)!important - } - button:hover { - background-color: var(--tone-7)!important - } -} \ No newline at end of file diff --git a/css/userContent-files/webextension-tweaks/request_control.css b/css/userContent-files/webextension-tweaks/request_control.css index 380df5a..0fe29b9 100644 --- a/css/userContent-files/webextension-tweaks/request_control.css +++ b/css/userContent-files/webextension-tweaks/request_control.css @@ -72,4 +72,4 @@ border-color: var(--tone-5)!important; color: var(--tone-4)!important } -} \ No newline at end of file +} diff --git a/css/userContent-files/webextension-tweaks/skip_redirect.css b/css/userContent-files/webextension-tweaks/skip_redirect.css index 0bf310d..6e93d0a 100644 --- a/css/userContent-files/webextension-tweaks/skip_redirect.css +++ b/css/userContent-files/webextension-tweaks/skip_redirect.css @@ -15,4 +15,4 @@ label a { color: var(--accent-1)!important } -} \ No newline at end of file +} diff --git a/css/userContent-files/webextension-tweaks/smart_referer.css b/css/userContent-files/webextension-tweaks/smart_referer.css deleted file mode 100644 index 2c7e33e..0000000 --- a/css/userContent-files/webextension-tweaks/smart_referer.css +++ /dev/null @@ -1,20 +0,0 @@ -/*! Alters the webextension Smart Referer - IMPORTANT: change the Internal UUID */ -@-moz-document url-prefix("moz-extension://smart_referer_UUID/") { - body, - body > [data-option] > .label.with-description > p, - body > [data-option] > label.with-description > p { - color: var(--in-content-page-color)!important; - text-shadow: none!important - } - input[type=text] { - -moz-appearance: none!important; - background-color: var(--in-content-box-background)!important; - border: 1px solid!important; - border-color: var(--in-content-box-border-color)!important; - color: var(--in-content-page-color)!important - } - button[type=submit] { - filter: invert(65%) - } -} \ No newline at end of file diff --git a/css/userContent-files/webextension-tweaks/tab_suspender.css b/css/userContent-files/webextension-tweaks/tab_suspender.css deleted file mode 100644 index f3373c2..0000000 --- a/css/userContent-files/webextension-tweaks/tab_suspender.css +++ /dev/null @@ -1,24 +0,0 @@ -/*! Alters the webextension Tab Suspender (memory saver) - IMPORTANT: change the Internal UUID */ -@-moz-document url-prefix("moz-extension://tab_suspender_UUID/") { - body, - label { - color: var(--tone-4)!important - } - input[type=number], - textarea { - -moz-appearance: none!important; - background: var(--tone-6)!important; - color: var(--tone-4)!important; - border-color: var(--tone-5)!important - } - #recovery, - #save { - -moz-appearance: none!important; - height: 20px!important; - background: var(--tone-8)!important; - color: var(--tone-4)!important; - border-color: var(--tone-5)!important; - border-radius: 4px!important - } -} \ No newline at end of file diff --git a/css/userContent-files/webextension-tweaks/tree_style_tab.css b/css/userContent-files/webextension-tweaks/tree_style_tab.css index 82457ca..263f410 100644 --- a/css/userContent-files/webextension-tweaks/tree_style_tab.css +++ b/css/userContent-files/webextension-tweaks/tree_style_tab.css @@ -117,4 +117,4 @@ #tabbar { background: var(--in-content-page-background)!important } -} \ No newline at end of file +} diff --git a/css/userContent-files/webextension-tweaks/tridactyl.css b/css/userContent-files/webextension-tweaks/tridactyl.css index 6cdf9df..d29209c 100644 --- a/css/userContent-files/webextension-tweaks/tridactyl.css +++ b/css/userContent-files/webextension-tweaks/tridactyl.css @@ -46,4 +46,4 @@ background: var(--warning-background-color)!important; color: var(--warning-color)!important } -} \ No newline at end of file +} diff --git a/css/userContent-files/webextension-tweaks/ublock_origin.css b/css/userContent-files/webextension-tweaks/ublock_origin.css index bd75f36..2a8d7e6 100644 --- a/css/userContent-files/webextension-tweaks/ublock_origin.css +++ b/css/userContent-files/webextension-tweaks/ublock_origin.css @@ -430,4 +430,4 @@ background-color: var(--theme-highlight-blue)!important; color: #000!important } -} \ No newline at end of file +} diff --git a/css/userContent-files/webextension-tweaks/ubo_scope.css b/css/userContent-files/webextension-tweaks/ubo_scope.css index 770775a..6d84a3b 100644 --- a/css/userContent-files/webextension-tweaks/ubo_scope.css +++ b/css/userContent-files/webextension-tweaks/ubo_scope.css @@ -49,4 +49,4 @@ * { border-color: var(--in-content-box-border-color)!important } -} \ No newline at end of file +} diff --git a/css/userContent-files/webextension-tweaks/umatrix.css b/css/userContent-files/webextension-tweaks/umatrix.css index 44df3e8..a5fba0b 100644 --- a/css/userContent-files/webextension-tweaks/umatrix.css +++ b/css/userContent-files/webextension-tweaks/umatrix.css @@ -372,4 +372,4 @@ border-bottom: 1px solid!important; border-color: var(--tone-5)!important } -} \ No newline at end of file +} diff --git a/css/userContent-files/webextension-tweaks/violentmonkey.css b/css/userContent-files/webextension-tweaks/violentmonkey.css index 28d8ee9..210033e 100644 --- a/css/userContent-files/webextension-tweaks/violentmonkey.css +++ b/css/userContent-files/webextension-tweaks/violentmonkey.css @@ -204,4 +204,4 @@ outline: rgba(255,255,255,.25) solid 1px!important; color: #fff!important } -} \ No newline at end of file +} diff --git a/scripts/add_UUIDs.sh b/scripts/add_UUIDs.sh index 5ce82b2..a0d58b7 100644 --- a/scripts/add_UUIDs.sh +++ b/scripts/add_UUIDs.sh @@ -5,7 +5,7 @@ ## designed for users using userContent_imports.css ## entries in internal_UUIDs.txt should take on the following format: webextension_name_UUID=INTERNAL_UUID ## author: @overdodactyl -## version: 1.0 +## version: 1.1 currdir=$(pwd) @@ -22,5 +22,11 @@ cd "$(dirname "${sfp}")" && cd .. while IFS='' read -r line || [[ -n "$line" ]]; do IFS='=' read -r -a array <<< "$line" webextension_name=${array[0]%_UUID} - sed -i '' "s/${array[0]}/${array[1]}/" "css/userContent-files/webextension-tweaks/${webextension_name}.css" + if [ -e css/userContent-files/webextension-tweaks/${webextension_name}.css ]; then + sed -i '' "s/${array[0]}/${array[1]}/" "css/userContent-files/webextension-tweaks/${webextension_name}.css" + else + sed -i '' "s/${array[0]}/${array[1]}/" "css/userContent-files/webextension-tweaks/generic_style.css" + fi + + done < "internal_UUIDs.txt" diff --git a/scripts/remove_UUIDs.sh b/scripts/remove_UUIDs.sh index a446a7a..fcfcb1f 100644 --- a/scripts/remove_UUIDs.sh +++ b/scripts/remove_UUIDs.sh @@ -22,5 +22,9 @@ cd "$(dirname "${sfp}")" && cd .. while IFS='' read -r line || [[ -n "$line" ]]; do IFS='=' read -r -a array <<< "$line" webextension_name=${array[0]%_UUID} - sed -i '' "s/${array[1]}/${array[0]}/" "css/userContent-files/webextension-tweaks/${webextension_name}.css" + if [ -e css/userContent-files/webextension-tweaks/${webextension_name}.css ]; then + sed -i '' "s/${array[1]}/${array[0]}/" "css/userContent-files/webextension-tweaks/${webextension_name}.css" + else + sed -i '' "s/${array[1]}/${array[0]}/" "css/userContent-files/webextension-tweaks/generic_style.css" + fi done < "internal_UUIDs.txt" diff --git a/scripts/webextension_mappings.txt b/scripts/webextension_mappings.txt index 0d2f177..51d19f4 100644 --- a/scripts/webextension_mappings.txt +++ b/scripts/webextension_mappings.txt @@ -1,5 +1,8 @@ +1_click_youtube_video_downloader|YoutubeDownloader@PeterOlayev.com +autocopy|autocopy@mozilla.org brief|brief@mozdev.org cookie_autodelete|CookieAutoDelete@kennydo.com +custom_titlebar_text|{b5a43a70-4092-4899-9c44-63799150b35e} dark_mode|{174b2d58-b983-4501-ab4b-07e71203cb43} decentraleyes|jid1-BoFifL9Vbdl2zQ@jetpack https_everywhere|https-everywhere@eff.org @@ -7,11 +10,13 @@ multi_account_containers|@testpilot-containers multiple_tab_handler|multipletab@piro.sakura.ne.jp neat_url|neaturl@hugsmile.eu noscript|{73a6fe31-595d-460b-a920-fcc0f8843232} +octopatcher|octopatcher_wowmotty@gmail.com request_control|{1b1e6108-2d88-4f0f-a338-01f9dbcccd6f} skip_redirect|skipredirect@sblask smart_https|{b3e677f4-1150-4387-8629-da738260a48e} smart_referer|smart-referer@meh.paranoid.pk tab_suspender|{e225ac78-5e83-484b-a16b-b6ed0924212f} +text_link|{54BB9F3F-07E5-486c-9B39-C7398B99391C} tree_style_tab|treestyletab@piro.sakura.ne.jp tridactyl|tridactyl.vim@cmcaine.co.uk ublock_origin|uBlock0@raymondhill.net diff --git a/userContent_imports.css b/userContent_imports.css index 1f88a5d..18f55d5 100644 --- a/userContent_imports.css +++ b/userContent_imports.css @@ -14,6 +14,7 @@ /* Import Relevant webextension tweaks here * IMPORTANT: If used, change the Internal UUID in the corresponding css file */ +@import "css/userContent-files/webextension-tweaks/generic_style.css"; @import "css/userContent-files/webextension-tweaks/brief.css"; @import "css/userContent-files/webextension-tweaks/cookie_autodelete.css"; @import "css/userContent-files/webextension-tweaks/dark_mode.css"; From 47fe1e31e76322b00247821012ba37c4b8194c1c Mon Sep 17 00:00:00 2001 From: overdodactyl Date: Sat, 14 Apr 2018 18:55:45 -0600 Subject: [PATCH 02/17] remove some redundancies --- .../webextension-tweaks/generic_style.css | 41 +++++++++++++++++-- .../webextension-tweaks/https_everywhere.css | 17 -------- .../webextension-tweaks/skip_redirect.css | 18 -------- scripts/webextension_mappings.txt | 1 + 4 files changed, 38 insertions(+), 39 deletions(-) delete mode 100644 css/userContent-files/webextension-tweaks/https_everywhere.css delete mode 100644 css/userContent-files/webextension-tweaks/skip_redirect.css diff --git a/css/userContent-files/webextension-tweaks/generic_style.css b/css/userContent-files/webextension-tweaks/generic_style.css index 3e01568..5636831 100644 --- a/css/userContent-files/webextension-tweaks/generic_style.css +++ b/css/userContent-files/webextension-tweaks/generic_style.css @@ -1,3 +1,27 @@ +/* Pop Up Background Fixes */ +@-moz-document url-prefix("moz-extension://css_exfil_protection_UUID/popup.html"), + url-prefix("moz-extension://https_everywhere_UUID/pages/popup"), + url-prefix("moz-extension://skip_redirect_UUID/") { + :root { + --in-content-page-background: var(--tone-6)!important; + --in-content-box-background: rgba(11,11,12,0.2)!important; + --in-content-box-border-color: rgba(249, 249, 250, 0.3)!important; + --in-content-box-background-hover: rgba(11,11,12,0.2)!important; + } + button { + margin-top: 3px !important; + } + input { + margin-top: 3px !important; + margin-bottom: 3px !important; + } + textarea, + input { + margin-left: 0px !important; + } + +} + @-moz-document url-prefix("moz-extension://1_click_youtube_video_downloader_UUID"), url-prefix("moz-extension://autocopy_UUID"), url-prefix("moz-extension://custom_titlebar_text_UUID"), @@ -7,11 +31,15 @@ url-prefix("moz-extension://neat_url_UUID/"), url-prefix("moz-extension://smart_referer_UUID/"), url-prefix("moz-extension://tab_suspender_UUID/"), + url-prefix("moz-extension://css_exfil_protection_UUID/"), + url-prefix("moz-extension://https_everywhere_UUID/"), + url-prefix("moz-extension://skip_redirect_UUID/"), url-prefix("moz-extension://generic_styling_1_UUID"), url-prefix("moz-extension://generic_styling_2_UUID"), url-prefix("moz-extension://generic_styling_3_UUID"), url-prefix("moz-extension://generic_styling_4_UUID"), - url-prefix("moz-extension://generic_styling_5_UUID") { + url-prefix("moz-extension://generic_styling_5_UUID") + { * { color: var(--in-content-page-color) !important; background-color: var(--in-content-page-background)!important; @@ -27,6 +55,9 @@ a { color: var(--in-content-link-color) !important; } + a:hover { + color: var(--in-content-link-color-hover) !important; + } h1, h2, h3, h4, h5, h6 { color: var(--in-content-category-text-selected)!important } @@ -38,6 +69,9 @@ background: var(--in-content-box-background)!important; color: var(--in-content-page-color)!important; } + input[type="file"] { + background-color: var(--in-content-page-background)!important; + } textarea, input[type="input"], @@ -60,7 +94,7 @@ input[type="submit"] { -moz-appearance: none!important; background-image: none!important; - background-color: var(--in-content-page-background)!important; + color: var(--in-content-page-color)!important; border: 1px solid!important; border-color: var(--in-content-box-border-color)!important; @@ -70,6 +104,5 @@ input[type="submit"]:hover { background-color: var(--in-content-box-background-hover)!important } -} -/* Pop Up Background Fixes */ +} diff --git a/css/userContent-files/webextension-tweaks/https_everywhere.css b/css/userContent-files/webextension-tweaks/https_everywhere.css deleted file mode 100644 index b49844f..0000000 --- a/css/userContent-files/webextension-tweaks/https_everywhere.css +++ /dev/null @@ -1,17 +0,0 @@ -/*! Alters the webextension HTTPS Everywhere - IMPORTANT: change the Internal UUID */ -@-moz-document url-prefix("moz-extension://https_everywhere_UUID/") { - body { - color: var(--tone-4)!important; - background: var(--tone-6)!important - } - html { - background-color: var(--tone-6)!important - } - a { - color: var(--accent-1)!important - } - h3 { - color: var(--tone-4)!important - } -} diff --git a/css/userContent-files/webextension-tweaks/skip_redirect.css b/css/userContent-files/webextension-tweaks/skip_redirect.css deleted file mode 100644 index 6e93d0a..0000000 --- a/css/userContent-files/webextension-tweaks/skip_redirect.css +++ /dev/null @@ -1,18 +0,0 @@ -/*! Alters the webextension Skip Redirect - IMPORTANT: change the Internal UUID */ -@-moz-document url-prefix("moz-extension://skip_redirect_UUID/") { - body { - background: var(--tone-6)!important; - color: var(--tone-4)!important - } - input[type=number], - input[type=text], - textarea { - -moz-appearance: none!important; - background: var(--tone-5)!important; - color: var(--grey-30)!important - } - label a { - color: var(--accent-1)!important - } -} diff --git a/scripts/webextension_mappings.txt b/scripts/webextension_mappings.txt index 51d19f4..9919983 100644 --- a/scripts/webextension_mappings.txt +++ b/scripts/webextension_mappings.txt @@ -1,6 +1,7 @@ 1_click_youtube_video_downloader|YoutubeDownloader@PeterOlayev.com autocopy|autocopy@mozilla.org brief|brief@mozdev.org +css_exfil_protection|{7fc8ef53-24ec-4205-87a4-1e745953bb0d} cookie_autodelete|CookieAutoDelete@kennydo.com custom_titlebar_text|{b5a43a70-4092-4899-9c44-63799150b35e} dark_mode|{174b2d58-b983-4501-ab4b-07e71203cb43} From cd987e5731a7b9c95ee48235a86884601b6c3226 Mon Sep 17 00:00:00 2001 From: overdodactyl Date: Sat, 14 Apr 2018 19:25:24 -0600 Subject: [PATCH 03/17] scripts - accomodate multiple UUID locations --- scripts/add_UUIDs.sh | 3 +-- scripts/remove_UUIDs.sh | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/add_UUIDs.sh b/scripts/add_UUIDs.sh index a0d58b7..22ff6ea 100644 --- a/scripts/add_UUIDs.sh +++ b/scripts/add_UUIDs.sh @@ -24,9 +24,8 @@ while IFS='' read -r line || [[ -n "$line" ]]; do webextension_name=${array[0]%_UUID} if [ -e css/userContent-files/webextension-tweaks/${webextension_name}.css ]; then sed -i '' "s/${array[0]}/${array[1]}/" "css/userContent-files/webextension-tweaks/${webextension_name}.css" - else - sed -i '' "s/${array[0]}/${array[1]}/" "css/userContent-files/webextension-tweaks/generic_style.css" fi + sed -i '' "s/${array[0]}/${array[1]}/" "css/userContent-files/webextension-tweaks/generic_style.css" done < "internal_UUIDs.txt" diff --git a/scripts/remove_UUIDs.sh b/scripts/remove_UUIDs.sh index fcfcb1f..68276a1 100644 --- a/scripts/remove_UUIDs.sh +++ b/scripts/remove_UUIDs.sh @@ -24,7 +24,6 @@ while IFS='' read -r line || [[ -n "$line" ]]; do webextension_name=${array[0]%_UUID} if [ -e css/userContent-files/webextension-tweaks/${webextension_name}.css ]; then sed -i '' "s/${array[1]}/${array[0]}/" "css/userContent-files/webextension-tweaks/${webextension_name}.css" - else - sed -i '' "s/${array[1]}/${array[0]}/" "css/userContent-files/webextension-tweaks/generic_style.css" fi + sed -i '' "s/${array[1]}/${array[0]}/" "css/userContent-files/webextension-tweaks/generic_style.css" done < "internal_UUIDs.txt" From f484ac9220f750f30eec35d4e537ec5af9a25087 Mon Sep 17 00:00:00 2001 From: overdodactyl Date: Sat, 14 Apr 2018 19:25:48 -0600 Subject: [PATCH 04/17] remove extension redundancies --- .../webextension-tweaks/dark_mode.css | 11 +---------- .../webextension-tweaks/decentraleyes.css | 19 ------------------- .../webextension-tweaks/generic_style.css | 8 +++++++- .../webextension-tweaks/smart_https.css | 18 ------------------ 4 files changed, 8 insertions(+), 48 deletions(-) delete mode 100644 css/userContent-files/webextension-tweaks/decentraleyes.css delete mode 100644 css/userContent-files/webextension-tweaks/smart_https.css diff --git a/css/userContent-files/webextension-tweaks/dark_mode.css b/css/userContent-files/webextension-tweaks/dark_mode.css index f0f04e0..cc6f458 100644 --- a/css/userContent-files/webextension-tweaks/dark_mode.css +++ b/css/userContent-files/webextension-tweaks/dark_mode.css @@ -2,20 +2,11 @@ IMPORTANT: change the Internal UUID */ @-moz-document url-prefix("moz-extension://dark_mode_UUID/") { .comment { - color: var(--accent-1)!important - } - label { - color: var(--tone-4)!important + color: var(--in-content-link-color)!important } .title { - color: var(--in-content-page-color)!important; background-color: var(--in-content-category-header-background)!important } - textarea { - color: var(--in-content-page-color)!important; - background-color: var(--in-content-box-background)!important; - border: none!important - } .highlight { background-color: var(--in-content-box-border-color)!important } diff --git a/css/userContent-files/webextension-tweaks/decentraleyes.css b/css/userContent-files/webextension-tweaks/decentraleyes.css deleted file mode 100644 index 6dea68f..0000000 --- a/css/userContent-files/webextension-tweaks/decentraleyes.css +++ /dev/null @@ -1,19 +0,0 @@ -/*! Alters the webextension Decentraleyes - IMPORTANT: change the Internal UUID */ -@-moz-document url-prefix("moz-extension://decentraleyes_UUID/") { - body { - background-color: var(--in-content-box-background)!important; - color: var(--tone-4)!important - } - .panel:not(:last-child), - header { - border-color: var(--tone-5)!important - } - .button { - background-color: var(--in-content-box-background)!important; - border-color: var(--tone-5)!important - } - .button:hover { - background-color: var(--in-content-page-background)!important - } -} diff --git a/css/userContent-files/webextension-tweaks/generic_style.css b/css/userContent-files/webextension-tweaks/generic_style.css index 5636831..85c7e87 100644 --- a/css/userContent-files/webextension-tweaks/generic_style.css +++ b/css/userContent-files/webextension-tweaks/generic_style.css @@ -1,7 +1,8 @@ /* Pop Up Background Fixes */ @-moz-document url-prefix("moz-extension://css_exfil_protection_UUID/popup.html"), url-prefix("moz-extension://https_everywhere_UUID/pages/popup"), - url-prefix("moz-extension://skip_redirect_UUID/") { + url-prefix("moz-extension://decentraleyes_UUID/pages/popup"), + url-prefix("moz-extension://smart_https_UUID/data/data/popup.html") { :root { --in-content-page-background: var(--tone-6)!important; --in-content-box-background: rgba(11,11,12,0.2)!important; @@ -34,6 +35,9 @@ url-prefix("moz-extension://css_exfil_protection_UUID/"), url-prefix("moz-extension://https_everywhere_UUID/"), url-prefix("moz-extension://skip_redirect_UUID/"), + url-prefix("moz-extension://dark_mode_UUID/"), + url-prefix("moz-extension://decentraleyes_UUID/"), + url-prefix("moz-extension://smart_https_UUID/"), url-prefix("moz-extension://generic_styling_1_UUID"), url-prefix("moz-extension://generic_styling_2_UUID"), url-prefix("moz-extension://generic_styling_3_UUID"), @@ -88,6 +92,7 @@ padding-left: 3px !important; } textarea { + margin: 2px 0 2px 0 !important; padding: 5px 5px 5px 5px !important; } button, @@ -101,6 +106,7 @@ border-radius: 3px!important } button:hover, + .button:hover, input[type="submit"]:hover { background-color: var(--in-content-box-background-hover)!important } diff --git a/css/userContent-files/webextension-tweaks/smart_https.css b/css/userContent-files/webextension-tweaks/smart_https.css deleted file mode 100644 index c5be994..0000000 --- a/css/userContent-files/webextension-tweaks/smart_https.css +++ /dev/null @@ -1,18 +0,0 @@ -/*! Alters the webextension Smart HTTPS - IMPORTANT: change the Internal UUID */ -@-moz-document url-prefix("moz-extension://smart_https_UUID/") { - body { - background-color: var(--tone-6)!important; - color: var(--tone-4)!important - } - .information input[type=number], - input[type=text] { - -moz-appearance: none!important; - background: var(--tone-6)!important; - color: var(--tone-4)!important; - border-color: var(--tone-5)!important - } - .information p { - color: var(--tone-4)!important - } -} \ No newline at end of file From 7b27d12231cf1baa133e4a7cf522b9db72d1b9c0 Mon Sep 17 00:00:00 2001 From: overdodactyl Date: Sat, 14 Apr 2018 19:46:21 -0600 Subject: [PATCH 05/17] move code mirror to generic_style --- .../webextension-tweaks/generic_style.css | 149 ++++++++++++++++++ .../webextension-tweaks/ublock_origin.css | 92 ----------- .../webextension-tweaks/umatrix.css | 55 ------- .../webextension-tweaks/violentmonkey.css | 90 ----------- 4 files changed, 149 insertions(+), 237 deletions(-) diff --git a/css/userContent-files/webextension-tweaks/generic_style.css b/css/userContent-files/webextension-tweaks/generic_style.css index 85c7e87..b375169 100644 --- a/css/userContent-files/webextension-tweaks/generic_style.css +++ b/css/userContent-files/webextension-tweaks/generic_style.css @@ -112,3 +112,152 @@ } } + +/* Code Mirror */ +@-moz-document url-prefix("moz-extension://violentmonkey_UUID/"), + url-prefix("moz-extension://ublock_origin_UUID/"), + url-prefix("moz-extension://umatrix_UUID/") { + .CodeMirror { + border: 1px solid #2a2a2c!important; + background: var(--tone-8)!important; + color: #b1b1b3!important; + font-size: 11px!important; + line-height: 14px!important + } + div.CodeMirror-selected { + background: #353b48!important + } + .CodeMirror-line > span > span::selection, + .CodeMirror-line > span::selection, + .CodeMirror-line::selection { + background: #353b48!important + } + .CodeMirror-line > span > span::-moz-selection, + .CodeMirror-line > span::-moz-selection, + .CodeMirror-line::-moz-selection { + background: #353b48!important + } + .CodeMirror-gutters { + background: var(--theme-sidebar-background)!important; + border-right: 0 solid #4a4a4f!important + } + .CodeMirror-guttermarker, + .CodeMirror-guttermarker-subtle { + color: #555!important + } + .CodeMirror-linenumber { + padding: 0 8px 0 5px!important; + color: #58575c!important + } + .CodeMirror-cursor { + border-left: 1px solid!important; + border-color: #fff!important + } + span.cm-comment { + color: #939393!important + } + span.cm-atom, + span.cm-attribute, + span.cm-builtin, + span.cm-error, + span.cm-keyword, + span.cm-quote { + color: #ff7de9!important + } + span.cm-number, + span.cm-string, + span.cm-string-2 { + color: #6b89ff!important + } + span.cm-hr, + span.cm-meta { + color: #939393!important + } + span.cm-header, + span.cm-qualifier, + span.cm-variable-2 { + color: #75bfff!important + } + span.cm-property { + color: #86de74!important + } + span.cm-bracket, + span.cm-def, + span.cm-link:visited, + span.cm-tag { + color: #75bfff!important + } + span.cm-variable { + color: #b98eff!important + } + span.cm-variable-3 { + color: #d7d7db!important + } + span.cm-link { + color: #737373!important + } + span.cm-operator { + color: #b1b1b3!important + } + span.cm-special { + color: #d7d7db!important + } + .CodeMirror-activeline-background { + background: rgba(185,215,253,.15)!important + } + .CodeMirror-matchingbracket { + outline: rgba(255,255,255,.25) solid 1px!important; + color: #fff!important + } + .CodeMirror-merge-l-chunk { + background: var(--tone-7)!important + } + .cm-search-widget { + background-color: var(--theme-sidebar-background)!important; + border: 1px solid; + border-bottom: none!important; + border-color: #2a2a2c!important; + max-height: 15px!important; + justify-content: right!important + } + .cm-search-widget input { + -moz-appearance: none!important; + background-color: rgba(24,29,32,1)!important; + border: 1px solid!important; + border-color: var(--tone-7)!important; + color: var(--tone-4)!important; + border-radius: 8px!important; + padding-left: 8px!important + } + .cm-searching { + background-color: var(--warning-background-color)!important + } + .cm-staticOpt { + background-color: var(--tone-6)!important; + font-weight: 700 + } + .CodeMirror-merge-gap { + background-color: var(--theme-sidebar-background)!important; + border-top: 1px solid!important; + border-bottom: 1px solid!important; + border-right: none!important; + border-left: none!important; + border-color: #2a2a2c!important + } + .CodeMirror-merge { + border: none!important + } + .cm-search-widget span.fa { + color: var(--tone-6)!important; + font-size: 100%!important + } + .cm-staticext { + color: var(--theme-highlight-blue)!important + } + .cm-staticnetBlock { + color: #de7474!important + } + .cm-staticnetAllow { + color: var(--theme-highlight-green)!important + } +} diff --git a/css/userContent-files/webextension-tweaks/ublock_origin.css b/css/userContent-files/webextension-tweaks/ublock_origin.css index 2a8d7e6..4dff029 100644 --- a/css/userContent-files/webextension-tweaks/ublock_origin.css +++ b/css/userContent-files/webextension-tweaks/ublock_origin.css @@ -1,98 +1,6 @@ /*! Alters the webextension uBlock Origin IMPORTANT: change the Internal UUID */ @-moz-document url-prefix("moz-extension://ublock_origin_UUID/") { - .CodeMirror { - border: 1px solid #2a2a2c!important; - background: var(--tone-8)!important; - color: #b1b1b3!important; - font-size: 11px!important; - line-height: 14px!important - } - div.CodeMirror-selected { - background: #353b48!important - } - .CodeMirror-line > span > span::selection, - .CodeMirror-line > span::selection, - .CodeMirror-line::selection { - background: #353b48!important - } - .CodeMirror-line > span > span::-moz-selection, - .CodeMirror-line > span::-moz-selection, - .CodeMirror-line::-moz-selection { - background: #353b48!important - } - .CodeMirror-activeline-background { - background: rgba(185,215,253,.15)!important - } - .CodeMirror-merge-l-chunk { - background: var(--tone-7)!important - } - .cm-search-widget { - background-color: var(--theme-sidebar-background)!important; - border: 1px solid; - border-bottom: none!important; - border-color: #2a2a2c!important; - max-height: 15px!important; - justify-content: right!important - } - .cm-search-widget input { - -moz-appearance: none!important; - background-color: rgba(24,29,32,1)!important; - border: 1px solid!important; - border-color: var(--tone-7)!important; - color: var(--tone-4)!important; - border-radius: 8px!important; - padding-left: 8px!important - } - .cm-searching { - background-color: var(--warning-background-color)!important - } - .cm-staticOpt { - background-color: var(--tone-6)!important; - font-weight: 700 - } - .CodeMirror-merge-gap { - background-color: var(--theme-sidebar-background)!important; - border-top: 1px solid!important; - border-bottom: 1px solid!important; - border-right: none!important; - border-left: none!important; - border-color: #2a2a2c!important - } - .CodeMirror-merge { - border: none!important - } - html body div#userFilters.codeMirrorContainer div div.cm-search-widget span.fa { - color: var(--tone-6)!important; - font-size: 100%!important - } - .CodeMirror-gutters { - background: var(--theme-sidebar-background)!important; - border-right: 0 solid #4a4a4f!important - } - .CodeMirror-guttermarker, - .CodeMirror-guttermarker-subtle { - color: #555!important - } - .CodeMirror-linenumber { - padding: 0 8px 0 5px!important; - color: #58575c!important - } - .CodeMirror-cursor { - border-left: 1px solid #fff!important - } - .cm-comment { - color: #939393!important - } - .cm-staticext { - color: var(--theme-highlight-blue)!important - } - .cm-staticnetBlock { - color: #de7474!important - } - .cm-staticnetAllow { - color: var(--theme-highlight-green)!important - } button.custom { background-color: var(--in-content-page-background)!important; background-image: none!important; diff --git a/css/userContent-files/webextension-tweaks/umatrix.css b/css/userContent-files/webextension-tweaks/umatrix.css index a5fba0b..68a9cfe 100644 --- a/css/userContent-files/webextension-tweaks/umatrix.css +++ b/css/userContent-files/webextension-tweaks/umatrix.css @@ -1,61 +1,6 @@ /*! Alters the webextension uMatrix IMPORTANT: change the Internal UUID */ @-moz-document url-prefix("moz-extension://umatrix_UUID/") { - .CodeMirror { - border: 1px solid #2a2a2c!important; - background: var(--tone-8)!important; - color: #b1b1b3!important; - font-size: 11px!important; - line-height: 14px!important - } - div.CodeMirror-selected { - background: #353b48!important - } - .CodeMirror-line > span > span::selection, - .CodeMirror-line > span::selection, - .CodeMirror-line::selection { - background: #353b48!important - } - .CodeMirror-line > span > span::-moz-selection, - .CodeMirror-line > span::-moz-selection, - .CodeMirror-line::-moz-selection { - background: #353b48!important - } - .CodeMirror-activeline-background { - background: rgba(185,215,253,.15)!important - } - .CodeMirror-merge-l-chunk { - background: var(--tone-7)!important - } - .cm-searching { - background-color: var(--warning-background-color)!important - } - .CodeMirror-merge-gap { - background-color: var(--theme-sidebar-background)!important; - border-top: 1px solid!important; - border-bottom: 1px solid!important; - border-right: none!important; - border-left: none!important; - border-color: #2a2a2c!important - } - .CodeMirror-merge { - border: none!important - } - .CodeMirror-gutters { - background: var(--theme-sidebar-background)!important; - border-right: 0 solid #4a4a4f!important - } - .CodeMirror-guttermarker, - .CodeMirror-guttermarker-subtle { - color: #555!important - } - .CodeMirror-linenumber { - padding: 0 8px 0 5px!important; - color: #58575c!important - } - .CodeMirror-cursor { - border-left: 1px solid #fff!important - } .t81 { color: #fff; background-color: #db4c4c!important diff --git a/css/userContent-files/webextension-tweaks/violentmonkey.css b/css/userContent-files/webextension-tweaks/violentmonkey.css index 210033e..df6fc81 100644 --- a/css/userContent-files/webextension-tweaks/violentmonkey.css +++ b/css/userContent-files/webextension-tweaks/violentmonkey.css @@ -114,94 +114,4 @@ .frame-block { background: var(--in-content-box-background)!important } - .CodeMirror { - border: 1px solid #4a4a4f; - border-radius: 4px!important; - background: #2a2a2e!important; - color: #b1b1b3!important - } - div.CodeMirror-selected { - background: #353b48!important - } - .CodeMirror-line > span > span::selection, - .CodeMirror-line > span::selection, - .CodeMirror-line::selection { - background: #353b48!important - } - .CodeMirror-line > span > span::-moz-selection, - .CodeMirror-line > span::-moz-selection, - .CodeMirror-line::-moz-selection { - background: #353b48!important - } - .CodeMirror-gutters { - background: #2a2a2e!important; - border-right: 0 solid #4a4a4f!important - } - .CodeMirror-guttermarker, - .CodeMirror-guttermarker-subtle { - color: #555!important - } - .CodeMirror-linenumber { - color: #939393!important - } - .CodeMirror-cursor { - border-left: 1px solid!important; - border-color: #fff!important - } - span.cm-comment { - color: #939393!important - } - span.cm-atom, - span.cm-attribute, - span.cm-builtin, - span.cm-error, - span.cm-keyword, - span.cm-quote { - color: #ff7de9!important - } - span.cm-number, - span.cm-string, - span.cm-string-2 { - color: #6b89ff!important - } - span.cm-hr, - span.cm-meta { - color: #939393!important - } - span.cm-header, - span.cm-qualifier, - span.cm-variable-2 { - color: #75bfff!important - } - span.cm-property { - color: #86de74!important - } - span.cm-bracket, - span.cm-def, - span.cm-link:visited, - span.cm-tag { - color: #75bfff!important - } - span.cm-variable { - color: #b98eff!important - } - span.cm-variable-3 { - color: #d7d7db!important - } - span.cm-link { - color: #737373!important - } - span.cm-operator { - color: #b1b1b3!important - } - span.cm-special { - color: #d7d7db!important - } - .CodeMirror-activeline-background { - background: rgba(185,215,253,.15)!important - } - .CodeMirror-matchingbracket { - outline: rgba(255,255,255,.25) solid 1px!important; - color: #fff!important - } } From dd5d55ed78a736da6bdb3eb8c76c9391808c9f63 Mon Sep 17 00:00:00 2001 From: overdodactyl Date: Sat, 14 Apr 2018 20:13:37 -0600 Subject: [PATCH 06/17] variables for code mirror --- css/common-files/color_variables.css | 14 ++- .../webextension-tweaks/generic_style.css | 86 ++++++++----------- 2 files changed, 49 insertions(+), 51 deletions(-) diff --git a/css/common-files/color_variables.css b/css/common-files/color_variables.css index 0f09f6f..14fa6ec 100644 --- a/css/common-files/color_variables.css +++ b/css/common-files/color_variables.css @@ -60,7 +60,7 @@ --theme-highlight-bluegrey: #5e88b0; --theme-highlight-lightorange: #d99b28; --theme-highlight-orange: #d96629; - --theme-highlight-pink: #FF7DE9; + --theme-highlight-pink: #df80ff; --tone-1: var(--grey-10); --tone-2: var(--grey-20); --tone-3: var(--grey-30); @@ -113,7 +113,17 @@ --in-content-dark-header-background: var(--tone-9)!important; --secure-connection-color: var(--accent-1); --theme-sidebar-background: #1B1B1D!important; + --cm-background: var(--tone-8)!important; + --cm-selection: #353b48!important; + --cm-marker: #555 !important; + --cm-linenumber:#58575c!important; + --cm-cursor:#fff!important; + --cm-active-line-background: rgba(185,215,253,.15)!important; + --cm-matching-bracket: rgba(255,255,255,.25) !important; + --cm-search-background: rgba(24,29,32,1) !important; + --cm-red: #de7474!important; --start-indicator-for-updater-scripts: black; --end-indicator-for-updater-scripts: black; --dummy-variable-for-updater-scripys: black -} \ No newline at end of file + +} diff --git a/css/userContent-files/webextension-tweaks/generic_style.css b/css/userContent-files/webextension-tweaks/generic_style.css index b375169..8e4f372 100644 --- a/css/userContent-files/webextension-tweaks/generic_style.css +++ b/css/userContent-files/webextension-tweaks/generic_style.css @@ -118,42 +118,38 @@ url-prefix("moz-extension://ublock_origin_UUID/"), url-prefix("moz-extension://umatrix_UUID/") { .CodeMirror { - border: 1px solid #2a2a2c!important; - background: var(--tone-8)!important; + border: 1px solid !important; + border-color: var(--cm-background)!important; + background: var(--cm-background)!important; color: #b1b1b3!important; font-size: 11px!important; line-height: 14px!important } - div.CodeMirror-selected { - background: #353b48!important - } + div.CodeMirror-selected, .CodeMirror-line > span > span::selection, .CodeMirror-line > span::selection, .CodeMirror-line::selection { - background: #353b48!important - } - .CodeMirror-line > span > span::-moz-selection, - .CodeMirror-line > span::-moz-selection, - .CodeMirror-line::-moz-selection { - background: #353b48!important + background: var(--cm-selection)!important } .CodeMirror-gutters { background: var(--theme-sidebar-background)!important; - border-right: 0 solid #4a4a4f!important + border-right: 0 solid var(--in-content-border-color)!important } .CodeMirror-guttermarker, .CodeMirror-guttermarker-subtle { - color: #555!important + color: var(--cm-marker)!important } .CodeMirror-linenumber { padding: 0 8px 0 5px!important; - color: #58575c!important + color: var(--cm-linenumber)!important } .CodeMirror-cursor { border-left: 1px solid!important; - border-color: #fff!important + border-color: var(--cm-cursor)!important } - span.cm-comment { + span.cm-comment, + span.cm-hr, + span.cm-meta { color: #939393!important } span.cm-atom, @@ -162,70 +158,62 @@ span.cm-error, span.cm-keyword, span.cm-quote { - color: #ff7de9!important + color: var(--theme-highlight-red)!important } span.cm-number, span.cm-string, span.cm-string-2 { color: #6b89ff!important } - span.cm-hr, - span.cm-meta { - color: #939393!important - } span.cm-header, span.cm-qualifier, - span.cm-variable-2 { - color: #75bfff!important - } - span.cm-property { - color: #86de74!important - } + span.cm-variable-2, span.cm-bracket, span.cm-def, span.cm-link:visited, span.cm-tag { - color: #75bfff!important + color: var(--theme-highlight-blue)!important + } + span.cm-property { + color: var(--theme-highlight-green)!important } span.cm-variable { - color: #b98eff!important + color: var(--theme-highlight-purple)!important } - span.cm-variable-3 { - color: #d7d7db!important + span.cm-variable-3, + span.cm-special { + color: var(--in-content-text-color)!important } span.cm-link { - color: #737373!important + color: var(--in-content-box-border-color)!important } span.cm-operator { - color: #b1b1b3!important - } - span.cm-special { - color: #d7d7db!important + color: var(--in-content-page-color)!important } .CodeMirror-activeline-background { - background: rgba(185,215,253,.15)!important + background: var(--cm-active-line-background)!important } .CodeMirror-matchingbracket { - outline: rgba(255,255,255,.25) solid 1px!important; - color: #fff!important + outline: var(--cm-matching-bracket) solid 1px!important; + color: var(--cm-cursor)!important } .CodeMirror-merge-l-chunk { - background: var(--tone-7)!important + background: var(--in-content-page-background)!important } .cm-search-widget { background-color: var(--theme-sidebar-background)!important; border: 1px solid; border-bottom: none!important; - border-color: #2a2a2c!important; + border-color: var(--in-content-category-header-background)!important; max-height: 15px!important; justify-content: right!important } .cm-search-widget input { -moz-appearance: none!important; - background-color: rgba(24,29,32,1)!important; + background-color: var(--cm-search-background)!important; border: 1px solid!important; - border-color: var(--tone-7)!important; - color: var(--tone-4)!important; + border-color: var(--in-content-table-border-dark-color)!important; + color: var(--in-content-page-color)!important; border-radius: 8px!important; padding-left: 8px!important } @@ -233,29 +221,29 @@ background-color: var(--warning-background-color)!important } .cm-staticOpt { - background-color: var(--tone-6)!important; + background-color: var(--in-content-box-background)!important; font-weight: 700 } .CodeMirror-merge-gap { - background-color: var(--theme-sidebar-background)!important; + background-color: var(--in-content-category-header-background)!important; border-top: 1px solid!important; border-bottom: 1px solid!important; border-right: none!important; border-left: none!important; - border-color: #2a2a2c!important + border-color: var(--cm-background)!important } .CodeMirror-merge { border: none!important } .cm-search-widget span.fa { - color: var(--tone-6)!important; + color: var(--in-content-border-color)!important; font-size: 100%!important } .cm-staticext { color: var(--theme-highlight-blue)!important } .cm-staticnetBlock { - color: #de7474!important + color: var(--cm-red)!important } .cm-staticnetAllow { color: var(--theme-highlight-green)!important From 8c46ab8ce3c502cdf2ceaa469bb9d2f3c9933886 Mon Sep 17 00:00:00 2001 From: overdodactyl Date: Sat, 14 Apr 2018 20:34:44 -0600 Subject: [PATCH 07/17] settings page for Mind the Time addon #101 --- css/userContent-files/webextension-tweaks/generic_style.css | 4 +++- scripts/webextension_mappings.txt | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/css/userContent-files/webextension-tweaks/generic_style.css b/css/userContent-files/webextension-tweaks/generic_style.css index 8e4f372..25696d3 100644 --- a/css/userContent-files/webextension-tweaks/generic_style.css +++ b/css/userContent-files/webextension-tweaks/generic_style.css @@ -38,6 +38,7 @@ url-prefix("moz-extension://dark_mode_UUID/"), url-prefix("moz-extension://decentraleyes_UUID/"), url-prefix("moz-extension://smart_https_UUID/"), + url-prefix("moz-extension://mind_the_time_UUID/options/options"), url-prefix("moz-extension://generic_styling_1_UUID"), url-prefix("moz-extension://generic_styling_2_UUID"), url-prefix("moz-extension://generic_styling_3_UUID"), @@ -96,10 +97,11 @@ padding: 5px 5px 5px 5px !important; } button, + .button, input[type="submit"] { -moz-appearance: none!important; background-image: none!important; - + background-color: var(--in-content-page-background) !important; color: var(--in-content-page-color)!important; border: 1px solid!important; border-color: var(--in-content-box-border-color)!important; diff --git a/scripts/webextension_mappings.txt b/scripts/webextension_mappings.txt index 9919983..fc034ff 100644 --- a/scripts/webextension_mappings.txt +++ b/scripts/webextension_mappings.txt @@ -7,6 +7,7 @@ custom_titlebar_text|{b5a43a70-4092-4899-9c44-63799150b35e} dark_mode|{174b2d58-b983-4501-ab4b-07e71203cb43} decentraleyes|jid1-BoFifL9Vbdl2zQ@jetpack https_everywhere|https-everywhere@eff.org +mind_the_time|jid0-HYNmqxA9zQGfJADREri4n2AHKSI@jetpack multi_account_containers|@testpilot-containers multiple_tab_handler|multipletab@piro.sakura.ne.jp neat_url|neaturl@hugsmile.eu From 8c5e3cb6b373f81764c62c03583ad00a864e5a90 Mon Sep 17 00:00:00 2001 From: overdodactyl Date: Sat, 14 Apr 2018 20:52:14 -0600 Subject: [PATCH 08/17] remove redundancies in TST --- .../webextension-tweaks/generic_style.css | 8 +++----- .../webextension-tweaks/tree_style_tab.css | 15 --------------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/css/userContent-files/webextension-tweaks/generic_style.css b/css/userContent-files/webextension-tweaks/generic_style.css index 25696d3..24ee56f 100644 --- a/css/userContent-files/webextension-tweaks/generic_style.css +++ b/css/userContent-files/webextension-tweaks/generic_style.css @@ -1,4 +1,4 @@ -/* Pop Up Background Fixes */ +/*! Pop Up Background Fixes */ @-moz-document url-prefix("moz-extension://css_exfil_protection_UUID/popup.html"), url-prefix("moz-extension://https_everywhere_UUID/pages/popup"), url-prefix("moz-extension://decentraleyes_UUID/pages/popup"), @@ -20,7 +20,6 @@ input { margin-left: 0px !important; } - } @-moz-document url-prefix("moz-extension://1_click_youtube_video_downloader_UUID"), @@ -39,6 +38,7 @@ url-prefix("moz-extension://decentraleyes_UUID/"), url-prefix("moz-extension://smart_https_UUID/"), url-prefix("moz-extension://mind_the_time_UUID/options/options"), + url-prefix("moz-extension://tree_style_tab_UUID/options/options"), url-prefix("moz-extension://generic_styling_1_UUID"), url-prefix("moz-extension://generic_styling_2_UUID"), url-prefix("moz-extension://generic_styling_3_UUID"), @@ -77,7 +77,6 @@ input[type="file"] { background-color: var(--in-content-page-background)!important; } - textarea, input[type="input"], input[type="text"], @@ -112,10 +111,9 @@ input[type="submit"]:hover { background-color: var(--in-content-box-background-hover)!important } - } -/* Code Mirror */ +/*! Code Mirror */ @-moz-document url-prefix("moz-extension://violentmonkey_UUID/"), url-prefix("moz-extension://ublock_origin_UUID/"), url-prefix("moz-extension://umatrix_UUID/") { diff --git a/css/userContent-files/webextension-tweaks/tree_style_tab.css b/css/userContent-files/webextension-tweaks/tree_style_tab.css index 263f410..9df5a8a 100644 --- a/css/userContent-files/webextension-tweaks/tree_style_tab.css +++ b/css/userContent-files/webextension-tweaks/tree_style_tab.css @@ -27,17 +27,6 @@ a { color: var(--accent-2)!important } - #autoGroupNewTabsDelayOnNewWindow, - #autoGroupNewTabsTimeout, - #importedConfigsFromLegacy, - #importedTreeStructureFromLegacy, - #legacyConfigsNextMigrationVersion, - #userStyleRules { - -moz-appearance: none!important; - background: var(--tone-6)!important; - color: var(--tone-4)!important; - border-color: var(--tone-5)!important - } #contextual-identities-selector, #newtab-action-selector, #tabContextMenu, @@ -48,10 +37,6 @@ .menu-ui-59858.menu-ui.menu li.separator { border-color: var(--in-content-box-border-color)!important } - fieldset { - border: 2px solid!important; - border-color: var(--in-content-box-border-color)!important - } :root { background-color: var(--in-content-page-background)!important } From d2600d853f9a60984f626fa83340fde7fb4a0523 Mon Sep 17 00:00:00 2001 From: overdodactyl Date: Sat, 14 Apr 2018 21:04:32 -0600 Subject: [PATCH 09/17] google_translator_for_firefox_UUID about:addons --- css/userContent-files/webextension-tweaks/generic_style.css | 1 + scripts/webextension_mappings.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/css/userContent-files/webextension-tweaks/generic_style.css b/css/userContent-files/webextension-tweaks/generic_style.css index 24ee56f..749fe38 100644 --- a/css/userContent-files/webextension-tweaks/generic_style.css +++ b/css/userContent-files/webextension-tweaks/generic_style.css @@ -39,6 +39,7 @@ url-prefix("moz-extension://smart_https_UUID/"), url-prefix("moz-extension://mind_the_time_UUID/options/options"), url-prefix("moz-extension://tree_style_tab_UUID/options/options"), + url-prefix("moz-extension://google_translator_for_firefox_UUID"), url-prefix("moz-extension://generic_styling_1_UUID"), url-prefix("moz-extension://generic_styling_2_UUID"), url-prefix("moz-extension://generic_styling_3_UUID"), diff --git a/scripts/webextension_mappings.txt b/scripts/webextension_mappings.txt index fc034ff..d48fb3d 100644 --- a/scripts/webextension_mappings.txt +++ b/scripts/webextension_mappings.txt @@ -6,6 +6,7 @@ cookie_autodelete|CookieAutoDelete@kennydo.com custom_titlebar_text|{b5a43a70-4092-4899-9c44-63799150b35e} dark_mode|{174b2d58-b983-4501-ab4b-07e71203cb43} decentraleyes|jid1-BoFifL9Vbdl2zQ@jetpack +google_translator_for_firefox|translator@zoli.bod https_everywhere|https-everywhere@eff.org mind_the_time|jid0-HYNmqxA9zQGfJADREri4n2AHKSI@jetpack multi_account_containers|@testpilot-containers From a7321c173f79a8a534889515ef865692afcefb5b Mon Sep 17 00:00:00 2001 From: overdodactyl Date: Sat, 14 Apr 2018 21:07:30 -0600 Subject: [PATCH 10/17] remove unneeded imports --- userContent_imports.css | 8 -------- 1 file changed, 8 deletions(-) diff --git a/userContent_imports.css b/userContent_imports.css index 18f55d5..3f09dc5 100644 --- a/userContent_imports.css +++ b/userContent_imports.css @@ -18,18 +18,10 @@ @import "css/userContent-files/webextension-tweaks/brief.css"; @import "css/userContent-files/webextension-tweaks/cookie_autodelete.css"; @import "css/userContent-files/webextension-tweaks/dark_mode.css"; -@import "css/userContent-files/webextension-tweaks/decentraleyes.css"; -@import "css/userContent-files/webextension-tweaks/https_everywhere.css"; @import "css/userContent-files/webextension-tweaks/multi_account_containers.css"; -@import "css/userContent-files/webextension-tweaks/multiple_tab_handler.css"; -@import "css/userContent-files/webextension-tweaks/neat_url.css"; @import "css/userContent-files/webextension-tweaks/noscript.css"; @import "css/userContent-files/webextension-tweaks/pocket.css"; @import "css/userContent-files/webextension-tweaks/request_control.css"; -@import "css/userContent-files/webextension-tweaks/skip_redirect.css"; -@import "css/userContent-files/webextension-tweaks/smart_https.css"; -@import "css/userContent-files/webextension-tweaks/smart_referer.css"; -@import "css/userContent-files/webextension-tweaks/tab_suspender.css"; @import "css/userContent-files/webextension-tweaks/tree_style_tab.css"; @import "css/userContent-files/webextension-tweaks/tridactyl.css"; @import "css/userContent-files/webextension-tweaks/ublock_origin.css"; From e4d3072221fe3876db8791ff5996fc46d41be14d Mon Sep 17 00:00:00 2001 From: overdodactyl Date: Sat, 14 Apr 2018 21:17:20 -0600 Subject: [PATCH 11/17] enhancer for youtube about:addons --- css/userContent-files/webextension-tweaks/generic_style.css | 1 + scripts/webextension_mappings.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/css/userContent-files/webextension-tweaks/generic_style.css b/css/userContent-files/webextension-tweaks/generic_style.css index 749fe38..bbd0973 100644 --- a/css/userContent-files/webextension-tweaks/generic_style.css +++ b/css/userContent-files/webextension-tweaks/generic_style.css @@ -40,6 +40,7 @@ url-prefix("moz-extension://mind_the_time_UUID/options/options"), url-prefix("moz-extension://tree_style_tab_UUID/options/options"), url-prefix("moz-extension://google_translator_for_firefox_UUID"), + url-prefix("moz-extension://enhancer_for_youtube_UUID/options.html"), url-prefix("moz-extension://generic_styling_1_UUID"), url-prefix("moz-extension://generic_styling_2_UUID"), url-prefix("moz-extension://generic_styling_3_UUID"), diff --git a/scripts/webextension_mappings.txt b/scripts/webextension_mappings.txt index d48fb3d..98c9c4c 100644 --- a/scripts/webextension_mappings.txt +++ b/scripts/webextension_mappings.txt @@ -6,6 +6,7 @@ cookie_autodelete|CookieAutoDelete@kennydo.com custom_titlebar_text|{b5a43a70-4092-4899-9c44-63799150b35e} dark_mode|{174b2d58-b983-4501-ab4b-07e71203cb43} decentraleyes|jid1-BoFifL9Vbdl2zQ@jetpack +enhancer_for_youtube_UUID|enhancerforyoutube@maximerf.addons.mozilla.org google_translator_for_firefox|translator@zoli.bod https_everywhere|https-everywhere@eff.org mind_the_time|jid0-HYNmqxA9zQGfJADREri4n2AHKSI@jetpack From 95eb1197c90dfc6b2461ed4e9351f58cd5440017 Mon Sep 17 00:00:00 2001 From: overdodactyl Date: Sat, 14 Apr 2018 21:21:53 -0600 Subject: [PATCH 12/17] flash and video download about:addons --- css/userContent-files/webextension-tweaks/generic_style.css | 1 + scripts/webextension_mappings.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/css/userContent-files/webextension-tweaks/generic_style.css b/css/userContent-files/webextension-tweaks/generic_style.css index bbd0973..29bb08f 100644 --- a/css/userContent-files/webextension-tweaks/generic_style.css +++ b/css/userContent-files/webextension-tweaks/generic_style.css @@ -41,6 +41,7 @@ url-prefix("moz-extension://tree_style_tab_UUID/options/options"), url-prefix("moz-extension://google_translator_for_firefox_UUID"), url-prefix("moz-extension://enhancer_for_youtube_UUID/options.html"), + url-prefix("moz-extension://flash_and_video_download_UUID/html/options.html"), url-prefix("moz-extension://generic_styling_1_UUID"), url-prefix("moz-extension://generic_styling_2_UUID"), url-prefix("moz-extension://generic_styling_3_UUID"), diff --git a/scripts/webextension_mappings.txt b/scripts/webextension_mappings.txt index 98c9c4c..aef1d1b 100644 --- a/scripts/webextension_mappings.txt +++ b/scripts/webextension_mappings.txt @@ -7,6 +7,7 @@ custom_titlebar_text|{b5a43a70-4092-4899-9c44-63799150b35e} dark_mode|{174b2d58-b983-4501-ab4b-07e71203cb43} decentraleyes|jid1-BoFifL9Vbdl2zQ@jetpack enhancer_for_youtube_UUID|enhancerforyoutube@maximerf.addons.mozilla.org +flash_and_video_download_UUID|{bee6eb20-01e0-ebd1-da83-080329fb9a3a} google_translator_for_firefox|translator@zoli.bod https_everywhere|https-everywhere@eff.org mind_the_time|jid0-HYNmqxA9zQGfJADREri4n2AHKSI@jetpack From f4f80ca12e2b2d26d722d11b5158666c0dcc057a Mon Sep 17 00:00:00 2001 From: overdodactyl Date: Sat, 14 Apr 2018 22:06:22 -0600 Subject: [PATCH 13/17] add compatibility for more webextensions --- .../webextension-tweaks/generic_style.css | 9 ++++++++- scripts/webextension_mappings.txt | 6 ++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/css/userContent-files/webextension-tweaks/generic_style.css b/css/userContent-files/webextension-tweaks/generic_style.css index 29bb08f..e2ca375 100644 --- a/css/userContent-files/webextension-tweaks/generic_style.css +++ b/css/userContent-files/webextension-tweaks/generic_style.css @@ -2,7 +2,8 @@ @-moz-document url-prefix("moz-extension://css_exfil_protection_UUID/popup.html"), url-prefix("moz-extension://https_everywhere_UUID/pages/popup"), url-prefix("moz-extension://decentraleyes_UUID/pages/popup"), - url-prefix("moz-extension://smart_https_UUID/data/data/popup.html") { + url-prefix("moz-extension://smart_https_UUID/data/data/popup.html"), + url-prefix("moz-extension://rename_tab_title_UUID/popup/popup.html") { :root { --in-content-page-background: var(--tone-6)!important; --in-content-box-background: rgba(11,11,12,0.2)!important; @@ -42,6 +43,12 @@ url-prefix("moz-extension://google_translator_for_firefox_UUID"), url-prefix("moz-extension://enhancer_for_youtube_UUID/options.html"), url-prefix("moz-extension://flash_and_video_download_UUID/html/options.html"), + url-prefix("moz-extension://back_to_close_we_UUID/"), + url-prefix("moz-extension://containers_on_the_go_UUID/"), + url-prefix("moz-extension://new_tab_from_location_bar_UUID/"), + url-prefix("moz-extension://tab_auto_close_UUID/"), + url-prefix("moz-extension://display_anchors_UUID/"), + url-prefix("moz-extension://rename_tab_title_UUID/"), url-prefix("moz-extension://generic_styling_1_UUID"), url-prefix("moz-extension://generic_styling_2_UUID"), url-prefix("moz-extension://generic_styling_3_UUID"), diff --git a/scripts/webextension_mappings.txt b/scripts/webextension_mappings.txt index aef1d1b..4629bfb 100644 --- a/scripts/webextension_mappings.txt +++ b/scripts/webextension_mappings.txt @@ -1,11 +1,14 @@ 1_click_youtube_video_downloader|YoutubeDownloader@PeterOlayev.com autocopy|autocopy@mozilla.org +back_to_close_we|back2close@bomjacob.github.io brief|brief@mozdev.org +containers_on_the_go|{7e56c1ad-71c3-47fe-bdba-372c7770e0cb} css_exfil_protection|{7fc8ef53-24ec-4205-87a4-1e745953bb0d} cookie_autodelete|CookieAutoDelete@kennydo.com custom_titlebar_text|{b5a43a70-4092-4899-9c44-63799150b35e} dark_mode|{174b2d58-b983-4501-ab4b-07e71203cb43} decentraleyes|jid1-BoFifL9Vbdl2zQ@jetpack +display_anchors|display-anchors@robwu.nl enhancer_for_youtube_UUID|enhancerforyoutube@maximerf.addons.mozilla.org flash_and_video_download_UUID|{bee6eb20-01e0-ebd1-da83-080329fb9a3a} google_translator_for_firefox|translator@zoli.bod @@ -14,12 +17,15 @@ mind_the_time|jid0-HYNmqxA9zQGfJADREri4n2AHKSI@jetpack multi_account_containers|@testpilot-containers multiple_tab_handler|multipletab@piro.sakura.ne.jp neat_url|neaturl@hugsmile.eu +new_tab_from_location_bar|newtabfromlocationbar@piro.sakura.ne.jp noscript|{73a6fe31-595d-460b-a920-fcc0f8843232} octopatcher|octopatcher_wowmotty@gmail.com +rename_tab_title|renametabtitle@mozilla.org request_control|{1b1e6108-2d88-4f0f-a338-01f9dbcccd6f} skip_redirect|skipredirect@sblask smart_https|{b3e677f4-1150-4387-8629-da738260a48e} smart_referer|smart-referer@meh.paranoid.pk +tab_auto_close|mobislan@users.noreply.github.com tab_suspender|{e225ac78-5e83-484b-a16b-b6ed0924212f} text_link|{54BB9F3F-07E5-486c-9B39-C7398B99391C} tree_style_tab|treestyletab@piro.sakura.ne.jp From 5e2652db498f38d653020632969bd5f8b8972f1a Mon Sep 17 00:00:00 2001 From: overdodactyl Date: Sun, 15 Apr 2018 00:34:53 -0600 Subject: [PATCH 14/17] improvements ro request control and open in new tab --- .../webextension-tweaks/generic_style.css | 10 +- .../webextension-tweaks/request_control.css | 96 +++++++++---------- scripts/webextension_mappings.txt | 1 + 3 files changed, 58 insertions(+), 49 deletions(-) diff --git a/css/userContent-files/webextension-tweaks/generic_style.css b/css/userContent-files/webextension-tweaks/generic_style.css index e2ca375..49f5f53 100644 --- a/css/userContent-files/webextension-tweaks/generic_style.css +++ b/css/userContent-files/webextension-tweaks/generic_style.css @@ -3,7 +3,8 @@ url-prefix("moz-extension://https_everywhere_UUID/pages/popup"), url-prefix("moz-extension://decentraleyes_UUID/pages/popup"), url-prefix("moz-extension://smart_https_UUID/data/data/popup.html"), - url-prefix("moz-extension://rename_tab_title_UUID/popup/popup.html") { + url-prefix("moz-extension://rename_tab_title_UUID/popup/popup.html"), + url-prefix("moz-extension://open_in_new_tab_UUID/popup") { :root { --in-content-page-background: var(--tone-6)!important; --in-content-box-background: rgba(11,11,12,0.2)!important; @@ -47,6 +48,7 @@ url-prefix("moz-extension://containers_on_the_go_UUID/"), url-prefix("moz-extension://new_tab_from_location_bar_UUID/"), url-prefix("moz-extension://tab_auto_close_UUID/"), + url-prefix("moz-extension://open_in_new_tab_UUID/"), url-prefix("moz-extension://display_anchors_UUID/"), url-prefix("moz-extension://rename_tab_title_UUID/"), url-prefix("moz-extension://generic_styling_1_UUID"), @@ -101,6 +103,12 @@ margin-left: 3px !important; padding-left: 3px !important; } + input:checked + .slider { + background-color: var(--in-content-primary-button-background) !important; + } + input:not(:checked) + .slider { + background-color: var(--in-content-box-background) !important; + } textarea { margin: 2px 0 2px 0 !important; padding: 5px 5px 5px 5px !important; diff --git a/css/userContent-files/webextension-tweaks/request_control.css b/css/userContent-files/webextension-tweaks/request_control.css index 0fe29b9..ccdb9ff 100644 --- a/css/userContent-files/webextension-tweaks/request_control.css +++ b/css/userContent-files/webextension-tweaks/request_control.css @@ -1,75 +1,75 @@ /*! Alters the webextension Request Control IMPORTANT: change the Internal UUID */ @-moz-document url-prefix("moz-extension://request_control_UUID/") { + * { + color: var(--in-content-page-color) !important; + } + body { - background-color: var(--tone-7)!important; - color: var(--tone-4)!important + background-color: var(--in-content-page-background)!important; + } + hr, + .page-header{ + border-color: var(--in-content-box-border-color)!important + } + .nav-tabs.nav-justified > li > a { + border-bottom-color: var(--in-content-box-border-color)!important + } + .badge { + color: var(--in-content-text-color) !important; } .rule:not(.editing):not(:hover) { - background-color: var(--tone-6)!important; - border-color: var(--tone-5)!important + background-color: var(--in-content-box-background)!important; } - .rule:hover:not(.editing) { - background-color: var(--tone-8)!important; - border-color: var(--tone-5)!important + .rule:hover:not(.editing), + .list-group-item, + .editing .rule-header{ + background-color: var(--in-content-box-background-hover)!important; + border-color: var(--in-content-box-border-color)!important } .nav-tabs > li.active > a, .nav-tabs > li.active > a:focus, - .nav-tabs > li.active > a:hover { - color: var(--tone-4)!important; - background-color: var(--tone-8)!important; - border-color: var(--tone-5)!important - } - .nav-tabs > li > a:hover { - background-color: var(--tone-8)!important; - border: 1px solid!important + .nav-tabs > li.active > a:hover, + .nav-tabs > li > a:hover{ + background-color: var(--in-content-category-header-background)!important; + border-color: var(--in-content-box-border-color)!important } tabs.nav-justified > li > a { - border-bottom: 1px solid!important + border-bottom: 1px solid!important; + border-color: var(--in-content-box-border-color)!important } .btn-default { - color: var(--tone-4)!important; - background-color: var(--tone-8)!important; - border-color: var(--tone-5)!important + background-color: var(--in-content-page-background)!important; + border-color: var(--in-content-box-border-color)!important } .btn-default.active { - background-color: var(--tone-6)!important + background-color: var(--in-content-box-background-active)!important } .btn-default:hover { - color: var(--tone-4)!important; - background-color: var(--tone-5)!important; - border-color: var(--tone-5)!important + background-color: var(--in-content-box-background-hover)!important } .list-group-item:first-child { - background: var(--tone-6)!important; - border-color: var(--tone-5)!important - } - .table { - background: var(--tone-6)!important + background: var(--in-content-box-background)!important; + border-color: var(--in-content-box-border-color)!important } + .table, .table-striped > tbody > tr:nth-of-type(2n+1) { - background-color: var(--tone-8)!important + background-color: var(--in-content-box-background)!important } - .btn-group-params > .tags-input, - .input-group .form-control:first-child, - .input-group-addon:first-child, - .input-group-btn:first-child > .btn, - .input-group-btn:first-child > .btn-group > .btn, - .input-group-btn:first-child > .dropdown-toggle, - .input-group-btn:last-child > .btn-group:not(:last-child) > .btn, - .input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle), - select.input-sm { - background: var(--tone-5)!important; - color: var(--grey-30)!important; - border-color: var(--tone-4)!important - } - .list-group-item { - background-color: var(--tone-6)!important; - border: 1px solid #ddd + input[type="text"], + select, + .tags-input { + background: var(--in-content-page-background)!important; + color: var(--in-content-text-color)!important; + border-color: var(--in-content-box-border-color)!important } .tags-input .tag { - background: var(--tone-8)!important; - border-color: var(--tone-5)!important; - color: var(--tone-4)!important + background: var(--in-content-item-selected)!important; + border-color: var(--in-content-box-border-color)!important; } + img.arrow, + button img{ + filter: invert(65%) !important; + } + } diff --git a/scripts/webextension_mappings.txt b/scripts/webextension_mappings.txt index 4629bfb..c2cc661 100644 --- a/scripts/webextension_mappings.txt +++ b/scripts/webextension_mappings.txt @@ -20,6 +20,7 @@ neat_url|neaturl@hugsmile.eu new_tab_from_location_bar|newtabfromlocationbar@piro.sakura.ne.jp noscript|{73a6fe31-595d-460b-a920-fcc0f8843232} octopatcher|octopatcher_wowmotty@gmail.com +open_in_new_tab|{6f5f4891-9637-41f9-9ee5-3a0ac02cf254} rename_tab_title|renametabtitle@mozilla.org request_control|{1b1e6108-2d88-4f0f-a338-01f9dbcccd6f} skip_redirect|skipredirect@sblask From c9e5626be631521e3ae48e52c2e9937b0c222a83 Mon Sep 17 00:00:00 2001 From: overdodactyl Date: Sun, 15 Apr 2018 11:59:47 -0600 Subject: [PATCH 15/17] add variables --- .../webextension-tweaks/pocket.css | 40 +++++++------------ .../webextension-tweaks/tridactyl.css | 10 ++--- .../webextension-tweaks/ublock_origin.css | 6 +-- 3 files changed, 21 insertions(+), 35 deletions(-) diff --git a/css/userContent-files/webextension-tweaks/pocket.css b/css/userContent-files/webextension-tweaks/pocket.css index 57691af..c5c990d 100644 --- a/css/userContent-files/webextension-tweaks/pocket.css +++ b/css/userContent-files/webextension-tweaks/pocket.css @@ -1,33 +1,23 @@ -.pkt_ext_containersaved h2 { - color: var(--tone-4)!important +.pkt_ext_containersaved h2, +.pkt_ext_containersaved .pkt_ext_tag_input_wrapper input::placeholder, +.token-input-dropdown-tag ul li { + color: var(--in-content-page-color)!important } -.pkt_ext_containersaved .pkt_ext_tag_detail { - border-color: var(--tone-5)!important; - background: var(--tone-6)!important -} -.pkt_ext_containersaved .pkt_ext_tag_input_wrapper { - background-color: var(--tone-6)!important; - border-color: var(--tone-5)!important -} -.pkt_ext_containersaved .pkt_ext_tag_input_wrapper input::placeholder { - color: var(--tone-4)!important +.pkt_ext_containersaved .pkt_ext_tag_detail, +.pkt_ext_containersaved .pkt_ext_tag_input_wrapper, +.token-input-dropdown-tag { + border-color: var(--in-content-box-border-color)!important; + background: var(--in-content-box-background)!important } .pkt_ext_containersaved .pkt_ext_tag_input_wrapper input { - background-color: var(--tone-6)!important; - color: var(--tone-4)!important + background-color: var(--in-content-box-background)!important; + color: var(--in-content-page-color)!important } .pkt_ext_containersaved .pkt_ext_btn { - background: var(--tone-8)!important + background: var(--in-content-category-header-background)!important } .pkt_ext_containersaved .token-input-token { - border-color: var(--tone-5)!important; - background-color: var(--tone-7)!important; - color: var(--tone-4)!important + border-color: var(--in-content-box-border-color)!important; + background-color: var(--in-content-table-border-dark-color)!important; + color: var(--in-content-page-color)!important } -.token-input-dropdown-tag { - background: var(--tone-6)!important; - border-color: var(--tone-5)!important -} -.token-input-dropdown-tag ul li { - color: var(--tone-4)!important -} \ No newline at end of file diff --git a/css/userContent-files/webextension-tweaks/tridactyl.css b/css/userContent-files/webextension-tweaks/tridactyl.css index d29209c..9791c2d 100644 --- a/css/userContent-files/webextension-tweaks/tridactyl.css +++ b/css/userContent-files/webextension-tweaks/tridactyl.css @@ -15,8 +15,9 @@ background: var(--in-content-category-header-background)!important; border-color: var(--in-content-category-header-background)!important } - body { - color: var(--tone-4)!important + body, + table { + color: var(--in-content-page-color)!important } a:link { color: var(--in-content-link-color)!important @@ -28,10 +29,7 @@ #completions { overflow: visible!important; background: var(--in-content-page-background)!important; - border-color: var(--tone-5)!important - } - table { - color: var(--tone-4)!important + border-color: var(--in-content-box-border-color)!important } .option:not(.focused) .url { color: var(--code-green)!important; diff --git a/css/userContent-files/webextension-tweaks/ublock_origin.css b/css/userContent-files/webextension-tweaks/ublock_origin.css index 4dff029..c2fced8 100644 --- a/css/userContent-files/webextension-tweaks/ublock_origin.css +++ b/css/userContent-files/webextension-tweaks/ublock_origin.css @@ -80,7 +80,8 @@ color: var(--tone-2)!important } #extraTools, - h2 { + h2, + #extraTools > span > span.badge { background-color: var(--tone-8)!important; color: var(--tone-4)!important } @@ -88,9 +89,6 @@ background-color: var(--tone-8)!important; border-color: var(--tone-5)!important } - #extraTools > span > span.badge { - color: var(--tone-4)!important - } #firewallContainer > div { background-color: var(--tone-6)!important } From da88c9f331a4df07105120849d31e376c8cdd1cf Mon Sep 17 00:00:00 2001 From: overdodactyl Date: Sun, 15 Apr 2018 13:27:03 -0600 Subject: [PATCH 16/17] overflow error --- .../multi_account_containers.css | 26 +++++++++---------- .../webextension-tweaks/tridactyl.css | 1 - 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/css/userContent-files/webextension-tweaks/multi_account_containers.css b/css/userContent-files/webextension-tweaks/multi_account_containers.css index e02f3fd..715556e 100644 --- a/css/userContent-files/webextension-tweaks/multi_account_containers.css +++ b/css/userContent-files/webextension-tweaks/multi_account_containers.css @@ -4,17 +4,17 @@ #current-tab, .column-panel-content, html body div#container-panel.panel.container-panel { - background: var(--tone-6)!important; - color: var(--tone-4)!important + background: var(--in-content-box-background)!important; + color: var(--in-content-page-color)!important } #current-tab > h3, .container-info-list, .panel-header-text { - color: var(--tone-4)!important + color: var(--in-content-page-color)!important } #container-panel #sort-containers-link { - border-color: var(--tone-5)!important; - color: var(--tone-4)!important + border-color: var(--in-content-box-border-color)!important; + color: var(--in-content-page-color)!important } #container-panel #sort-containers-link:hover, .clickable:hover { @@ -23,7 +23,7 @@ .container-panel-row { background-color: var(--tone-6)!important; border-block-end: 1px solid var(--tone-5); - color: var(--tone-4)!important + color: var(--in-content-page-color)!important } .scrollable { border-block-start: 1px solid var(--tone-5)!important; @@ -64,22 +64,22 @@ } .edit-container-panel fieldset, .edit-containers-text a { - color: var(--tone-4)!important + color: var(--in-content-page-color)!important } .edit-container-panel input[type=text] { background: var(--tone-8)!important; - color: var(--tone-4)!important; + color: var(--in-content-page-color)!important; border-color: var(--tone-5)!important } [data-identity-color=grey] { --identity-icon-color: var(--tone-4)!important } .button { - color: var(--tone-4)!important + color: var(--in-content-page-color)!important } .container-notification { background: var(--tone-7)!important; - color: var(--tone-4)!important + color: var(--in-content-page-color)!important } .edit-containers-text { border-inline-end: solid 0 #d8d8d8!important @@ -93,13 +93,13 @@ } .title-text, body { - color: var(--tone-4)!important + color: var(--in-content-page-color)!important } #redirect-url { background: var(--tone-8)!important } .button-container > button:first-child { - background: var(--tone-6)!important; + background: var(--in-content-box-background)!important; border-color: var(--tone-5)!important } .button-container > button:first-child:hover { @@ -108,7 +108,7 @@ #never-ask { -moz-appearance: none!important; background-color: var(--tone-6)!important; - border-color: var(--tone-5)!important; + border-color: var(--in-content-box-border-color)!important; background-image: none!important; box-shadow: none!important } diff --git a/css/userContent-files/webextension-tweaks/tridactyl.css b/css/userContent-files/webextension-tweaks/tridactyl.css index 9791c2d..3961434 100644 --- a/css/userContent-files/webextension-tweaks/tridactyl.css +++ b/css/userContent-files/webextension-tweaks/tridactyl.css @@ -27,7 +27,6 @@ color: var(--in-content-text-color)!important } #completions { - overflow: visible!important; background: var(--in-content-page-background)!important; border-color: var(--in-content-box-border-color)!important } From 806b80bff3ddf08ba1b75505e4f8d371ecbc87bd Mon Sep 17 00:00:00 2001 From: overdodactyl Date: Sun, 15 Apr 2018 14:39:38 -0600 Subject: [PATCH 17/17] add theme for greasemonkey #105 --- .../webextension-tweaks/generic_style.css | 8 ++++-- .../webextension-tweaks/greasemonkey.css | 28 +++++++++++++++++++ scripts/webextension_mappings.txt | 1 + userContent_imports.css | 1 + 4 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 css/userContent-files/webextension-tweaks/greasemonkey.css diff --git a/css/userContent-files/webextension-tweaks/generic_style.css b/css/userContent-files/webextension-tweaks/generic_style.css index 49f5f53..b1b7e19 100644 --- a/css/userContent-files/webextension-tweaks/generic_style.css +++ b/css/userContent-files/webextension-tweaks/generic_style.css @@ -4,7 +4,8 @@ url-prefix("moz-extension://decentraleyes_UUID/pages/popup"), url-prefix("moz-extension://smart_https_UUID/data/data/popup.html"), url-prefix("moz-extension://rename_tab_title_UUID/popup/popup.html"), - url-prefix("moz-extension://open_in_new_tab_UUID/popup") { + url-prefix("moz-extension://open_in_new_tab_UUID/popup"), + url-prefix("moz-extension://greasemonkey_UUID/src/browser/monkey-menu") { :root { --in-content-page-background: var(--tone-6)!important; --in-content-box-background: rgba(11,11,12,0.2)!important; @@ -51,6 +52,8 @@ url-prefix("moz-extension://open_in_new_tab_UUID/"), url-prefix("moz-extension://display_anchors_UUID/"), url-prefix("moz-extension://rename_tab_title_UUID/"), + url-prefix("moz-extension://greasemonkey_UUID/src/browser/monkey-menu"), + url-prefix("moz-extension://generic_styling_1_UUID"), url-prefix("moz-extension://generic_styling_2_UUID"), url-prefix("moz-extension://generic_styling_3_UUID"), @@ -134,7 +137,8 @@ /*! Code Mirror */ @-moz-document url-prefix("moz-extension://violentmonkey_UUID/"), url-prefix("moz-extension://ublock_origin_UUID/"), - url-prefix("moz-extension://umatrix_UUID/") { + url-prefix("moz-extension://umatrix_UUID/"), + url-prefix("moz-extension://greasemonkey_UUID/src/content/edit-user-script") { .CodeMirror { border: 1px solid !important; border-color: var(--cm-background)!important; diff --git a/css/userContent-files/webextension-tweaks/greasemonkey.css b/css/userContent-files/webextension-tweaks/greasemonkey.css new file mode 100644 index 0000000..1ab828c --- /dev/null +++ b/css/userContent-files/webextension-tweaks/greasemonkey.css @@ -0,0 +1,28 @@ +@-moz-document url-prefix("moz-extension://greasemonkey_UUID/") { + html, + body { + background: var(--in-content-page-background) !important; + } + #tabs .tab.active, + .command-item { + background: var(--tone-8) !important; + color: var(--in-content-page-color) !important; + } + .subview-back::before { + content: url(/skin/back.svg); + filter: invert(65%); + } + .subview-back:hover, + .subview-back:focus, + .subview-item:hover, + .subview-item:focus { + background-color: var(--in-content-category-background-hover) !important; + cursor: default; + color: inherit; + text-decoration: none; + } + .subview-item .text, + .subview-item .icon { + background: transparent !important; + } +} diff --git a/scripts/webextension_mappings.txt b/scripts/webextension_mappings.txt index c2cc661..b345f32 100644 --- a/scripts/webextension_mappings.txt +++ b/scripts/webextension_mappings.txt @@ -12,6 +12,7 @@ display_anchors|display-anchors@robwu.nl enhancer_for_youtube_UUID|enhancerforyoutube@maximerf.addons.mozilla.org flash_and_video_download_UUID|{bee6eb20-01e0-ebd1-da83-080329fb9a3a} google_translator_for_firefox|translator@zoli.bod +greasemonkey|{e4a8a97b-f2ed-450b-b12d-ee082ba24781} https_everywhere|https-everywhere@eff.org mind_the_time|jid0-HYNmqxA9zQGfJADREri4n2AHKSI@jetpack multi_account_containers|@testpilot-containers diff --git a/userContent_imports.css b/userContent_imports.css index 3f09dc5..9192fd8 100644 --- a/userContent_imports.css +++ b/userContent_imports.css @@ -18,6 +18,7 @@ @import "css/userContent-files/webextension-tweaks/brief.css"; @import "css/userContent-files/webextension-tweaks/cookie_autodelete.css"; @import "css/userContent-files/webextension-tweaks/dark_mode.css"; +@import "css/userContent-files/webextension-tweaks/greasemonkey.css"; @import "css/userContent-files/webextension-tweaks/multi_account_containers.css"; @import "css/userContent-files/webextension-tweaks/noscript.css"; @import "css/userContent-files/webextension-tweaks/pocket.css";