Deck (#6504)

* wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip
2020-07-11 10:13:11 +09:00
parent 5b28d7bf90
commit cf3fc97202
56 changed files with 2695 additions and 907 deletions
--- a/src/client/themes/_dark.json5
+++ b/src/client/themes/_dark.json5
@@ -26,8 +26,8 @@
 		panelHeaderDivider: 'rgba(0, 0, 0, 0)',
 		panelBorder: 'rgba(0, 0, 0, 0)',
 		shadow: 'rgba(0, 0, 0, 0.1)',
-		header: 'rgba(20, 20, 20, 0.75)',
-		navBg: '@panel',
+		header: ':alpha<0.7<@bg',
+		navBg: '@bg',
 		navFg: '@fg',
 		navHoverFg: ':lighten<17<@fg',
 		navActive: '@accent',
@@ -58,6 +58,7 @@
 		wallpaperOverlay: 'rgba(0, 0, 0, 0.5)',
 		badge: '#31b1ce',
 		messageBg: ':lighten<5<@bg',
+		deckColumnBorder: ':lighten<10<@panel',
 		X1: ':alpha<0<@bg',
 		X2: ':darken<2<@panel',
 		X3: 'rgba(255, 255, 255, 0.05)',
--- a/src/client/themes/_light.json5
+++ b/src/client/themes/_light.json5
@@ -26,8 +26,8 @@
 		panelHeaderDivider: 'rgba(0, 0, 0, 0)',
 		panelBorder: 'rgba(0, 0, 0, 0)',
 		shadow: 'rgba(0, 0, 0, 0.1)',
-		header: 'rgba(255, 255, 255, 0.75)',
-		navBg: '@panel',
+		header: ':alpha<0.7<@bg',
+		navBg: '@bg',
 		navFg: '@fg',
 		navHoverFg: ':darken<17<@fg',
 		navActive: '@accent',
@@ -58,6 +58,7 @@
 		wallpaperOverlay: 'rgba(255, 255, 255, 0.5)',
 		badge: '#31b1ce',
 		messageBg: '@panel',
+		deckColumnBorder: ':darken<20<@panel',
 		X1: ':alpha<0<@bg',
 		X2: ':darken<2<@panel',
 		X3: 'rgba(0, 0, 0, 0.05)',
--- a/src/client/themes/black.json5
+++ b/src/client/themes/black.json5
@@ -13,5 +13,6 @@
 		panelHeaderDivider: '@divider',
 		panelBorder: '@divider',
 		messageBg: '#1d1d1d',
+		deckColumnBorder: '@divider',
 	},
 }
--- a/src/client/themes/lilac.json5
+++ b/src/client/themes/lilac.json5
@@ -10,9 +10,11 @@
 		accent: 'rgb(206, 147, 191)',
 		bg: 'rgb(253, 242, 243)',
 		fg: 'rgb(161, 139, 146)',
+		divider: '#ece7e7',
 		renote: '@accent',
 		link: '@accent',
 		mention: '@accent',
 		hashtag: '@accent',
+		panelHeaderDivider: '@divider',
 	},
 }
--- a/src/client/themes/rainy.json5
+++ b/src/client/themes/rainy.json5
@@ -11,5 +11,6 @@
 		bg: 'rgb(220, 229, 232)',
 		fg: 'rgb(139, 153, 161)',
 		renote: '@accent',
+		panelHeaderDivider: '@divider',
 	},
 }
--- a/src/client/themes/white.json5
+++ b/src/client/themes/white.json5
@@ -8,7 +8,11 @@
 	base: 'light',

 	props: {
+		bg: '#f2f2f2',
+		header: ':alpha<0.7<@bg',
+		navBg: '@bg',
 		panelHeaderDivider: '@divider',
 		messageBg: '#dedede',
+		deckColumnBorder: '#cccccc',
 	},
 }