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";