usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wip

This commit is contained in:
syuilo 2018-09-28 17:49:37 +09:00
parent e0d3fd17ce
commit 3f4de3b1cc
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/client/app/desktop/views/components/drive.folder.vue
View File

@ -214,12 +214,10 @@ export default Vue.extend({
</script> </script>
<style lang="stylus" scoped> <style lang="stylus" scoped>
.ynntpczxvnusfwdyxsfuhvcmuypqopdd
root(isDark)
padding 8px padding 8px
height 64px height 64px
background isDark ? var(--primaryAlpha02) : var(--primaryLighten95) background var(--desktopDriveFolderBg)
border-radius 4px border-radius 4px
&, * &, *
@ -229,10 +227,10 @@ root(isDark)
pointer-events none pointer-events none
&:hover &:hover
//background isDark ? rgba(var(--primaryLighten10), 0.2) : var(--primaryLighten90) background var(--desktopDriveFolderHoverBg)
&:active &:active
//background isDark ? rgba(var(--primaryDarken10), 0.2) : var(--primaryLighten85) background var(--desktopDriveFolderActiveBg)
&[data-is-contextmenu-showing] &[data-is-contextmenu-showing]
&[data-draghover] &[data-draghover]
@ -248,22 +246,16 @@ root(isDark)
border-radius 4px border-radius 4px
&[data-draghover] &[data-draghover]
//background isDark ? rgba(var(--primaryDarken10), 0.2) : var(--primaryLighten90) background var(--desktopDriveFolderActiveBg)
> .name > .name
margin 0 margin 0
font-size 0.9em font-size 0.9em
color isDark ? #fff : var(--primaryDarken30) color var(--desktopDriveFolderFg)
> [data-fa] > [data-fa]
margin-right 4px margin-right 4px
margin-left 2px margin-left 2px
text-align left text-align left
.ynntpczxvnusfwdyxsfuhvcmuypqopdd[data-darkmode]
root(true)
.ynntpczxvnusfwdyxsfuhvcmuypqopdd:not([data-darkmode])
root(false)
</style> </style>

4
src/client/theme/dark.json
View File

@ -141,6 +141,10 @@
"desktopTimelineSrcHover": "@faceTextButtonHover", "desktopTimelineSrcHover": "@faceTextButtonHover",
"desktopWindowTitle": "@faceHeaderText", "desktopWindowTitle": "@faceHeaderText",
"desktopDriveBg": "@bg", "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", "desktopSettingsNavItem": ":alpha<0.8<$text",
"desktopSettingsNavItemHover": ":lighten<10<$text", "desktopSettingsNavItemHover": ":lighten<10<$text",

4
src/client/theme/light.json
View File

@ -141,6 +141,10 @@
"desktopTimelineSrcHover": "#525a5f", "desktopTimelineSrcHover": "#525a5f",
"desktopWindowTitle": "#666", "desktopWindowTitle": "#666",
"desktopDriveBg": "#fff", "desktopDriveBg": "#fff",
"desktopDriveFolderBg": ":lighten<31<$primary",
"desktopDriveFolderHoverBg": ":lighten<27<$primary",
"desktopDriveFolderActiveBg": ":lighten<25<$primary",
"desktopDriveFolderFg": ":darken<10<$primary",
"desktopSettingsNavItem": ":alpha<0.8<$text", "desktopSettingsNavItem": ":alpha<0.8<$text",
"desktopSettingsNavItemHover": ":darken<10<$text", "desktopSettingsNavItemHover": ":darken<10<$text",