From aed075646eea01e606e01415e45ead6831be6895 Mon Sep 17 00:00:00 2001 From: Nikita Krupin Date: Thu, 16 Dec 2021 16:43:23 -0500 Subject: settings menu UI change, rebase to latest --- Extensions/combined/popup.css | 32 ++++++++++++++++++++++++++++---- Extensions/combined/popup.html | 13 +++++++++++++ Extensions/combined/popup.js | 11 +++++++++-- 3 files changed, 50 insertions(+), 6 deletions(-) diff --git a/Extensions/combined/popup.css b/Extensions/combined/popup.css index 757692d..8aae769 100644 --- a/Extensions/combined/popup.css +++ b/Extensions/combined/popup.css @@ -5,7 +5,7 @@ --background: #111; --secondary: #272727; - --tertiary: #333333; + --tertiary: #424242; --lightGrey: #999; --white: #fff; } @@ -43,12 +43,36 @@ button:hover { } #advancedToggle { - margin-top: 1em; - margin-bottom: 2em; + position: fixed; + background: none; + box-shadow: none; + color: var(--lightGrey); + top: 22px; right: 22px; + padding: 2px; + z-index: 69; + height: 2rem; + width: 2rem; +} + +#advancedToggle:hover { + color: var(--white); + transform: rotate(-90deg); +} + +#advancedToggle:active { + transform: scale(1.5); } #advancedSettings { - display: none; + opacity: 0; + transition-duration: .15s; + transition-timing-function: ease-in-out; + transform: scale(1.1); + position: fixed; + background: var(--background); + top: 4px; right: 9px; + width: calc(100% - 55px); + height: calc(100% - 48px); border: 2px solid var(--secondary); border-radius: 0.5rem; padding: 1rem; diff --git a/Extensions/combined/popup.html b/Extensions/combined/popup.html index 130f557..a2d3e7f 100644 --- a/Extensions/combined/popup.html +++ b/Extensions/combined/popup.html @@ -25,6 +25,9 @@

API Status:

by Dmitrii Selivanov & Community

+ +

Return YouTube Dislike

+

by Dmitrii Selivanov & Community

@@ -38,8 +41,14 @@

+
+ + +
Settings @@ -49,12 +58,16 @@ Disable like/dislike submission
+ Green/Red Ratio Bar
+ 5-star Rating Bar
diff --git a/Extensions/combined/popup.js b/Extensions/combined/popup.js index 1e3264a..6bab5ee 100644 --- a/Extensions/combined/popup.js +++ b/Extensions/combined/popup.js @@ -5,6 +5,9 @@ const config = { hideAdvancedMessage: "Hide Settings", disableVoteSubmission: false, + showAdvancedMessage: '', + hideAdvancedMessage: '', + links: { website: "https://returnyoutubedislike.com", github: "https://github.com/Anarios/return-youtube-dislike", @@ -46,11 +49,15 @@ const advancedToggle = document.getElementById("advancedToggle"); advancedToggle.addEventListener("click", () => { const adv = document.getElementById("advancedSettings"); if (config.advanced) { - adv.style.display = "none"; + adv.style.transform = "scale(1.1)"; + adv.style.pointerEvents = "none"; + adv.style.opacity = "0"; advancedToggle.innerHTML = config.showAdvancedMessage; config.advanced = false; } else { - adv.style.display = "block"; + adv.style.transform = "scale(1)"; + adv.style.pointerEvents = "auto"; + adv.style.opacity = "1"; advancedToggle.innerHTML = config.hideAdvancedMessage; config.advanced = true; } -- cgit v1.2.3 From 1b30ab005df0065437ce0f297dcaf9c600c6a588 Mon Sep 17 00:00:00 2001 From: Nikita Krupin Date: Tue, 4 Jan 2022 17:53:43 -0500 Subject: settings popup --- Extensions/combined/content-style.css | 20 ++++++++++++++++++++ Extensions/combined/manifest-firefox.json | 4 ++++ Extensions/combined/popup.html | 6 ++++++ Extensions/combined/popup.js | 2 +- 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/Extensions/combined/content-style.css b/Extensions/combined/content-style.css index c06b29c..808199d 100644 --- a/Extensions/combined/content-style.css +++ b/Extensions/combined/content-style.css @@ -1,3 +1,23 @@ +/* :root { + --yt-spec-icon-disabled: #f44 !important; + --yt-spec-text-primary: #4f4 !important; + --yt-spec-general-background-a: #000 !important; + --yt-spec-general-background-b: #000 !important; + --yt-spec-general-background-c: #000 !important; + --yt-spec-brand-background-solid: #000 !important; + --yt-spec-brand-background-primary: #000 !important; + --yt-spec-brand-background-secondary: #000 !important; +} + +html:not(.style-scope)[dark], :not(.style-scope)[dark] { + --yt-spec-general-background-a: #000 !important; + --yt-spec-general-background-b: #000 !important; + --yt-spec-general-background-c: #000 !important; + --yt-spec-brand-background-solid: #000 !important; + --yt-spec-brand-background-primary: #000 !important; + --yt-spec-brand-background-secondary: #000 !important; +} */ + #ryd-bar-container { background: var(--yt-spec-icon-disabled); border-radius: 2px; diff --git a/Extensions/combined/manifest-firefox.json b/Extensions/combined/manifest-firefox.json index e0e8dba..358caa8 100644 --- a/Extensions/combined/manifest-firefox.json +++ b/Extensions/combined/manifest-firefox.json @@ -20,12 +20,16 @@ "exclude_matches": ["*://*.music.youtube.com/*"], "run_at": "document_idle", "css": ["content-style.css"], +<<<<<<< HEAD:Extensions/combined/manifest-firefox.json "js": ["bundled-content-script.js"] }, { "matches": ["*://*.returnyoutubedislike.com/debug","http://localhost/debug"], "run_at": "document_idle", "js": ["debug.js"] +======= + "js": ["ryd.content-script.js"] +>>>>>>> aeb2263 (settings popup):Extensions/combined/manifest.json } ] } diff --git a/Extensions/combined/popup.html b/Extensions/combined/popup.html index a2d3e7f..316b2ad 100644 --- a/Extensions/combined/popup.html +++ b/Extensions/combined/popup.html @@ -68,6 +68,12 @@ >
--> 5-star Rating Bar
+ +
diff --git a/Extensions/combined/popup.js b/Extensions/combined/popup.js index 6bab5ee..c4b31fe 100644 --- a/Extensions/combined/popup.js +++ b/Extensions/combined/popup.js @@ -6,7 +6,7 @@ const config = { disableVoteSubmission: false, showAdvancedMessage: '', - hideAdvancedMessage: '', + hideAdvancedMessage: '', links: { website: "https://returnyoutubedislike.com", -- cgit v1.2.3 From b6184991a18aad544ec9032e7468fdf0f2f26880 Mon Sep 17 00:00:00 2001 From: Nikita Krupin Date: Wed, 5 Jan 2022 15:00:23 -0500 Subject: fixes after rebase --- Extensions/combined/manifest-firefox.json | 4 ---- Extensions/combined/popup.html | 12 ++++-------- Extensions/combined/popup.js | 2 -- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/Extensions/combined/manifest-firefox.json b/Extensions/combined/manifest-firefox.json index 358caa8..e0e8dba 100644 --- a/Extensions/combined/manifest-firefox.json +++ b/Extensions/combined/manifest-firefox.json @@ -20,16 +20,12 @@ "exclude_matches": ["*://*.music.youtube.com/*"], "run_at": "document_idle", "css": ["content-style.css"], -<<<<<<< HEAD:Extensions/combined/manifest-firefox.json "js": ["bundled-content-script.js"] }, { "matches": ["*://*.returnyoutubedislike.com/debug","http://localhost/debug"], "run_at": "document_idle", "js": ["debug.js"] -======= - "js": ["ryd.content-script.js"] ->>>>>>> aeb2263 (settings popup):Extensions/combined/manifest.json } ] } diff --git a/Extensions/combined/popup.html b/Extensions/combined/popup.html index 316b2ad..653144f 100644 --- a/Extensions/combined/popup.html +++ b/Extensions/combined/popup.html @@ -13,14 +13,14 @@
- +

API Status:

by Dmitrii Selivanov & Community

@@ -33,15 +33,11 @@ -

- -
- + +
-
-
diff --git a/Extensions/combined/popup.js b/Extensions/combined/popup.js index c4b31fe..4ccfdf2 100644 --- a/Extensions/combined/popup.js +++ b/Extensions/combined/popup.js @@ -1,8 +1,6 @@ /* Config */ const config = { advanced: false, - showAdvancedMessage: "Show Settings", - hideAdvancedMessage: "Hide Settings", disableVoteSubmission: false, showAdvancedMessage: '', -- cgit v1.2.3 From db666735e4edb4af69b51f352df25013e5119fb6 Mon Sep 17 00:00:00 2001 From: Nikita Krupin Date: Wed, 5 Jan 2022 15:59:13 -0500 Subject: a better, more compact extension UI --- Extensions/combined/content-style.css | 12 +++---- Extensions/combined/popup.css | 24 ++++++++++---- Extensions/combined/popup.html | 61 ++++++++++++++++++++++------------- Extensions/combined/ryd.background.js | 2 ++ 4 files changed, 64 insertions(+), 35 deletions(-) diff --git a/Extensions/combined/content-style.css b/Extensions/combined/content-style.css index 808199d..e2e5fa2 100644 --- a/Extensions/combined/content-style.css +++ b/Extensions/combined/content-style.css @@ -1,15 +1,15 @@ -/* :root { - --yt-spec-icon-disabled: #f44 !important; - --yt-spec-text-primary: #4f4 !important; - --yt-spec-general-background-a: #000 !important; +:root { + /* --yt-spec-icon-disabled: #f44 !important; + --yt-spec-text-primary: #4f4 !important; */ + /* --yt-spec-general-background-a: #000 !important; --yt-spec-general-background-b: #000 !important; --yt-spec-general-background-c: #000 !important; --yt-spec-brand-background-solid: #000 !important; --yt-spec-brand-background-primary: #000 !important; - --yt-spec-brand-background-secondary: #000 !important; + --yt-spec-brand-background-secondary: #000 !important; */ } -html:not(.style-scope)[dark], :not(.style-scope)[dark] { +/* html:not(.style-scope)[dark], :not(.style-scope)[dark] { --yt-spec-general-background-a: #000 !important; --yt-spec-general-background-b: #000 !important; --yt-spec-general-background-c: #000 !important; diff --git a/Extensions/combined/popup.css b/Extensions/combined/popup.css index 8aae769..b56ca6a 100644 --- a/Extensions/combined/popup.css +++ b/Extensions/combined/popup.css @@ -33,8 +33,8 @@ button { border: none; border-radius: 4px; font-weight: 500; - box-shadow: 0 2px 4px -1px rgb(0 0 0 / 20%), 0 4px 5px 0 rgb(0 0 0 / 14%), - 0 1px 10px 0 rgb(0 0 0 / 12%); + /* box-shadow: 0 2px 4px -1px rgb(0 0 0 / 20%), 0 4px 5px 0 rgb(0 0 0 / 14%), + 0 1px 10px 0 rgb(0 0 0 / 12%); */ transition: 0.4s; } @@ -42,12 +42,23 @@ button:hover { background: #444; } +#ext-version { + z-index: 69; + position: fixed; + margin: 0; + bottom: 1.15rem; + right: 1.15rem; + background: var(--secondary); + border-radius: .25rem; + padding: .25rem .5rem; +} + #advancedToggle { position: fixed; background: none; box-shadow: none; color: var(--lightGrey); - top: 22px; right: 22px; + top: 26px; right: 26px; padding: 2px; z-index: 69; height: 2rem; @@ -65,14 +76,15 @@ button:hover { #advancedSettings { opacity: 0; + pointer-events: none; transition-duration: .15s; transition-timing-function: ease-in-out; transform: scale(1.1); position: fixed; background: var(--background); - top: 4px; right: 9px; - width: calc(100% - 55px); - height: calc(100% - 48px); + top: 10px; right: 14px; + width: calc(100% - 65px); + height: calc(100% - 58px); border: 2px solid var(--secondary); border-radius: 0.5rem; padding: 1rem; diff --git a/Extensions/combined/popup.html b/Extensions/combined/popup.html index 653144f..e45c915 100644 --- a/Extensions/combined/popup.html +++ b/Extensions/combined/popup.html @@ -13,38 +13,44 @@
- - -

API Status:

-

by Dmitrii Selivanov & Community

-

- -

Return YouTube Dislike

-

by Dmitrii Selivanov & Community

- +

Return YouTube Dislike

+

by Dmitrii Selivanov & Community

+ - +
- - + + + +

+

API Status:

+ + +
+
+ + +

+ +
Settings @@ -53,23 +59,32 @@ Disable like/dislike submission + + - 5-star Rating Bar
- -
diff --git a/Extensions/combined/ryd.background.js b/Extensions/combined/ryd.background.js index e332d8d..3954e72 100644 --- a/Extensions/combined/ryd.background.js +++ b/Extensions/combined/ryd.background.js @@ -6,6 +6,8 @@ let api; /** stores extension's global config */ let extConfig = { disableVoteSubmission: false + // coloredThumbs: false, + // coloredBar: false, } if (isChrome()) api = chrome; -- cgit v1.2.3