From 4d0b335748be0abb1ff22b1af5857900fa1a92f9 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 31 Dec 2018 02:33:03 +0900
Subject: [PATCH] [Client] Improve theme :art:

---
 src/client/app/common/views/components/ui/radio.vue  | 4 ++--
 src/client/app/common/views/components/ui/switch.vue | 6 +++---
 src/client/style.styl                                | 6 +++---
 src/client/theme/dark.json5                          | 7 +++++++
 src/client/theme/gruvbox-dark.json5                  | 3 +++
 src/client/theme/light.json5                         | 7 +++++++
 src/client/theme/monokai.json5                       | 3 +++
 7 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/client/app/common/views/components/ui/radio.vue b/src/client/app/common/views/components/ui/radio.vue
index e8910d437..468318b58 100644
--- a/src/client/app/common/views/components/ui/radio.vue
+++ b/src/client/app/common/views/components/ui/radio.vue
@@ -64,10 +64,10 @@ export default Vue.extend({
 
 	&.checked
 		> .button
-			border-color var(--primary)
+			border-color var(--radioActive)
 
 			&:after
-				background-color var(--primary)
+				background-color var(--radioActive)
 				transform scale(1)
 				opacity 1
 
diff --git a/src/client/app/common/views/components/ui/switch.vue b/src/client/app/common/views/components/ui/switch.vue
index b8bd9e2fc..48a296c36 100644
--- a/src/client/app/common/views/components/ui/switch.vue
+++ b/src/client/app/common/views/components/ui/switch.vue
@@ -77,11 +77,11 @@ export default Vue.extend({
 
 	&.checked
 		> .button
-			background-color var(--primaryAlpha04)
-			border-color var(--primaryAlpha04)
+			background-color var(--switchActiveTrack)
+			border-color var(--switchActiveTrack)
 
 			> *
-				background-color var(--primary)
+				background-color var(--switchActive)
 				transform translateX(14px)
 
 	> input
diff --git a/src/client/style.styl b/src/client/style.styl
index 8ebba2f15..adc331ebb 100644
--- a/src/client/style.styl
+++ b/src/client/style.styl
@@ -22,7 +22,7 @@ html, body
 
 a
 	text-decoration none
-	color var(--primary)
+	color var(--link)
 	cursor pointer
 
 	&:hover
@@ -33,7 +33,7 @@ a
 
 @css {
 	a {
-		tap-highlight-color: var(--primaryAlpha07) !important;
-		-webkit-tap-highlight-color: var(--primaryAlpha07) !important;
+		tap-highlight-color: var(--linkTapHighlight) !important;
+		-webkit-tap-highlight-color: var(--linkTapHighlight) !important;
 	}
 }
diff --git a/src/client/theme/dark.json5 b/src/client/theme/dark.json5
index fe85e94d6..13c55999e 100644
--- a/src/client/theme/dark.json5
+++ b/src/client/theme/dark.json5
@@ -24,8 +24,15 @@
 		scrollbarHandle: ':lighten<5<$secondary',
 		scrollbarHandleHover: ':lighten<10<$secondary',
 
+		link: '$primary',
+		linkTapHighlight: ':alpha<0.7<@link',
+
 		notificationIndicator: '$primary',
 
+		switchActive: '$primary',
+		switchActiveTrack: ':alpha<0.4<@switchActive',
+		radioActive: '$primary',
+
 		face: '$secondary',
 		faceText: '#fff',
 		faceHeader: ':lighten<5<$secondary',
diff --git a/src/client/theme/gruvbox-dark.json5 b/src/client/theme/gruvbox-dark.json5
index 629f0a3fd..2d0315319 100644
--- a/src/client/theme/gruvbox-dark.json5
+++ b/src/client/theme/gruvbox-dark.json5
@@ -22,5 +22,8 @@
 		mfmLink: 'rgb(104, 157, 106)',
 		mfmHashtag: 'rgb(251, 73, 52)',
 		notificationIndicator: 'rgb(184, 187, 38)',
+		switchActive: 'rgb(254, 128, 25)',
+		radioActive: 'rgb(131, 165, 152)',
+		link: 'rgb(104, 157, 106)',
 	},
 }
diff --git a/src/client/theme/light.json5 b/src/client/theme/light.json5
index 876306b16..65bd3b121 100644
--- a/src/client/theme/light.json5
+++ b/src/client/theme/light.json5
@@ -24,8 +24,15 @@
 		scrollbarHandle: '#00000033',
 		scrollbarHandleHover: '#00000066',
 
+		link: '$primary',
+		linkTapHighlight: ':alpha<0.7<@link',
+
 		notificationIndicator: '$primary',
 
+		switchActive: '$primary',
+		switchActiveTrack: ':alpha<0.4<@switchActive',
+		radioActive: '$primary',
+
 		face: '$secondary',
 		faceText: '$text',
 		faceHeader: ':lighten<5<$secondary',
diff --git a/src/client/theme/monokai.json5 b/src/client/theme/monokai.json5
index 6ee0f875a..1ecd68730 100644
--- a/src/client/theme/monokai.json5
+++ b/src/client/theme/monokai.json5
@@ -22,5 +22,8 @@
 		mfmLink: '#e6db74',
 		mfmHashtag: '#fd971f',
 		notificationIndicator: '#66d9ef',
+		switchActive: 'rgb(166, 226, 46)',
+		radioActive: '#fd971f',
+		link: '#e6db74',
 	},
 }