Skip to content

Pastel & Hot Pink Themes #3937

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

Merged
FreeTubeBot merged 9 commits into from
Sep 1, 2023
Merged

Pastel & Hot Pink Themes #3937

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0b25d80
Add pastel and hot pink base configuration & labels
kommunarr Aug 24, 2023
db67d71
Update Author Background Color to be based on --secondary-card-bg-col…
kommunarr Aug 24, 2023
f0aaad0
Implement Pastel Pink and Hot Pink styling
kommunarr Aug 24, 2023
94e5a83
Add textWhiteSmall and iconWhiteSmall to repo; add FT pink icon themes
kommunarr Aug 24, 2023
6ae1981
Add side-nav-hover-text-color and side-nav-active-text-color througho…
kommunarr Aug 24, 2023
9201646
Update Hot Pink theme accent-color-active
kommunarr Aug 24, 2023
8093899
Add side-nav hover-text and active-text styling to ft-icon-button
kommunarr Aug 24, 2023
0018ddf
Fix incorrect variable name
kommunarr Aug 27, 2023
a93a3e7
Disable primary & secondary color theme controls when hot pink theme …
kommunarr Aug 28, 2023
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
Binary file added _icons/iconWhiteSmall.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 _icons/textWhite.png → _icons/textWhiteSmall.png
View file
Open in desktop
File renamed without changes
4 changes: 4 additions & 0 deletions src/main/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,10 @@ function runApp() {
return '#282a36'
case 'catppuccin-mocha':
return '#1e1e2e'
case 'pastel-pink':
return '#ffd1dc'
case 'hot-pink':
return '#de1c85'
case 'system':
default:
return nativeTheme.shouldUseDarkColors ? '#212121' : '#f1f1f1'
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/channel-about/channel-about.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

.aboutTagLink {
background-color: var(--secondary-card-bg-color);
color: var(--primary-text-color);
border-radius: 7px;
color: inherit;
padding: 7px;
text-decoration: none;
}
Expand Down
1 change: 1 addition & 0 deletions src/renderer/components/ft-channel-bubble/ft-channel-bubble.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

.bubblePadding:hover {
background-color: var(--side-nav-hover-color);
color: var(--side-nav-hover-text-color);
-moz-transition: background 0.2s ease-in;
-o-transition: background 0.2s ease-in;
transition: background 0.2s ease-in;
Expand Down
18 changes: 12 additions & 6 deletions src/renderer/components/ft-icon-button/ft-icon-button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,27 @@
color: var(--primary-text-color);

&:hover,
&:focus {
&:focus-visible {
background-color: var(--side-nav-hover-color);
color: var(--side-nav-hover-text-color);
}

&:active {
background-color: var(--side-nav-active-color);
color: var(--side-nav-active-text-color);
}
}

&.base-no-default {
&:hover,
&:focus {
&:focus-visible {
background-color: var(--side-nav-hover-color);
color: var(--side-nav-hover-text-color);
}

&:active {
background-color: var(--side-nav-active-color);
color: var(--side-nav-active-text-color);
}
}

Expand All @@ -47,7 +51,7 @@
color: var(--text-with-main-color);

&:hover,
&:focus {
&:focus-visible {
background-color: var(--primary-color-hover);
}

Expand All @@ -61,7 +65,7 @@
color: var(--text-with-accent-color);

&:hover,
&:focus {
&:focus-visible {
background-color: var(--accent-color-hover);
}

Expand All @@ -70,7 +74,7 @@
}
}

&.favorite {
&.favorite, &.favorite:hover, &.favorite:focus-visible {
color: var(--favorite-icon-color);
}
}
Expand Down Expand Up @@ -117,13 +121,15 @@
white-space: nowrap;

&:hover,
&:focus {
&:focus-visible {
background-color: var(--side-nav-hover-color);
color: var(--side-nav-hover-text-color);
transition: background 0.2s ease-in;
}

&:active {
background-color: var(--side-nav-active-color);
color: var(--side-nav-active-text-color);
transition: background 0.1s ease-in;
}
}
Expand Down
6 changes: 5 additions & 1 deletion src/renderer/components/ft-input/ft-input.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@

.clearInputTextButton.visible:hover {
background-color: var(--side-nav-hover-color);
color: var(--side-nav-hover-text-color);
}

.forceTextColor .clearInputTextButton:hover {
Expand All @@ -62,6 +63,7 @@

.clearInputTextButton.visible:active {
background-color: var(--tertiary-text-color);
color: var(--side-nav-active-text-color);
-moz-transition: background 0.2s ease-in;
-o-transition: background 0.2s ease-in;
transition: background 0.2s ease-in;
Expand Down Expand Up @@ -156,6 +158,7 @@

.inputAction.enabled:hover {
background-color: var(--side-nav-hover-color);
color: var(--side-nav-hover-text-color);
-moz-transition: background 0.2s ease-in;
-o-transition: background 0.2s ease-in;
transition: background 0.2s ease-in;
Expand All @@ -167,6 +170,7 @@

.inputAction.enabled:active {
background-color: var(--tertiary-text-color);
color: var(--side-nav-active-text-color);
-moz-transition: background 0.2s ease-in;
-o-transition: background 0.2s ease-in;
transition: background 0.2s ease-in;
Expand Down Expand Up @@ -197,5 +201,5 @@

.hover {
background-color: var(--scrollbar-color-hover);
/* color: white; */
color: var(--scrollbar-text-color-hover);
}
1 change: 1 addition & 0 deletions src/renderer/components/ft-profile-bubble/ft-profile-bubble.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

.bubblePadding:hover {
background-color: var(--side-nav-hover-color);
color: var(--side-nav-hover-text-color);
-moz-transition: background 0.2s ease-in;
-o-transition: background 0.2s ease-in;
transition: background 0.2s ease-in;
Expand Down
1 change: 1 addition & 0 deletions src/renderer/components/ft-profile-selector/ft-profile-selector.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@

.profile:hover {
background-color: var(--side-nav-hover-color);
color: var(--side-nav-hover-text-color);
-moz-transition: background 0.2s ease-in;
-o-transition: background 0.2s ease-in;
transition: background 0.2s ease-in;
Expand Down
3 changes: 3 additions & 0 deletions src/renderer/components/ft-share-button/ft-share-button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@

/* no changes for the dracula theme */

.pastelPink &,
.light &,
.system[data-system-theme*='light'] & {
filter: invert(0.87);
Expand All @@ -68,10 +69,12 @@
.black &,
.dracula &,
.CatppuccinMocha &,
.hotPink &,
.system[data-system-theme*='dark'] & {
background-image: url('../../assets/img/invidious-logo-dark.svg');
}

.pastelPink &,
.light &,
.system[data-system-theme*='light'] & {
background-image: url('../../assets/img/invidious-logo-light.svg');
Expand Down
2 changes: 2 additions & 0 deletions src/renderer/components/side-nav-more-options/side-nav-more-options.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@

.navOption:hover {
background-color: var(--side-nav-hover-color);
color: var(--side-nav-hover-text-color);
-moz-transition: background 0.2s ease-in;
-o-transition: background 0.2s ease-in;
transition: background 0.2s ease-in;
}

.navOption:active {
background-color: var(--side-nav-active-color);
color: var(--side-nav-active-text-color);
-moz-transition: background 0.2s ease-in;
-o-transition: background 0.2s ease-in;
transition: background 0.2s ease-in;
Expand Down
2 changes: 2 additions & 0 deletions src/renderer/components/side-nav/side-nav.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,15 @@

.navOption:hover, .navChannel:hover {
background-color: var(--side-nav-hover-color);
color: var(--side-nav-hover-text-color);
-moz-transition: background 0.2s ease-in;
-o-transition: background 0.2s ease-in;
transition: background 0.2s ease-in;
}

.navOption:active, .navChannel:active {
background-color: var(--side-nav-active-color);
color: var(--side-nav-active-text-color);
-moz-transition: background 0.2s ease-in;
-o-transition: background 0.2s ease-in;
transition: background 0.2s ease-in;
Expand Down
8 changes: 6 additions & 2 deletions src/renderer/components/theme-settings/theme-settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ export default defineComponent({
'dark',
'black',
'dracula',
'catppuccinMocha'
'catppuccinMocha',
'pastelPink',
'hotPink'
]
}
},
Expand Down Expand Up @@ -98,7 +100,9 @@ export default defineComponent({
this.$t('Settings.Theme Settings.Base Theme.Dark'),
this.$t('Settings.Theme Settings.Base Theme.Black'),
this.$t('Settings.Theme Settings.Base Theme.Dracula'),
this.$t('Settings.Theme Settings.Base Theme.Catppuccin Mocha')
this.$t('Settings.Theme Settings.Base Theme.Catppuccin Mocha'),
this.$t('Settings.Theme Settings.Base Theme.Pastel Pink'),
this.$t('Settings.Theme Settings.Base Theme.Hot Pink')
]
},

Expand Down
5 changes: 3 additions & 2 deletions src/renderer/components/top-nav/top-nav.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@

&.fa-arrow-left,
&.fa-arrow-right {
color: gray;
opacity: 0.5;
opacity: 0.4;
pointer-events: none;
user-select: none;
}

&:hover {
background-color: var(--side-nav-hover-color);
color: var(--side-nav-hover-text-color);
transition: background 0.2s ease-in;

@include top-nav-is-colored {
Expand All @@ -75,6 +75,7 @@

&:active {
background-color: var(--tertiary-text-color);
color: var(--side-nav-active-text-color);
transition: background 0.2s ease-in;

@include top-nav-is-colored {
Expand Down
12 changes: 6 additions & 6 deletions src/renderer/components/watch-video-comments/watch-video-comments.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,17 @@
text-overflow: ellipsis;
}

.commentOwner {
background-color: var(--scrollbar-color);
border-radius: 10px;
padding: 0 10px;
}

.commentAuthor {
color: inherit;
text-decoration: none;
}

.commentOwner {
background-color: var(--secondary-card-bg-color);
border-radius: 10px;
padding: 0 10px;
}

.commentText {
white-space: pre-wrap;
font-size: 14px;
Expand Down
2 changes: 2 additions & 0 deletions src/renderer/components/watch-video-playlist/watch-video-playlist.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@

.playlistIcon:hover {
background-color: var(--side-nav-hover-color);
color: var(--side-nav-hover-text-color);
transition: background 0.2s ease-in;
}

Expand All @@ -72,6 +73,7 @@

.playlistItem:hover {
background-color: var(--side-nav-hover-color);
color: var(--side-nav-hover-text-color);
transition: background 0.2s ease-in;
}

Expand Down
Loading