Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Fix header colors

Chocobozzzb6ce8a05355f
diff --git a/client/src/app/header/header.component.html b/client/src/app/header/header.component.html
index 56deb68c6f..c9d7fe5e19 100644
--- a/client/src/app/header/header.component.html
+++ b/client/src/app/header/header.component.html
@@ -43,6 +43,7 @@
<my-button
i18n-title title="Go to the page where you can manage your account"
theme="tertiary" rounded="true" class="margin-button settings-button" icon="cog" ptRouterLink="/my-account"
+ inheritColor="true"
></my-button>
<div
diff --git a/client/src/app/header/header.component.scss b/client/src/app/header/header.component.scss
index 87d60c3a54..1ba0b6ed68 100644
--- a/client/src/app/header/header.component.scss
+++ b/client/src/app/header/header.component.scss
@@ -29,8 +29,8 @@
--co-logo-size: 34px;
--co-root-padding: 1.5rem;
- color: pvar(--header-fg);
- background-color: pvar(--header-bg);
+ color: pvar(--header-fg-500);
+ background-color: pvar(--header-bg-500);
padding: var(--co-root-padding);
width: 100%;
@@ -122,13 +122,13 @@ my-search-typeahead {
.display-name {
font-weight: $font-bold;
- color: pvar(--fg);
+ color: pvar(--header-fg-500);
line-height: 1;
padding-top: 3px;
}
.username {
- color: pvar(--fg-300);
+ color: pvar(--header-fg-300);
}
> .dropdown-toggle {
@@ -152,6 +152,11 @@ my-actor-avatar {
display: none;
}
+.tertiary-button,
+button {
+ color: pvar(--header-fg-200);
+}
+
@media screen and (max-width: $menu-overlay-view) {
.peertube-title {
@include padding-left(0);
diff --git a/client/src/app/header/notification-dropdown.component.html b/client/src/app/header/notification-dropdown.component.html
index be7191808b..b42954c41e 100644
--- a/client/src/app/header/notification-dropdown.component.html
+++ b/client/src/app/header/notification-dropdown.component.html
@@ -18,7 +18,7 @@
<a
i18n-title
title="View your notifications"
- class="peertube-button tertiary-button rounded-icon-button notification-inbox-link"
+ class="peertube-button tertiary-button rounded-icon-button notification-inbox-link inherit-color"
routerLink="/my-account/notifications"
routerLinkActive="active"
#link
@@ -41,7 +41,7 @@
<button
i18n-title
title="View your notifications"
- class="peertube-button tertiary-button rounded-icon-button disable-dropdown-caret notification-inbox-dropdown"
+ class="peertube-button tertiary-button rounded-icon-button disable-dropdown-caret notification-inbox-dropdown inherit-color"
[ngClass]="{ 'shown': opened, 'hidden': isInMobileView }"
ngbDropdownToggle
>
diff --git a/client/src/app/shared/shared-main/buttons/button.component.html b/client/src/app/shared/shared-main/buttons/button.component.html
index a112c03553..e1073c3533 100644
--- a/client/src/app/shared/shared-main/buttons/button.component.html
+++ b/client/src/app/shared/shared-main/buttons/button.component.html
@@ -1,7 +1,7 @@
@if (ptRouterLink() || ptQueryParams()) {
<a
class="action-button ellipsis"
- [ngClass]="classes" [ngbTooltip]="tooltip()" [attr.title]="title()"
+ [class]="classes" [ngbTooltip]="tooltip()" [attr.title]="title()"
[routerLink]="ptRouterLink()" [queryParams]="ptQueryParams()" [queryParamsHandling]="ptQueryParamsHandling()" [routerLinkActive]="ptRouterLinkActive()"
>
<ng-container *ngTemplateOutlet="content"></ng-container>
@@ -9,13 +9,13 @@
} @else if (href()) {
<a
class="action-button ellipsis"
- [ngClass]="classes" [ngbTooltip]="tooltip()" [attr.title]="title()"
+ [class]="classes" [ngbTooltip]="tooltip()" [attr.title]="title()"
[href]="href()" target="_blank"
>
<ng-container *ngTemplateOutlet="content"></ng-container>
</a>
} @else {
- <button type="button" class="action-button ellipsis" [ngClass]="classes" [disabled]="disabled()" [ngbTooltip]="tooltip()" [attr.title]="title()" [attr.form]="form()">
+ <button type="button" class="action-button ellipsis" [class]="classes" [disabled]="disabled()" [ngbTooltip]="tooltip()" [attr.title]="title()" [attr.form]="form()">
<ng-container *ngTemplateOutlet="content"></ng-container>
</button>
}
diff --git a/client/src/app/shared/shared-main/buttons/button.component.ts b/client/src/app/shared/shared-main/buttons/button.component.ts
index 570221d5ca..8d84bf34b5 100644
--- a/client/src/app/shared/shared-main/buttons/button.component.ts
+++ b/client/src/app/shared/shared-main/buttons/button.component.ts
@@ -65,6 +65,7 @@ export class ButtonComponent implements OnChanges, AfterViewInit {
readonly rounded = input(false, { transform: booleanAttribute })
readonly small = input(false, { transform: booleanAttribute })
readonly show = input(false, { transform: booleanAttribute })
+ readonly inheritColor = input(false, { transform: booleanAttribute })
readonly form = input<string>()
readonly labelContent = viewChild<ElementRef>('labelContent')
@@ -110,7 +111,8 @@ export class ButtonComponent implements OnChanges, AfterViewInit {
'label-xl': this.autoFontSize() && label.length > 10,
'responsive-label': this.responsiveLabel(),
'small-button': this.small(),
- 'show': this.show()
+ 'show': this.show(),
+ 'inherit-color': this.inheritColor()
}
debugLogger('Built button classes', { classes: this.classes, label, labelContent: this.labelContent() })
diff --git a/client/src/root-helpers/theme-manager.ts b/client/src/root-helpers/theme-manager.ts
index 17f41e443d..613bba04c9 100644
--- a/client/src/root-helpers/theme-manager.ts
+++ b/client/src/root-helpers/theme-manager.ts
@@ -176,11 +176,11 @@ export class ThemeManager {
})
}
- const isMenuDarkTheme = () => {
+ const isComponentDarkTheme = (component: 'header' | 'menu') => {
return this.isDarkTheme({
- fg: computedStyle.getPropertyValue('--menu-fg'),
- bg: computedStyle.getPropertyValue('--menu-bg'),
- isDarkVar: computedStyle.getPropertyValue('--is-menu-dark')
+ fg: computedStyle.getPropertyValue(`--${component}-fg`),
+ bg: computedStyle.getPropertyValue(`--${component}-bg`),
+ isDarkVar: computedStyle.getPropertyValue(`--is-${component}-dark`)
})
}
@@ -192,8 +192,11 @@ export class ThemeManager {
{ prefix: 'input-bg', invertIfDark: true, step: 5, darkTheme: isGlobalDarkTheme },
- { prefix: 'menu-fg', invertIfDark: true, step: 5, darkTheme: isMenuDarkTheme },
- { prefix: 'menu-bg', invertIfDark: true, step: 5, darkTheme: isMenuDarkTheme }
+ { prefix: 'menu-fg', invertIfDark: true, step: 5, darkTheme: () => isComponentDarkTheme('menu') },
+ { prefix: 'menu-bg', invertIfDark: true, step: 5, darkTheme: () => isComponentDarkTheme('menu') },
+
+ { prefix: 'header-fg', invertIfDark: true, step: 5, darkTheme: () => isComponentDarkTheme('header') },
+ { prefix: 'header-bg', invertIfDark: true, step: 5, darkTheme: () => isComponentDarkTheme('header') }
] as { prefix: string, invertIfDark: boolean, step: number, darkTheme: () => boolean, fallbacks?: Record<string, string> }[]
for (const { prefix, invertIfDark, step, darkTheme, fallbacks = {} } of toProcess) {
diff --git a/client/src/sass/class-helpers/_text.scss b/client/src/sass/class-helpers/_text.scss
index 014511afd4..9343381809 100644
--- a/client/src/sass/class-helpers/_text.scss
+++ b/client/src/sass/class-helpers/_text.scss
@@ -135,3 +135,9 @@
.ellipsis {
@include ellipsis;
}
+
+// ---------------------------------------------------------------------------
+
+.inherit-color {
+ color: inherit;
+}
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss
index 9c4cc32566..1cf11d8ef1 100644
--- a/client/src/sass/include/_variables.scss
+++ b/client/src/sass/include/_variables.scss
@@ -92,12 +92,12 @@ $variables: (
--x-margin-content: var(--x-margin-content),
--tmp-header-height: var(--tmp-header-height),
--header-height: var(--header-height),
- --header-fg: var(--header-fg),
- --header-bg: var(--header-bg),
--fg: var(--fg),
--bg: var(--bg),
+ // Colors
--red: var(--red),
--green: var(--green),
+ // Inputs
--input-fg: var(--input-fg),
--input-bg: var(--input-bg),
--input-bg-550: var(--input-bg-550),
@@ -115,18 +115,43 @@ $variables: (
--input-check-active-bg: var(--input-check-active-bg),
--input-x-padding: var(--input-x-padding),
--input-y-padding: var(--input-y-padding),
+ // Textarea
--textarea-x-padding: var(--textarea-x-padding),
--textarea-y-padding: var(--textarea-y-padding),
--textarea-fg: var(--textarea-fg),
--textarea-bg: var(--textarea-bg),
--textarea-bg-in-secondary: var(--textarea-bg-in-secondary),
--textarea-bg-in-modal: var(--textarea-bg-in-modal),
+ // Support button
--support-btn-bg: var(--support-btn-bg),
--support-btn-fg: var(--support-btn-fg),
--support-btn-heart-bg: var(--support-btn-heart-bg),
+ // Icons
--secondary-icon-color: var(--secondary-icon-color),
--active-icon-color: var(--active-icon-color),
--active-icon-bg: var(--active-icon-bg),
+ // Header
+ --header-fg-500: var(--header-fg-500),
+ --header-fg-450: var(--header-fg-450),
+ --header-fg-400: var(--header-fg-400),
+ --header-fg-350: var(--header-fg-350),
+ --header-fg-300: var(--header-fg-300),
+ --header-fg-250: var(--header-fg-250),
+ --header-fg-200: var(--header-fg-200),
+ --header-fg-150: var(--header-fg-150),
+ --header-fg-100: var(--header-fg-100),
+ --header-fg-50: var(--header-fg-50),
+ --header-bg: var(--header-bg),
+ --header-bg-600: var(--header-bg-600),
+ --header-bg-550: var(--header-bg-550),
+ --header-bg-500: var(--header-bg-500),
+ --header-bg-450: var(--header-bg-450),
+ --header-bg-400: var(--header-bg-400),
+ --header-bg-350: var(--header-bg-350),
+ --header-bg-300: var(--header-bg-300),
+ --header-bg-250: var(--header-bg-250),
+ --header-bg-200: var(--header-bg-200),
+ // Foregrounds
--fg-500: var(--fg-500),
--fg-450: var(--fg-450),
--fg-400: var(--fg-400),
@@ -137,6 +162,7 @@ $variables: (
--fg-150: var(--fg-150),
--fg-100: var(--fg-100),
--fg-50: var(--fg-50),
+ // Backgrounds
--bg-secondary-600: var(--bg-secondary-600),
--bg-secondary-550: var(--bg-secondary-550),
--bg-secondary-500: var(--bg-secondary-500),
@@ -146,6 +172,7 @@ $variables: (
--bg-secondary-300: var(--bg-secondary-300),
--bg-secondary-250: var(--bg-secondary-250),
--bg-secondary-200: var(--bg-secondary-200),
+ // Menu
--menu-fg: var(--menu-fg),
--menu-fg-600: var(--menu-fg-600),
--menu-fg-550: var(--menu-fg-550),
@@ -172,6 +199,7 @@ $variables: (
--menu-margin-left: var(--menu-margin-left),
--menu-width: var(--menu-width),
--menu-border-radius: var(--menu-border-radius),
+ // Primary colors
--on-primary: var(--on-primary),
--on-primary-700: var(--on-primary-700),
--on-primary-650: var(--on-primary-650),
@@ -202,11 +230,14 @@ $variables: (
--primary-150: var(--primary-150),
--primary-100: var(--primary-100),
--primary-50: var(--primary-50),
+ // Borders
--border-primary: var(--border-primary),
--border-secondary: var(--border-secondary),
+ // Alerts
--alert-primary-fg: var(--alert-primary-fg),
--alert-primary-bg: var(--alert-primary-bg),
--alert-primary-border-color: var(--alert-primary-border-color),
+ // Player
--pt-player-fg: var(--pt-player-fg),
--pt-player-big-play-bg: var(--pt-player-big-play-bg),
--pt-player-overlay-secondary-fg: var(--pt-player-overlay-secondary-fg),