Merge pull request #624 from h3poteto/iss-251

closes #251 Add some color themes
This commit is contained in:
AkiraFukushima 2018-09-23 10:31:28 +09:00 committed by GitHub
commit a7acab30d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 82 additions and 1 deletions

View File

@ -98,6 +98,9 @@
"theme": {
"light": "Hell",
"dark": "Dunkel",
"solarized_light": "SolarizedLight",
"solarized_dark": "SolarizedDark",
"kimbie_dark": "KimbieDark",
"custom": "Custom"
},
"custom_theme": {

View File

@ -98,6 +98,9 @@
"theme": {
"light": "Light",
"dark": "Dark",
"solarized_light": "SolarizedLight",
"solarized_dark": "SolarizedDark",
"kimbie_dark": "KimbieDark",
"custom": "Custom"
},
"custom_theme": {

View File

@ -98,6 +98,9 @@
"theme": {
"light": "Clair",
"dark": "Foncé",
"solarized_light": "SolarizedLight",
"solarized_dark": "SolarizedDark",
"kimbie_dark": "KimbieDark",
"custom": "Custom"
},
"custom_theme": {

View File

@ -98,6 +98,9 @@
"theme": {
"light": "標準",
"dark": "ダーク",
"solarized_light": "SolarizedLight",
"solarized_dark": "SolarizedDark",
"kimbie_dark": "KimbieDark",
"custom": "カスタム"
},
"custom_theme": {

View File

@ -98,6 +98,9 @@
"theme": {
"light": "밝은 테마",
"dark": "어두운 테마",
"solarized_light": "SolarizedLight",
"solarized_dark": "SolarizedDark",
"kimbie_dark": "KimbieDark",
"custom": "Custom"
},
"custom_theme": {

View File

@ -98,6 +98,9 @@
"theme": {
"light": "Jasny",
"dark": "Ciemny",
"solarized_light": "SolarizedLight",
"solarized_dark": "SolarizedDark",
"kimbie_dark": "KimbieDark",
"custom": "Custom"
},
"custom_theme": {

View File

@ -7,6 +7,18 @@ export default {
name: 'preferences.appearance.theme.dark',
key: 'dark'
},
SolarizedLight: {
name: 'preferences.appearance.theme.solarized_light',
key: 'solarized_light'
},
SolarizedDark: {
name: 'preferences.appearance.theme.solarized_dark',
key: 'solarized_dark'
},
KimbieDark: {
name: 'preferences.appearance.theme.kimbie_dark',
key: 'kimbie_dark'
},
Custom: {
name: 'preferences.appearance.theme.custom',
key: 'custom'

View File

@ -84,6 +84,9 @@ export default {
themes: [
Theme.Light,
Theme.Dark,
Theme.SolarizedLight,
Theme.SolarizedDark,
Theme.KimbieDark,
Theme.Custom
],
timeFormats: [

View File

@ -1,6 +1,6 @@
import { ipcRenderer } from 'electron'
import router from '../router'
import { LightTheme, DarkTheme } from '../utils/theme'
import { LightTheme, DarkTheme, SolarizedLightTheme, SolarizedDarkTheme, KimbieDarkTheme } from '../utils/theme'
import Visibility from '~/src/constants/visibility'
import DisplayStyle from '~/src/constants/displayStyle'
import Theme from '~/src/constants/theme'
@ -84,6 +84,15 @@ const App = {
case Theme.Dark.key:
commit('updateTheme', DarkTheme)
break
case Theme.SolarizedLight.key:
commit('updateTheme', SolarizedLightTheme)
break
case Theme.SolarizedDark.key:
commit('updateTheme', SolarizedDarkTheme)
break
case Theme.KimbieDark.key:
commit('updateTheme', KimbieDarkTheme)
break
case Theme.Custom.key:
commit('updateTheme', appearance.customThemeColor)
break

View File

@ -23,3 +23,42 @@ export const DarkTheme = {
header_menu_color: '#444b5d',
wrapper_mask_color: 'rgba(0, 0, 0, 0.7)'
}
export const SolarizedLightTheme = {
background_color: '#fdf6e3',
selected_background_color: '#eee8d5',
global_header_color: '#002b36',
side_menu_color: '#073642',
primary_color: '#657b83',
regular_color: '#586e75',
secondary_color: '#839496',
border_color: '#93a1a1',
header_menu_color: '#fdf6e3',
wrapper_mask_color: 'rgba(255, 255, 255, 0.7)'
}
export const SolarizedDarkTheme = {
background_color: '#073642',
selected_background_color: '#586e75',
global_header_color: '#073642',
side_menu_color: '#002b36',
primary_color: '#fdf6e3',
regular_color: '#eee8d5',
secondary_color: '#839496',
border_color: '#93a1a1',
header_menu_color: '#393f4f',
wrapper_mask_color: 'rgba(0, 0, 0, 0.7)'
}
export const KimbieDarkTheme = {
background_color: '#221a0f',
selected_background_color: '#2e2920',
global_header_color: '#221a0f',
side_menu_color: '#362712',
primary_color: '#fbebd4',
regular_color: '#e4c6a5',
secondary_color: '#d3af86',
border_color: '#d6baad',
header_menu_color: '#a57a4c',
wrapper_mask_color: 'rgba(0, 0, 0, 0.7)'
}