From ea1e3ed12bf99571188aa454c34ddedbcb07e754 Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Sat, 22 Sep 2018 23:37:59 +0900
Subject: [PATCH 1/4] refs #251 Add solarized dark theme
---
src/config/locales/en/translation.json | 1 +
src/constants/theme.js | 4 ++++
src/renderer/components/Preferences/Appearance.vue | 1 +
src/renderer/store/App.js | 5 ++++-
src/renderer/utils/theme.js | 13 +++++++++++++
5 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/src/config/locales/en/translation.json b/src/config/locales/en/translation.json
index 313bb26f..2fee30cf 100644
--- a/src/config/locales/en/translation.json
+++ b/src/config/locales/en/translation.json
@@ -98,6 +98,7 @@
"theme": {
"light": "Light",
"dark": "Dark",
+ "solarized_dark": "SolarizedDark",
"custom": "Custom"
},
"custom_theme": {
diff --git a/src/constants/theme.js b/src/constants/theme.js
index 648508e9..ef7ae742 100644
--- a/src/constants/theme.js
+++ b/src/constants/theme.js
@@ -7,6 +7,10 @@ export default {
name: 'preferences.appearance.theme.dark',
key: 'dark'
},
+ SolarizedDark: {
+ name: 'preferences.appearance.theme.solarized_dark',
+ key: 'solarized_dark'
+ },
Custom: {
name: 'preferences.appearance.theme.custom',
key: 'custom'
diff --git a/src/renderer/components/Preferences/Appearance.vue b/src/renderer/components/Preferences/Appearance.vue
index 44451fcc..a1680d28 100644
--- a/src/renderer/components/Preferences/Appearance.vue
+++ b/src/renderer/components/Preferences/Appearance.vue
@@ -84,6 +84,7 @@ export default {
themes: [
Theme.Light,
Theme.Dark,
+ Theme.SolarizedDark,
Theme.Custom
],
timeFormats: [
diff --git a/src/renderer/store/App.js b/src/renderer/store/App.js
index cd9da1ec..76f42772 100644
--- a/src/renderer/store/App.js
+++ b/src/renderer/store/App.js
@@ -1,6 +1,6 @@
import { ipcRenderer } from 'electron'
import router from '../router'
-import { LightTheme, DarkTheme } from '../utils/theme'
+import { LightTheme, DarkTheme, SolarizedDarkTheme } from '../utils/theme'
import Visibility from '~/src/constants/visibility'
import DisplayStyle from '~/src/constants/displayStyle'
import Theme from '~/src/constants/theme'
@@ -84,6 +84,9 @@ const App = {
case Theme.Dark.key:
commit('updateTheme', DarkTheme)
break
+ case Theme.SolarizedDark.key:
+ commit('updateTheme', SolarizedDarkTheme)
+ break
case Theme.Custom.key:
commit('updateTheme', appearance.customThemeColor)
break
diff --git a/src/renderer/utils/theme.js b/src/renderer/utils/theme.js
index 05481d55..9e584416 100644
--- a/src/renderer/utils/theme.js
+++ b/src/renderer/utils/theme.js
@@ -23,3 +23,16 @@ export const DarkTheme = {
header_menu_color: '#444b5d',
wrapper_mask_color: 'rgba(0, 0, 0, 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)'
+}
From d93601f148b90d8510bfe3335a92811534acedfa Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Sun, 23 Sep 2018 01:19:12 +0900
Subject: [PATCH 2/4] refs #251 Add solarized light theme
---
src/config/locales/en/translation.json | 1 +
src/constants/theme.js | 4 ++++
src/renderer/components/Preferences/Appearance.vue | 1 +
src/renderer/store/App.js | 5 ++++-
src/renderer/utils/theme.js | 13 +++++++++++++
5 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/src/config/locales/en/translation.json b/src/config/locales/en/translation.json
index 2fee30cf..4a0c3e93 100644
--- a/src/config/locales/en/translation.json
+++ b/src/config/locales/en/translation.json
@@ -98,6 +98,7 @@
"theme": {
"light": "Light",
"dark": "Dark",
+ "solarized_light": "SolarizedLight",
"solarized_dark": "SolarizedDark",
"custom": "Custom"
},
diff --git a/src/constants/theme.js b/src/constants/theme.js
index ef7ae742..a4f47428 100644
--- a/src/constants/theme.js
+++ b/src/constants/theme.js
@@ -7,6 +7,10 @@ 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'
diff --git a/src/renderer/components/Preferences/Appearance.vue b/src/renderer/components/Preferences/Appearance.vue
index a1680d28..dbcc99ab 100644
--- a/src/renderer/components/Preferences/Appearance.vue
+++ b/src/renderer/components/Preferences/Appearance.vue
@@ -84,6 +84,7 @@ export default {
themes: [
Theme.Light,
Theme.Dark,
+ Theme.SolarizedLight,
Theme.SolarizedDark,
Theme.Custom
],
diff --git a/src/renderer/store/App.js b/src/renderer/store/App.js
index 76f42772..7c4a7ac8 100644
--- a/src/renderer/store/App.js
+++ b/src/renderer/store/App.js
@@ -1,6 +1,6 @@
import { ipcRenderer } from 'electron'
import router from '../router'
-import { LightTheme, DarkTheme, SolarizedDarkTheme } from '../utils/theme'
+import { LightTheme, DarkTheme, SolarizedLightTheme, SolarizedDarkTheme } from '../utils/theme'
import Visibility from '~/src/constants/visibility'
import DisplayStyle from '~/src/constants/displayStyle'
import Theme from '~/src/constants/theme'
@@ -84,6 +84,9 @@ 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
diff --git a/src/renderer/utils/theme.js b/src/renderer/utils/theme.js
index 9e584416..81d9618e 100644
--- a/src/renderer/utils/theme.js
+++ b/src/renderer/utils/theme.js
@@ -24,6 +24,19 @@ export const DarkTheme = {
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',
From 33b90e39c89c795b7da583ac468ff2b0fb11e6dd Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Sun, 23 Sep 2018 10:13:28 +0900
Subject: [PATCH 3/4] refs #251 Add kimbie dark theme
---
src/config/locales/en/translation.json | 1 +
src/constants/theme.js | 4 ++++
src/renderer/components/Preferences/Appearance.vue | 1 +
src/renderer/store/App.js | 5 ++++-
src/renderer/utils/theme.js | 13 +++++++++++++
5 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/src/config/locales/en/translation.json b/src/config/locales/en/translation.json
index 4a0c3e93..8acfda6c 100644
--- a/src/config/locales/en/translation.json
+++ b/src/config/locales/en/translation.json
@@ -100,6 +100,7 @@
"dark": "Dark",
"solarized_light": "SolarizedLight",
"solarized_dark": "SolarizedDark",
+ "kimbie_dark": "KimbieDark",
"custom": "Custom"
},
"custom_theme": {
diff --git a/src/constants/theme.js b/src/constants/theme.js
index a4f47428..a4a36fdb 100644
--- a/src/constants/theme.js
+++ b/src/constants/theme.js
@@ -15,6 +15,10 @@ export default {
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'
diff --git a/src/renderer/components/Preferences/Appearance.vue b/src/renderer/components/Preferences/Appearance.vue
index dbcc99ab..4d33daa0 100644
--- a/src/renderer/components/Preferences/Appearance.vue
+++ b/src/renderer/components/Preferences/Appearance.vue
@@ -86,6 +86,7 @@ export default {
Theme.Dark,
Theme.SolarizedLight,
Theme.SolarizedDark,
+ Theme.KimbieDark,
Theme.Custom
],
timeFormats: [
diff --git a/src/renderer/store/App.js b/src/renderer/store/App.js
index 7c4a7ac8..8d0466c2 100644
--- a/src/renderer/store/App.js
+++ b/src/renderer/store/App.js
@@ -1,6 +1,6 @@
import { ipcRenderer } from 'electron'
import router from '../router'
-import { LightTheme, DarkTheme, SolarizedLightTheme, SolarizedDarkTheme } 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'
@@ -90,6 +90,9 @@ const App = {
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
diff --git a/src/renderer/utils/theme.js b/src/renderer/utils/theme.js
index 81d9618e..4997e79d 100644
--- a/src/renderer/utils/theme.js
+++ b/src/renderer/utils/theme.js
@@ -49,3 +49,16 @@ export const SolarizedDarkTheme = {
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)'
+}
From 5efbb3dd284a6448d7658d86a0177d3bd34e2839 Mon Sep 17 00:00:00 2001
From: AkiraFukushima
Date: Sun, 23 Sep 2018 10:17:24 +0900
Subject: [PATCH 4/4] refs #251 Update locales for themes
---
src/config/locales/de/translation.json | 3 +++
src/config/locales/fr/translation.json | 3 +++
src/config/locales/ja/translation.json | 3 +++
src/config/locales/ko/translation.json | 3 +++
src/config/locales/pl/translation.json | 3 +++
5 files changed, 15 insertions(+)
diff --git a/src/config/locales/de/translation.json b/src/config/locales/de/translation.json
index 4bb8ee41..c9ff8ed6 100644
--- a/src/config/locales/de/translation.json
+++ b/src/config/locales/de/translation.json
@@ -98,6 +98,9 @@
"theme": {
"light": "Hell",
"dark": "Dunkel",
+ "solarized_light": "SolarizedLight",
+ "solarized_dark": "SolarizedDark",
+ "kimbie_dark": "KimbieDark",
"custom": "Custom"
},
"custom_theme": {
diff --git a/src/config/locales/fr/translation.json b/src/config/locales/fr/translation.json
index b4df4bbc..f88a48a2 100644
--- a/src/config/locales/fr/translation.json
+++ b/src/config/locales/fr/translation.json
@@ -98,6 +98,9 @@
"theme": {
"light": "Clair",
"dark": "Foncé",
+ "solarized_light": "SolarizedLight",
+ "solarized_dark": "SolarizedDark",
+ "kimbie_dark": "KimbieDark",
"custom": "Custom"
},
"custom_theme": {
diff --git a/src/config/locales/ja/translation.json b/src/config/locales/ja/translation.json
index d1b82300..63af2e66 100644
--- a/src/config/locales/ja/translation.json
+++ b/src/config/locales/ja/translation.json
@@ -98,6 +98,9 @@
"theme": {
"light": "標準",
"dark": "ダーク",
+ "solarized_light": "SolarizedLight",
+ "solarized_dark": "SolarizedDark",
+ "kimbie_dark": "KimbieDark",
"custom": "カスタム"
},
"custom_theme": {
diff --git a/src/config/locales/ko/translation.json b/src/config/locales/ko/translation.json
index 2909df4b..d6b75cb4 100644
--- a/src/config/locales/ko/translation.json
+++ b/src/config/locales/ko/translation.json
@@ -98,6 +98,9 @@
"theme": {
"light": "밝은 테마",
"dark": "어두운 테마",
+ "solarized_light": "SolarizedLight",
+ "solarized_dark": "SolarizedDark",
+ "kimbie_dark": "KimbieDark",
"custom": "Custom"
},
"custom_theme": {
diff --git a/src/config/locales/pl/translation.json b/src/config/locales/pl/translation.json
index 61767596..4130851c 100644
--- a/src/config/locales/pl/translation.json
+++ b/src/config/locales/pl/translation.json
@@ -98,6 +98,9 @@
"theme": {
"light": "Jasny",
"dark": "Ciemny",
+ "solarized_light": "SolarizedLight",
+ "solarized_dark": "SolarizedDark",
+ "kimbie_dark": "KimbieDark",
"custom": "Custom"
},
"custom_theme": {