Skip to content
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

Added a Nordic base theme #4542

Merged
merged 7 commits into from
Feb 3, 2024
Merged

Added a Nordic base theme #4542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
396370b
Added a Nordic base theme
JonahFoster Jan 13, 2024
5394505
Merge branch 'FreeTubeApp:development' into add-nordic-theme
JonahFoster Jan 30, 2024
d9d9666
Merge remote-tracking branch 'upstream/development' into add-nordic-t…
JonahFoster Jan 30, 2024
1e3e316
Added Nordic icon
JonahFoster Jan 30, 2024
6d9ea90
Merge branch 'add-nordic-theme' of https://github.com/JonahFoster/Fre…
JonahFoster Jan 30, 2024
f89779f
Added Nordic theme to switch
JonahFoster Feb 1, 2024
94eb618
Update src/renderer/themes.css
JonahFoster Feb 1, 2024
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/iconNordicLightSmall.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.
Binary file added _icons/textNordicLightSmall.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.
2 changes: 2 additions & 0 deletions src/main/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,8 @@ function runApp() {
return '#ffd1dc'
case 'hot-pink':
return '#de1c85'
case 'nordic':
return '#2b2f3a'
case 'system':
default:
return nativeTheme.shouldUseDarkColors ? '#212121' : '#f1f1f1'
Expand Down
6 changes: 4 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 @@ -37,7 +37,8 @@ export default defineComponent({
'dracula',
'catppuccinMocha',
'pastelPink',
'hotPink'
'hotPink',
'nordic'
]
}
},
Expand Down Expand Up @@ -102,7 +103,8 @@ export default defineComponent({
this.$t('Settings.Theme Settings.Base Theme.Dracula'),
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')
this.$t('Settings.Theme Settings.Base Theme.Hot Pink'),
this.$t('Settings.Theme Settings.Base Theme.Nordic')
]
},

Expand Down
34 changes: 29 additions & 5 deletions src/renderer/themes.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
.dracula,
.catppuccinMocha,
.pastelPink,
.hotPink {
.hotPink,
.nordic {
--primary-input-color: rgba(0, 0, 0, 0.50);
}

Expand All @@ -15,7 +16,8 @@
.dracula,
.catppuccinMocha,
.pastelPink,
.hotPink {
.hotPink,
.nordic {
--link-color: var(--accent-color);
--link-visited-color: var(--accent-color-visited);
--instance-menu-color: var(--search-bar-color);
Expand All @@ -27,7 +29,8 @@
.gray,
.dracula,
.catppuccinMocha,
.pastelPink {
.pastelPink,
.nordic {
--primary-input-color: rgba(0, 0, 0, 0.50);
--side-nav-hover-text-color: var(--primary-text-color);
}
Expand All @@ -37,7 +40,8 @@
.black,
.gray,
.dracula,
.catppuccinMocha {
.catppuccinMocha,
.nordic {
--side-nav-active-text-color: var(--primary-text-color);
--scrollbar-text-color-hover: var(--primary-text-color);

Expand All @@ -56,7 +60,8 @@
.gray,
.dracula,
.catppuccinMocha,
.hotPink {
.hotPink,
.nordic {
--primary-shadow-color: rgba(0, 0, 0, 0.75);
}

Expand Down Expand Up @@ -237,6 +242,25 @@ it can be safely elided. This looks quite pleasant on this theme. */
text-decoration: underline;
}

.nordic {
--primary-text-color: #EEEEEE;
--secondary-text-color: #ddd;
--tertiary-text-color: #EEEEEE;
--title-color: #EEEEEE;
--bg-color: #2b2f3a;
--favorite-icon-color: #FFEA00;
--card-bg-color: #2e3440;
--secondary-card-bg-color: rgba(59, 66, 82, 0.75);
--scrollbar-color: #4b566a;
--scrollbar-color-hover: #4b566a;
--side-nav-color: #2e3440;
--side-nav-hover-color: #3b4252;
--side-nav-active-color: #3b4252;
--search-bar-color: #4b566a;
--logo-icon: url("../../_icons/iconNordicLightSmall.png");
--logo-text: url("../../_icons/textNordicLightSmall.png");
}

.mainRed,
.mainPink,
.mainPurple,
Expand Down
1 change: 1 addition & 0 deletions static/locales/en-US.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ Settings:
Catppuccin Mocha: Catppuccin Mocha
Pastel Pink: Pastel Pink
Hot Pink: Hot Pink
Nordic: Nordic
Main Color Theme:
Main Color Theme: Main Color Theme
Red: Red
Expand Down
Loading