Skip to content

Fix custom theme colors not applying due to outdated CSS selectors an… #3799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ganeshbhargav wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix custom theme colors not applying due to outdated CSS selectors an… #3799

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
199 changes: 82 additions & 117 deletions js&css/web-accessible/www.youtube.com/themes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,130 +3,95 @@
------------------------------------------------------------------------------*/
ImprovedTube.myColors = function () {
if (this.storage.theme === 'custom') {
var style = this.elements.my_colors || document.createElement('style'),
primary_color = this.storage.theme_primary_color,
secondary_color = this.storage.theme_secondary_color,
text_color = this.storage.theme_text_color;

if (primary_color) {
primary_color = 'rgb(' + primary_color.join(',') + ')';
} else {
// need better central place for storing default custom profile colors
primary_color = 'rgb(200, 200, 200)';


document.documentElement.setAttribute('it-theme', 'custom');

let existingStyle = document.querySelector('.it-theme-editor');
let style = existingStyle || document.createElement('style');

let primary_color = this.storage.theme_primary_color;
let secondary_color = this.storage.theme_secondary_color;
let text_color = this.storage.theme_text_color;

primary_color = primary_color ? 'rgb(' + primary_color.join(',') + ')' : 'rgb(200, 200, 200)';
secondary_color = secondary_color ? 'rgb(' + secondary_color.join(',') + ')' : 'rgb(100, 0, 0)';
text_color = text_color ? 'rgb(' + text_color.join(',') + ')' : 'rgb(25, 25, 25)';

style.className = 'it-theme-editor';

style.textContent = `
:root {
--yt-swatch-textbox-bg:rgba(19,19,19,1)!important;
--yt-swatch-icon-color:rgba(136,136,136,1)!important;

--yt-spec-brand-background-primary:rgba(0,0,0,0.1)!important;
--yt-spec-brand-background-secondary:rgba(0,0,0,0.1)!important;

--yt-spec-badge-chip-background:rgba(0,0,0,0.05)!important;
--yt-spec-verified-badge-background:rgba(0,0,0,0.15)!important;

--yt-spec-button-chip-background-hover:rgba(0,0,0,0.10)!important;
--yt-spec-brand-button-background:rgba(136,136,136,1)!important;

--yt-spec-filled-button-focus-outline:rgba(0,0,0,0.60)!important;
--yt-spec-call-to-action-button-focus-outline:rgba(0,0,0,0.30)!important;

--yt-spec-brand-text-button-focus-outline:rgba(204,0,0,0.30)!important;
--yt-spec-10-percent-layer:rgba(136,136,136,1)!important;

/* HEADER */
--yt-swatch-header-primary:${secondary_color}!important;
--ytd-masthead-background:${secondary_color}!important;
--yt-spec-brand-background:${secondary_color}!important;
--ytd-topbar-background-color:${secondary_color}!important;
--yt-masthead-background:${secondary_color}!important;

/* BACKGROUND */
--yt-spec-general-background-a:${primary_color}!important;
--yt-spec-general-background-b:${primary_color}!important;
--yt-spec-general-background-c:${primary_color}!important;
--yt-spec-base-background:${primary_color}!important;

--yt-spec-raised-background:${primary_color}!important;
--yt-spec-menu-background:${primary_color}!important;

--ytd-searchbox-background:${primary_color}!important;

/* TEXT */
--yt-spec-text-primary:${text_color}!important;
--yt-spec-text-secondary:${text_color}!important;
--yt-spec-text-disabled:${text_color}!important;

--yt-spec-icon-active-other:${text_color}!important;
--yt-spec-icon-inactive:${text_color}!important;

background-color: var(--yt-spec-base-background)!important;
}

if (secondary_color) {
secondary_color = 'rgb(' + secondary_color.join(',') + ')';
} else {
// need better central place for storing default custom profile colors
secondary_color = 'rgb(100, 0, 0)';
ytd-masthead, #masthead, ytd-app #masthead {
background-color: ${secondary_color} !important;
}
if (text_color) {
text_color = 'rgb(' + text_color.join(',') + ')';
} else {
// need better central place for storing default custom profile colors
text_color = 'rgb(25, 25, 25)';
`;


if (!existingStyle) {
document.head.appendChild(style);
}

style.className = 'it-theme-editor';
style.textContent = 'html[it-theme=custom], html[it-theme=custom] [dark] {' +
'--yt-swatch-textbox-bg:rgba(19,19,19,1)!important;' +
'--yt-swatch-icon-color:rgba(136,136,136,1)!important;' +
'--yt-spec-brand-background-primary:rgba(0,0,0, 0.1) !important;' +
'--yt-spec-brand-background-secondary:rgba(0,0,0, 0.1) !important;' +
'--yt-spec-badge-chip-background:rgba(0, 0, 0, 0.05) !important;' +
'--yt-spec-verified-badge-background:rgba(0, 0, 0, 0.15) !important;' +
'--yt-spec-button-chip-background-hover:rgba(0, 0, 0, 0.10) !important;' +
'--yt-spec-brand-button-background:rgba(136,136,136,1) !important;' +
'--yt-spec-filled-button-focus-outline:rgba(0, 0, 0, 0.60) !important;' +
'--yt-spec-call-to-action-button-focus-outline:rgba(0,0,0, 0.30) !important;' +
'--yt-spec-brand-text-button-focus-outline:rgba(204, 0, 0, 0.30) !important;' +
'--yt-spec-10-percent-layer:rgba(136,136,136,1) !important;' +
'--yt-swatch-header-primary:'+ secondary_color + '!important;' +
'--ytd-masthead-background:' + secondary_color + '!important;' +
'--yt-spec-brand-background:' + secondary_color + '!important;' +
'--ytd-topbar-background-color:' + secondary_color + '!important;' +
'--ytd-topbar-dark-background-color:' + secondary_color + '!important;' +
'--yt-masthead-background:' + secondary_color + '!important;' +
'--yt-app-bar-background:' + secondary_color + '!important;' +
'--yt-swatch-primary:' + primary_color + '!important;' +
'--yt-swatch-primary-darker:' + primary_color + '!important;' +
'--yt-spec-brand-background-solid:' + primary_color + '!important;' +
'--yt-spec-general-background-a:' + primary_color + '!important;' +
'--yt-spec-general-background-b:' + primary_color + '!important;' +
'--yt-spec-general-background-c:' + primary_color + '!important;' +
'--yt-spec-touch-response:' + primary_color + '!important;' +
'--yt-swatch-text: ' + text_color + '!important;' +
'--yt-swatch-important-text: ' + text_color + '!important;' +
'--yt-swatch-input-text: ' + text_color + '!important;' +
'--yt-swatch-logo-override: ' + text_color + '!important;' +
'--yt-spec-text-primary:' + text_color + ' !important;' +
'--yt-spec-text-primary-inverse:' + primary_color + ' !important;' +
'--yt-spec-text-secondary:' + text_color + ' !important;' +
'--yt-spec-text-disabled:' + text_color + ' !important;' +
'--yt-spec-icon-active-other:' + text_color + ' !important;' +
'--yt-spec-icon-inactive:' + text_color + ' !important;' +
'--yt-spec-icon-disabled:' + text_color + ' !important;' +
'--yt-spec-filled-button-text:' + text_color + ' !important;' +
'--yt-spec-call-to-action-inverse:' + text_color + ' !important;' +
'--yt-spec-brand-icon-active:' + text_color + ' !important;' +
'--yt-spec-brand-icon-inactive:' + text_color + ' !important;' +
'--yt-spec-brand-link-text:' + text_color + '!important;' +
'--yt-spec-brand-subscribe-button-background:' + text_color + ' !important;' +
'--yt-spec-wordmark-text:' + text_color + ' !important;' +
'--yt-spec-selected-nav-text:' + text_color + ' !important;' +
'--yt-spec-base-background:' + primary_color + '!important;' +
'--yt-spec-raised-background:' + primary_color + '!important;' +
'--yt-spec-menu-background:' + primary_color + '!important;' +
'--yt-spec-inverted-background: #fff;' +
'--ytd-searchbox-background:' + primary_color + '!important;' +
'--ytd-searchbox-legacy-button-color:' + 'var(--yt-spec-brand-background-primary)' + '!important;' +
'--yt-frosted-glass-desktop:' + primary_color + 'cc !important;' +
'background-color: var(--yt-spec-base-background)!important;' +
'}' +
'html[it-theme=custom] ytd-masthead, html[it-theme=custom] #masthead, html[it-theme=custom] ytd-app #masthead { background-color: ' + secondary_color + ' !important; }';
//Tested, but still not sure if it's good enough

this.elements.my_colors = style;
(document.head || document.documentElement).appendChild(style);
clearInterval(this.themeInterval);
this.themeInterval = setInterval(() => {
if (!document.querySelector('.it-theme-editor')) {
document.head.appendChild(style);
}
}, 2000);

document.documentElement.removeAttribute('dark');
document.querySelector('ytd-masthead')?.removeAttribute('dark');
document.getElementById('cinematics')?.style.setProperty("display", "none");

} else {
this.elements.my_colors?.remove();
}
}

ImprovedTube.setTheme = function () {
switch (this.storage.theme) {
case 'dark':
document.documentElement.setAttribute('dark', '');
document.querySelector('ytd-masthead')?.setAttribute('dark', '');
ImprovedTube.setPrefCookieValueByName('f6', 400);
// fall through
case 'black':
document.getElementById('cinematics')?.removeAttribute('style');
this.elements.my_colors?.remove();
break

case 'light':
ImprovedTube.messages.send({action: 'set', key: 'theme', value: null});
ImprovedTube.setPrefCookieValueByName('f6', null);
// fall through
case 'dawn':
case 'sunset':
case 'night':
case 'plain':
case 'desert':
document.documentElement.removeAttribute('dark');
document.querySelector('ytd-masthead')?.removeAttribute('dark');
document.getElementById('cinematics')?.style.setProperty('display', 'none');
this.elements.my_colors?.remove();
break

case 'default':
document.getElementById('cinematics')?.removeAttribute('style');
this.elements.my_colors?.remove();
break
document.querySelector('.it-theme-editor')?.remove();
clearInterval(this.themeInterval);
}
};
};