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.

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

Add: Gruvbox color schemes & accent colors #5887

Merged
merged 20 commits into from
Nov 25, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
4 changes: 4 additions & 0 deletions _icons/iconGruvboxDarkSmall.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions _icons/iconGruvboxLightSmall.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions _icons/textGruvboxDarkSmall.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions _icons/textGruvboxLightSmall.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 7 additions & 3 deletions src/main/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ function runApp() {
requestHeaders.Authorization = invidiousAuthorization.authorization
}
}

DontBlameMe99 marked this conversation as resolved.
Show resolved Hide resolved
callback({ requestHeaders })
})

Expand All @@ -466,7 +466,7 @@ function runApp() {
if (responseHeaders) {
delete responseHeaders['set-cookie']
}

DontBlameMe99 marked this conversation as resolved.
Show resolved Hide resolved
callback({ responseHeaders })
})

Expand Down Expand Up @@ -662,6 +662,10 @@ function runApp() {
return '#002B36'
case 'solarized-light':
return '#fdf6e3'
case 'gruvbox-dark':
return '#282828'
case 'gruvbox-light':
return '#fbf1c7'
case 'system':
default:
return nativeTheme.shouldUseDarkColors ? '#212121' : '#f1f1f1'
Expand Down Expand Up @@ -757,7 +761,7 @@ function runApp() {
// If called multiple times
// Duplicate menu items will be added
if (replaceMainWindow) {

DontBlameMe99 marked this conversation as resolved.
Show resolved Hide resolved
setMenu()
}

Expand Down
7 changes: 6 additions & 1 deletion src/renderer/components/theme-settings/theme-settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,11 @@ export default defineComponent({
// Third group
'catppuccinMocha',
'dracula',
'gruvboxDark',
'gruvboxLight',
'solarizedDark',
DontBlameMe99 marked this conversation as resolved.
Show resolved Hide resolved
'solarizedLight'
'solarizedLight',
DontBlameMe99 marked this conversation as resolved.
Show resolved Hide resolved
]
}
},
Expand Down Expand Up @@ -117,8 +120,10 @@ 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.Gruvbox Light'),
this.$t('Settings.Theme Settings.Base Theme.Solarized Dark'),
this.$t('Settings.Theme Settings.Base Theme.Solarized Light')
DontBlameMe99 marked this conversation as resolved.
Show resolved Hide resolved
this.$t('Settings.Theme Settings.Base Theme.Solarized Light'),
DontBlameMe99 marked this conversation as resolved.
Show resolved Hide resolved
]
},

Expand Down
14 changes: 14 additions & 0 deletions src/renderer/helpers/colors.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@ export const colors = [
{ name: 'DraculaPurple', value: '#BD93F9' },
{ name: 'DraculaRed', value: '#FF5555' },
{ name: 'DraculaYellow', value: '#F1FA8C' },
{ name: 'GruvboxRed', value: '#fb4934' },
{ name: 'GruvboxGreen', value: '#b8bb26' },
{ name: 'GruvboxYellow', value: '#fabd2f' },
{ name: 'GruvboxBlue', value: '#83a593' },
{ name: 'GruvboxPurple', value: '#d3869b' },
{ name: 'GruvboxAqua', value: '#8ec07c' },
{ name: 'GruvboxOrange', value: '#fe8019' },
{ name: 'SolarizedYellow', value: '#b58900' },
{ name: 'SolarizedOrange', value: '#cb4b16' },
{ name: 'SolarizedRed', value: '#dc322f' },
Expand Down Expand Up @@ -88,6 +95,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 Red'),
i18n.t('Settings.Theme Settings.Main Color Theme.Gruvbox Green'),
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
Loading