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

Jump to bottom

Add gruvbox base theme and gruvbox green color theme #4805

Open
wants to merge 34 commits into
base: development
Choose a base branch
from
Open

Add gruvbox base theme and gruvbox green color theme #4805

Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
724ebe1
added gruvbox theme
DeaDvey Mar 25, 2024
616519d
attempted add of gruvbox green
DeaDvey Mar 25, 2024
21e0978
added green gruvbox theme
DeaDvey Mar 25, 2024
368316e
Merge branch 'FreeTubeApp:development' into development
DeaDvey Mar 25, 2024
4954085
Fixed lint issues
DeaDvey Mar 25, 2024
eb3217f
Merge branch 'development' of github.com:DeaDvey/FreeTube-Gruvboxthem…
DeaDvey Mar 25, 2024
6612cdf
fixed issue with secondary colour scheme not fully showing, I did not…
DeaDvey Mar 25, 2024
7bf0686
added light theme
DeaDvey Mar 25, 2024
7a8f731
Fixed lint
DeaDvey Mar 25, 2024
59fdaa2
Added red, yellow, blue, purple, aqua and orange colour themes for gr…
DeaDvey Mar 26, 2024
b9c2e4e
updated the icons to make them more consistent with the freetube logo…
DeaDvey Mar 26, 2024
11a2460
Merge branch 'FreeTubeApp:development' into development
DeaDvey Mar 27, 2024
0dfcf40
Fixed missing comma in css
DeaDvey Mar 27, 2024
94c13f7
Merge branch 'development' of github.com:DeaDvey/FreeTube-Gruvboxthem…
DeaDvey Mar 27, 2024
9f66ad9
Merge branch 'FreeTubeApp:development' into development
DeaDvey Mar 27, 2024
dfbad4c
Merge branch 'FreeTubeApp:development' into development
DeaDvey Apr 11, 2024
60794f4
Updated icons to be svgs to be inline with PR #4898
DeaDvey Apr 11, 2024
e1e45c0
fixed mis reference to png
DeaDvey Apr 11, 2024
dbaccfa
Fixed wrong svg loading and made Gruvbox main and sec show in menu, c…
DeaDvey Apr 12, 2024
719a0a6
modified ft-share-button scss and fixed color contrast issues
DeaDvey Apr 20, 2024
29b046a
Resolved conflict
DeaDvey Apr 20, 2024
753a562
Update src/renderer/components/ft-share-button/ft-share-button.scss
DeaDvey Apr 20, 2024
753b982
.
DeaDvey Apr 29, 2024
4154399
Resolved conflict
DeaDvey Apr 29, 2024
8ff34a5
Removed package-lock.json
DeaDvey Apr 29, 2024
318a9ec
resolved conflicts, I get an error saying there is no portal-vue
DeaDvey May 12, 2024
2243964
resolved conflicts and removed gruvbox light theme due to contrast is…
Jun 1, 2024
02e6bb1
fixed contrast issue with #fb4934 and #1d2021
DeaDvey Jun 1, 2024
3ee7452
Update src/renderer/themes.css
DeaDvey Jun 1, 2024
7c6e582
inserted Gruvbox below dracula (both)
DeaDvey Jun 1, 2024
a237962
moved gruvbox below dracula
DeaDvey Jun 1, 2024
4942f19
Update src/renderer/components/ft-share-button/ft-share-button.scss
DeaDvey Jun 6, 2024
689b3fb
Update src/renderer/components/ft-share-button/ft-share-button.scss
DeaDvey Jun 6, 2024
c32d628
changed text-with-main-color and text-with-accent-color to follow the…
DeaDvey Jun 6, 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
32 changes: 32 additions & 0 deletions _icons/iconGruvboxLightSmall.svg
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.
69 changes: 69 additions & 0 deletions _icons/textGruvboxLightSmall.svg
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 @@ -626,6 +626,8 @@ function runApp() {
return '#de1c85'
case 'nordic':
return '#2b2f3a'
case 'gruvbox-dark':
return '282828'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be updated to the new bg-color of 32302f.

case 'solarized-dark':
return '#002B36'
case 'solarized-light':
Expand Down
4 changes: 4 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 @@ -42,6 +42,7 @@

@at-root {
.dark &,
.gruvboxDark &,
.system[data-system-theme*='dark'] & {
filter: brightness(0.868);
}
Expand All @@ -56,6 +57,7 @@

.pastelPink &,
.light &,
.gruvboxLight &,
DeaDvey marked this conversation as resolved.
Show resolved Hide resolved
.solarizedLight &,
.system[data-system-theme*='light'] & {
filter: invert(0.87);
Expand All @@ -79,13 +81,15 @@
.dracula &,
.CatppuccinMocha &,
.hotPink &,
.gruvboxDark &,
.solarizedDark &,
.system[data-system-theme*='dark'] & {
background-image: url('../../assets/img/invidious-logo-dark.svg');
}

.pastelPink &,
.light &,
.gruvboxLight &,
DeaDvey marked this conversation as resolved.
Show resolved Hide resolved
.solarizedLight &,
.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/theme-settings/theme-settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ export default defineComponent({
// Third group
'catppuccinMocha',
'dracula',
'gruvboxDark',
'solarizedDark',
'solarizedLight'
]
Expand Down Expand Up @@ -116,6 +117,7 @@ export default defineComponent({
// Third group
this.$t('Settings.Theme Settings.Base Theme.Catppuccin Mocha'),
this.$t('Settings.Theme Settings.Base Theme.Dracula'),
this.$t('Settings.Theme Settings.Base Theme.Gruvbox Dark'),
this.$t('Settings.Theme Settings.Base Theme.Solarized Dark'),
this.$t('Settings.Theme Settings.Base Theme.Solarized Light')
]
Expand Down
14 changes: 14 additions & 0 deletions src/renderer/helpers/colors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ export const colors = [
{ name: 'CatppuccinMochaSapphire', value: '#74C7EC' },
{ name: 'CatppuccinMochaBlue', value: '#89B4FA' },
{ name: 'CatppuccinMochaLavender', value: '#B4BEFE' },
{ name: 'GruvboxGreen', value: '#b8bb26' },
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

put this below the dracula ones

{ name: 'GruvboxRed', value: 'fb4934' },
{ name: 'GruvboxYellow', value: '#fabd2f' },
{ name: 'GruvboxBlue', value: '#83a598' },
{ name: 'GruvboxPurple', value: '#d3869b' },
{ name: 'GruvboxAqua', value: '#8ec07c' },
{ name: 'GruvboxOrange', value: '#fe8019' },
{ name: 'DraculaCyan', value: '#8BE9FD' },
{ name: 'DraculaGreen', value: '#50FA7B' },
{ name: 'DraculaOrange', value: '#FFB86C' },
Expand Down Expand Up @@ -87,6 +94,13 @@ export function getColorTranslations() {
i18n.t('Settings.Theme Settings.Main Color Theme.Dracula Purple'),
i18n.t('Settings.Theme Settings.Main Color Theme.Dracula Red'),
i18n.t('Settings.Theme Settings.Main Color Theme.Dracula Yellow'),
i18n.t('Settings.Theme Settings.Main Color Theme.Gruvbox Green'),
i18n.t('Settings.Theme Settings.Main Color Theme.Gruvbox Red'),
i18n.t('Settings.Theme Settings.Main Color Theme.Gruvbox Yellow'),
i18n.t('Settings.Theme Settings.Main Color Theme.Gruvbox Blue'),
i18n.t('Settings.Theme Settings.Main Color Theme.Gruvbox Purple'),
i18n.t('Settings.Theme Settings.Main Color Theme.Gruvbox Aqua'),
i18n.t('Settings.Theme Settings.Main Color Theme.Gruvbox Orange'),
i18n.t('Settings.Theme Settings.Main Color Theme.Solarized Yellow'),
i18n.t('Settings.Theme Settings.Main Color Theme.Solarized Orange'),
i18n.t('Settings.Theme Settings.Main Color Theme.Solarized Red'),
Expand Down
Loading