Mirror/SponsorBlock
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlock.git synced 2025-12-07 12:07:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Move whitelisting warning

Browse Source
This commit is contained in:
Ajay Ramachandran
2020-12-13 22:41:59 -05:00
parent 7cc8cd75d4
commit df84f328a7
3 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
public/popup.css
View File

@@ -199,6 +199,14 @@ background-color:#ec1c1c;
margin-bottom: 2px !important; margin-bottom: 2px !important;
} }
#whitelistForceCheck {
font-weight: bold;
text-decoration: underline;
font-size: large;
cursor: pointer;
padding: 10px 0;
}
.sbHeader { .sbHeader {
margin-bottom: 5px !important; margin-bottom: 5px !important;
} }
@@ -248,14 +256,16 @@ background-color:#ec1c1c;
font-size: 16px; font-size: 16px;
} }
#whitelistButton > label > svg { .SBWhitelistIcon {
min-width: 16px; min-width: 16px;
min-height: 16px; min-height: 16px;
margin-top: auto; margin-top: auto;
margin-bottom: auto; margin-bottom: auto;
height: 100%;
} }
label>svg>path { .SBWhitelistIcon>path {
fill: var(--sb-main-fg-color); fill: var(--sb-main-fg-color);
} }
@@ -267,8 +277,7 @@ label>p, #disableExtension>p, #usernameValue, #usernameElement > div > p,#sponso
text-align: start; text-align: start;
} }
.grayedOut>.SBWhitelistIcon>path {
.grayedOut>label>svg>path {
fill: var(--sb-gray-fg-color); fill: var(--sb-gray-fg-color);
} }
@@ -276,11 +285,11 @@ label>p, #disableExtension>p, #usernameValue, #usernameElement > div > p,#sponso
color: var(--sb-gray-fg-color); color: var(--sb-gray-fg-color);
} }
label>svg.rotated { .SBWhitelistIcon.rotated {
transform: rotate(45deg); transform: rotate(45deg);
} }
label>svg, button#optionsButton>img, .logoText>img, #usernameValue { .SBWhitelistIconContainer, button#optionsButton>img, .logoText>img, #usernameValue {
margin-right: 8px; margin-right: 8px;
} }

16
public/popup.html
View File

@@ -39,14 +39,13 @@
<div id="whitelistButton" class="hidden bottomSpace" title="__MSG_forceChannelCheckPopup__"> <div id="whitelistButton" class="hidden bottomSpace" title="__MSG_forceChannelCheckPopup__">
<input type="checkbox" style="display:none;" id="whitelistToggle"> <input type="checkbox" style="display:none;" id="whitelistToggle">
<label for="whitelistToggle" class="whitelistToggleText"> <label for="whitelistToggle" class="whitelistToggleText">
<svg viewBox="0 0 24 24" width="16" height="16"> <div class="SBWhitelistIconContainer">
<path d="M24 10H14V0h-4v10H0v4h10v10h4V14h10z" /> <svg viewBox="0 0 24 24" width="16" height="16" class="SBWhitelistIcon">
</svg> <path d="M24 10H14V0h-4v10H0v4h10v10h4V14h10z" />
</svg>
</div>
<p id="whitelistChannel">__MSG_whitelistChannel__</p> <p id="whitelistChannel">__MSG_whitelistChannel__</p>
<p id="unwhitelistChannel" style="display: none">__MSG_removeFromWhitelist__</p> <p id="unwhitelistChannel" style="display: none">__MSG_removeFromWhitelist__</p>
<div id="whitelistForceCheck" style="text-decoration: underline; cursor: pointer;display: none">
__MSG_forceChannelCheckPopup__
</div>
</label> </label>
</div> </div>
<button id="optionsButton" title="__MSG_optionsInfo__"> <button id="optionsButton" title="__MSG_optionsInfo__">
@@ -55,6 +54,11 @@
</button> </button>
</div> </div>
</div> </div>
<div id="whitelistForceCheck" class="hidden">
__MSG_forceChannelCheckPopup__
</div>
<div id="mainControls" style="display: none"> <div id="mainControls" style="display: none">
<p class="sbHeader sbSubHeader"> <p class="sbHeader sbSubHeader">
__MSG_recordTimesDescription__ __MSG_recordTimesDescription__

11
src/popup.ts
View File

@@ -339,7 +339,7 @@ async function runThePopup(messageListener?: MessageListener) {
PageElements.whitelistChannel.style.display = "none"; PageElements.whitelistChannel.style.display = "none";
PageElements.unwhitelistChannel.style.display = "unset"; PageElements.unwhitelistChannel.style.display = "unset";
PageElements.whitelistToggle.checked = true; PageElements.whitelistToggle.checked = true;
document.querySelectorAll('label > svg')[0].classList.add("rotated"); document.querySelectorAll('.SBWhitelistIcon')[0].classList.add("rotated");
} }
}); });
} }
@@ -972,9 +972,9 @@ async function runThePopup(messageListener?: MessageListener) {
//change button //change button
PageElements.whitelistChannel.style.display = "none"; PageElements.whitelistChannel.style.display = "none";
PageElements.unwhitelistChannel.style.display = "unset"; PageElements.unwhitelistChannel.style.display = "unset";
document.querySelectorAll('label > svg')[0].classList.add("rotated"); document.querySelectorAll('.SBWhitelistIcon')[0].classList.add("rotated");
if (!Config.config.forceChannelCheck) PageElements.whitelistForceCheck.style.display = "unset"; if (!Config.config.forceChannelCheck) PageElements.whitelistForceCheck.classList.remove("hidden");
//save this //save this
Config.config.whitelistedChannels = whitelistedChannels; Config.config.whitelistedChannels = whitelistedChannels;
@@ -1019,10 +1019,7 @@ async function runThePopup(messageListener?: MessageListener) {
//change button //change button
PageElements.whitelistChannel.style.display = "unset"; PageElements.whitelistChannel.style.display = "unset";
PageElements.unwhitelistChannel.style.display = "none"; PageElements.unwhitelistChannel.style.display = "none";
document.querySelectorAll('label > svg')[0].classList.remove("rotated"); document.querySelectorAll('.SBWhitelistIcon')[0].classList.remove("rotated");
//PageElements.downloadedSponsorMessageTimes.innerText = "";
//PageElements.downloadedSponsorMessageTimes.style.fontWeight = "unset";
//save this //save this
Config.config.whitelistedChannels = whitelistedChannels; Config.config.whitelistedChannels = whitelistedChannels;