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

[wip] darkmode

This commit is contained in:
syuilo 2018-04-20 03:56:58 +09:00
parent f2fea7f3cd
commit cba07d08d0
2 changed files with 29 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/client/app/desktop/views/components/activity.vue
View File

@ -1,14 +1,15 @@
<template> <template>
<div class="mk-activity" :data-melt="design == 2"> <div class="mk-activity">
<template v-if="design == 0"> <mk-widget-container :show-header="design == 0" :naked="design == 2">
<p class="title">%fa:chart-bar%%i18n:@title%</p> <template slot="header">%fa:chart-bar%%i18n:@title%</template>
<button @click="toggle" title="%i18n:@toggle%">%fa:sort%</button> <button slot="func" title="%i18n:@toggle%" @click="toggle">%fa:sort%</button>
</template>
<p class="fetching" v-if="fetching">%fa:spinner .pulse .fw%%i18n:common.loading%<mk-ellipsis/></p> <p :class="$style.fetching" v-if="fetching">%fa:spinner .pulse .fw%%i18n:common.loading%<mk-ellipsis/></p>
<template v-else> <template v-else>
<x-calendar v-show="view == 0" :data="[].concat(activity)"/> <x-calendar v-show="view == 0" :data="[].concat(activity)"/>
<x-chart v-show="view == 1" :data="[].concat(activity)"/> <x-chart v-show="view == 1" :data="[].concat(activity)"/>
</template> </template>
</mk-widget-container>
</div> </div>
</template> </template>
@ -64,53 +65,14 @@ export default Vue.extend({
}); });
</script> </script>
<style lang="stylus" scoped> <style lang="stylus" module>
.mk-activity .fetching
background #fff margin 0
border solid 1px rgba(0, 0, 0, 0.075) padding 16px
border-radius 6px text-align center
color #aaa
&[data-melt] > [data-fa]
background transparent !important margin-right 4px
border none !important
> .title
z-index 1
margin 0
padding 0 16px
line-height 42px
font-size 0.9em
font-weight bold
color #888
box-shadow 0 1px rgba(0, 0, 0, 0.07)
> [data-fa]
margin-right 4px
> button
position absolute
z-index 2
top 0
right 0
padding 0
width 42px
font-size 0.9em
line-height 42px
color #ccc
&:hover
color #aaa
&:active
color #999
> .fetching
margin 0
padding 16px
text-align center
color #aaa
> [data-fa]
margin-right 4px
</style> </style>

54
src/client/app/desktop/views/widgets/notifications.vue
View File

@ -1,10 +1,11 @@
<template> <template>
<div class="mkw-notifications"> <div class="mkw-notifications">
<template v-if="!props.compact"> <mk-widget-container :show-header="!props.compact">
<p class="title">%fa:R bell%%i18n:@title%</p> <template slot="header">%fa:R bell%%i18n:@title%</template>
<button @click="settings" title="%i18n:@settings%">%fa:cog%</button> <button slot="func" title="%i18n:@settings%" @click="settings">%fa:cog%</button>
</template>
<mk-notifications/> <mk-notifications :class="$style.notifications"/>
</mk-widget-container>
</div> </div>
</template> </template>
@ -27,44 +28,9 @@ export default define({
}); });
</script> </script>
<style lang="stylus" scoped> <style lang="stylus" module>
.mkw-notifications .notifications
background #fff max-height 300px
border solid 1px rgba(0, 0, 0, 0.075) overflow auto
border-radius 6px
> .title
z-index 1
margin 0
padding 0 16px
line-height 42px
font-size 0.9em
font-weight bold
color #888
box-shadow 0 1px rgba(0, 0, 0, 0.07)
> [data-fa]
margin-right 4px
> button
position absolute
z-index 2
top 0
right 0
padding 0
width 42px
font-size 0.9em
line-height 42px
color #ccc
&:hover
color #aaa
&:active
color #999
> .mk-notifications
max-height 300px
overflow auto
</style> </style>