Skip to content

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

Fix theme colors

Chocobozzz184153f8d44c
diff --git a/client/src/app/+about/about.component.html b/client/src/app/+about/about.component.html
index 0a44596ae5..8ac969b0d3 100644
--- a/client/src/app/+about/about.component.html
+++ b/client/src/app/+about/about.component.html
@@ -29,7 +29,7 @@
<div class="social-buttons d-flex flex-wrap justify-content-end">
@if (config.instance.social.mastodonLink) {
<a
- class="media peertube-button-link rounded-icon-button mb-3" i18n-title title="Go to the Mastodon profile"
+ class="external-link peertube-button-link rounded-icon-button mb-3" i18n-title title="Go to the Mastodon profile"
target="_blank" rel="noopener noreferrer" [href]="config.instance.social.mastodonLink"
>
<my-global-icon iconName="mastodon"></my-global-icon>
@@ -38,7 +38,7 @@
@if (config.instance.social.xLink) {
<a
- class="media peertube-button-link rounded-icon-button mb-3" i18n-title title="Go to the X profile"
+ class="external-link peertube-button-link rounded-icon-button mb-3" i18n-title title="Go to the X profile"
target="_blank" rel="noopener noreferrer" [href]="config.instance.social.xLink"
>
<my-global-icon iconName="x-twitter"></my-global-icon>
@@ -47,7 +47,7 @@
@if (config.instance.social.blueskyLink) {
<a
- class="media peertube-button-link rounded-icon-button mb-3" i18n-title title="Go to the Bluesky profile"
+ class="external-link peertube-button-link rounded-icon-button mb-3" i18n-title title="Go to the Bluesky profile"
target="_blank" rel="noopener noreferrer" [href]="config.instance.social.blueskyLink"
>
<my-global-icon iconName="bluesky"></my-global-icon>
diff --git a/client/src/app/+about/about.component.scss b/client/src/app/+about/about.component.scss
index f1e106f43e..e0764089dd 100644
--- a/client/src/app/+about/about.component.scss
+++ b/client/src/app/+about/about.component.scss
@@ -68,7 +68,7 @@ h1 {
@include margin-left(0.5rem);
}
- .media {
+ .external-link {
color: pvar(--fg-300);
background-color: pvar(--bg-secondary-450);
border: 1px solid pvar(--bg-secondary-450);
@@ -82,19 +82,4 @@ h1 {
background-color: pvar(--bg-secondary-350);
}
}
-
- .external-link {
- color: pvar(--bg-secondary-350);
- background-color: pvar(--fg-350);
- border: 1px solid pvar(--fg-350);
-
- &:hover {
- background-color: pvar(--fg-400);
- color: pvar(--bg-secondary-400);
- }
-
- &:active {
- background-color: pvar(--fg-450);
- }
- }
}
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index b324c91686..f8ed942af7 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -130,12 +130,6 @@
@include disable-default-a-behaviour;
- &:hover,
- &:focus-visible {
- opacity: 1;
- background-color: pvar(--menu-bg-450);
- }
-
my-global-icon {
width: 22px;
height: 22px;
@@ -147,6 +141,17 @@
@include margin-left(12px);
}
}
+
+ &:hover,
+ &:focus-visible {
+ opacity: 1;
+ color: pvar(--menu-fg-600);
+ background-color: pvar(--menu-bg-550);
+
+ my-global-icon {
+ color: pvar(--menu-fg-600);
+ }
+ }
}
.menu-button {
@@ -181,6 +186,7 @@
}
&.active {
+ color: pvar(--menu-fg-600);
font-weight: $font-bold;
my-global-icon {
diff --git a/client/src/app/shared/shared-actor/actor-host.component.scss b/client/src/app/shared/shared-actor/actor-host.component.scss
index 5c99b33140..776dffade6 100644
--- a/client/src/app/shared/shared-actor/actor-host.component.scss
+++ b/client/src/app/shared/shared-actor/actor-host.component.scss
@@ -63,7 +63,7 @@
}
.host {
- color: pvar(--fg-450);
+ color: pvar(--fg-400);
font-weight: $font-bold;
background: linear-gradient(to right, pvar(--bg-secondary-400), pvar(--bg-secondary-500));
position: relative;
diff --git a/client/src/app/shared/shared-channels/channel-toggle.component.scss b/client/src/app/shared/shared-channels/channel-toggle.component.scss
index 3332c57c66..9f116bba0e 100644
--- a/client/src/app/shared/shared-channels/channel-toggle.component.scss
+++ b/client/src/app/shared/shared-channels/channel-toggle.component.scss
@@ -29,7 +29,7 @@
@include padding-right(1rem);
.name {
- color: pvar(--fg-400);
+ color: pvar(--fg);
@include ellipsis;
@include font-size(14px);
diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss
index ec501d5667..3d9d535613 100644
--- a/client/src/sass/bootstrap.scss
+++ b/client/src/sass/bootstrap.scss
@@ -64,7 +64,7 @@ body {
.popover {
--bs-popover-bg: #{pvar(--bg-secondary-450)};
--bs-popover-body-color: #{pvar(--fg-300)};
- --bs-popover-header-color: #{pvar(--fg-450)};
+ --bs-popover-header-color: #{pvar(--fg-400)};
font-family: $main-fonts;
}
diff --git a/client/src/sass/class-helpers/_badges.scss b/client/src/sass/class-helpers/_badges.scss
index f82aa3e586..f3308b76d1 100644
--- a/client/src/sass/class-helpers/_badges.scss
+++ b/client/src/sass/class-helpers/_badges.scss
@@ -55,7 +55,7 @@ a .pt-badge {
}
&.badge-secondary {
- color: pvar(--fg-450);
+ color: pvar(--fg-400);
background-color: pvar(--bg-secondary-400);
}
diff --git a/client/src/sass/include/_button-mixins.scss b/client/src/sass/include/_button-mixins.scss
index 2d3bee0edc..3d5628e505 100644
--- a/client/src/sass/include/_button-mixins.scss
+++ b/client/src/sass/include/_button-mixins.scss
@@ -26,6 +26,10 @@
color: $fg;
background-color: $active-bg;
border-color: $border-color;
+
+ my-global-icon {
+ color: $fg !important;
+ }
}
// Override bootstrap
@@ -35,6 +39,10 @@
color: $fg !important;
background-color: $active-bg !important;
border-color: $border-color !important;
+
+ my-global-icon {
+ color: $fg !important;
+ }
}
&:hover {
diff --git a/client/src/sass/include/_css-variables.scss b/client/src/sass/include/_css-variables.scss
index 389b9447e6..0f213e83af 100644
--- a/client/src/sass/include/_css-variables.scss
+++ b/client/src/sass/include/_css-variables.scss
@@ -74,7 +74,7 @@
--pt-player-fg: #fff;
--pt-player-big-play-bg: rgba(0, 0, 0, 0.8);
- --menu-fg: #{pvar(--fg-400)};
+ --menu-fg: #{pvar(--fg-350)};
--menu-bg: #{pvar(--bg-secondary-400)};
--header-fg: #{pvar(--fg)};
@@ -112,13 +112,22 @@
&[data-pt-theme="default"] {
--is-dark: 0;
- --primary: #FF8F37;
+ --primary-650: hsl(20, 100%, 49%);
+ --primary-550: hsl(24, 90%, 50%);
+ --primary: hsl(26, 100%, 61%);
+ --primary-500: hsl(26, 100%, 61%);
+ --primary-450: hsl(26, 98%, 65%);
--border-primary: #{pvar(--primary-650)};
- --fg: hsl(0 14% 2%);
- --fg-200: hsl(0 14% 29%);
+ --fg: hsl(0 0% 4%);
+ --fg-450: hsl(0 0% 7%);
+ --fg-400: hsl(0 13% 12%);
+ --fg-350: hsl(0 14% 16%);
+ --fg-300: hsl(0 13% 21%);
+ --fg-200: hsl(0 16% 29%);
+ --fg-100: hsl(0, 9%, 51%);
- --bg: hsl(250 5% 96%);
+ --bg: hsl(240 5% 96%);
--bg-secondary: hsl(0 12% 72%);
--bg-secondary-500: hsl(0 12% 72%);
--bg-secondary-450: hsl(0 13% 81%);
@@ -144,7 +153,13 @@
&[data-pt-theme="peertube-core-dark-brown"] {
--is-dark: 1;
- --primary: #FD9C50;
+ --primary-650: hsl(20, 100%, 49%);
+ --primary-550: hsl(24, 90%, 50%);
+ --primary: hsl(26, 100%, 61%);
+ --primary-500: hsl(26, 100%, 61%);
+ --primary-450: hsl(26, 98%, 65%);
+ --border-primary: #{pvar(--primary-650)};
+
--on-primary: #111;
--border-primary: #{pvar(--primary-350)};
@@ -153,10 +168,21 @@
--input-danger-fg: #FEBBB2;
--input-danger-bg: #9C221C;
- --fg: hsl(0 10% 96%);
-
- --bg: hsl(0 14% 7%);
- --bg-secondary: hsl(0 14% 22%);
+ --fg: hsl(240 5% 96%);
+ --fg-450: hsl(0 13% 92%);
+ --fg-400: hsl(0 19% 89%);
+ --fg-350: hsl(0 19% 89%); // Same as --fg-400 on purpose
+ --fg-300: hsl(0 13% 81%);
+ --fg-200: hsl(0 12% 72%);
+ --fg-100: hsl(0 9% 51%);
+
+ --bg: hsl(0 0% 7%);
+ --bg-secondary: hsl(0 16% 29%);
+ --bg-secondary-450: hsl(0 13% 21%);
+ --bg-secondary-400: hsl(0 14% 16%);
+ --bg-secondary-350: hsl(0 13% 12%);
+
+ --secondary-icon-color: hsl(0, 12%, 72%);
--alert-primary-fg: #{pvar(--on-primary)};
--alert-primary-bg: #cd9e7a;