From 3f4de3b1cc9b33f741c28aa7c3f92ffdb5fbcd17 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 28 Sep 2018 17:49:37 +0900
Subject: [PATCH] wip
---
.../desktop/views/components/drive.folder.vue | 20 ++++++-------------
src/client/theme/dark.json | 4 ++++
src/client/theme/light.json | 4 ++++
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/client/app/desktop/views/components/drive.folder.vue b/src/client/app/desktop/views/components/drive.folder.vue
index cb49215cb..cfc2b64ff 100644
--- a/src/client/app/desktop/views/components/drive.folder.vue
+++ b/src/client/app/desktop/views/components/drive.folder.vue
@@ -214,12 +214,10 @@ export default Vue.extend({
</script>
<style lang="stylus" scoped>
-
-
-root(isDark)
+.ynntpczxvnusfwdyxsfuhvcmuypqopdd
padding 8px
height 64px
- background isDark ? var(--primaryAlpha02) : var(--primaryLighten95)
+ background var(--desktopDriveFolderBg)
border-radius 4px
&, *
@@ -229,10 +227,10 @@ root(isDark)
pointer-events none
&:hover
- //background isDark ? rgba(var(--primaryLighten10), 0.2) : var(--primaryLighten90)
+ background var(--desktopDriveFolderHoverBg)
&:active
- //background isDark ? rgba(var(--primaryDarken10), 0.2) : var(--primaryLighten85)
+ background var(--desktopDriveFolderActiveBg)
&[data-is-contextmenu-showing]
&[data-draghover]
@@ -248,22 +246,16 @@ root(isDark)
border-radius 4px
&[data-draghover]
- //background isDark ? rgba(var(--primaryDarken10), 0.2) : var(--primaryLighten90)
+ background var(--desktopDriveFolderActiveBg)
> .name
margin 0
font-size 0.9em
- color isDark ? #fff : var(--primaryDarken30)
+ color var(--desktopDriveFolderFg)
> [data-fa]
margin-right 4px
margin-left 2px
text-align left
-.ynntpczxvnusfwdyxsfuhvcmuypqopdd[data-darkmode]
- root(true)
-
-.ynntpczxvnusfwdyxsfuhvcmuypqopdd:not([data-darkmode])
- root(false)
-
</style>
diff --git a/src/client/theme/dark.json b/src/client/theme/dark.json
index 151001350..29d4fc2e5 100644
--- a/src/client/theme/dark.json
+++ b/src/client/theme/dark.json
@@ -141,6 +141,10 @@
"desktopTimelineSrcHover": "@faceTextButtonHover",
"desktopWindowTitle": "@faceHeaderText",
"desktopDriveBg": "@bg",
+ "desktopDriveFolderBg": ":alpha<0.2<$primary",
+ "desktopDriveFolderHoverBg": ":alpha<0.3<$primary",
+ "desktopDriveFolderActiveBg": ":alpha<0.3<:darken<10<$primary",
+ "desktopDriveFolderFg": "#fff",
"desktopSettingsNavItem": ":alpha<0.8<$text",
"desktopSettingsNavItemHover": ":lighten<10<$text",
diff --git a/src/client/theme/light.json b/src/client/theme/light.json
index 0f26f8b16..e4116480e 100644
--- a/src/client/theme/light.json
+++ b/src/client/theme/light.json
@@ -141,6 +141,10 @@
"desktopTimelineSrcHover": "#525a5f",
"desktopWindowTitle": "#666",
"desktopDriveBg": "#fff",
+ "desktopDriveFolderBg": ":lighten<31<$primary",
+ "desktopDriveFolderHoverBg": ":lighten<27<$primary",
+ "desktopDriveFolderActiveBg": ":lighten<25<$primary",
+ "desktopDriveFolderFg": ":darken<10<$primary",
"desktopSettingsNavItem": ":alpha<0.8<$text",
"desktopSettingsNavItemHover": ":darken<10<$text",