natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

wip

This commit is contained in:
syuilo 2018-09-28 14:26:20 +09:00
parent 1eef90f6cb
commit c627288bde
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
20 changed files with 65 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/app/common/views/pages/follow.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="syxhndwprovvuqhmyvveewmbqayniwkv" v-if="!fetching" :data-darkmode="$store.state.device.darkmode"> <div class="syxhndwprovvuqhmyvveewmbqayniwkv" v-if="!fetching">
<div class="signed-in-as" v-html="'%i18n:@signed-in-as%'.replace('{}', `<b>${myName}`)"></div> <div class="signed-in-as" v-html="'%i18n:@signed-in-as%'.replace('{}', `<b>${myName}`)"></div>
<main> <main>

2
src/client/app/common/views/widgets/posts-monitor.vue
View File

@ -4,7 +4,7 @@
<template slot="header">%fa:chart-line%%i18n:@title%</template> <template slot="header">%fa:chart-line%%i18n:@title%</template>
<button slot="func" @click="toggle" title="%i18n:@toggle%">%fa:sort%</button> <button slot="func" @click="toggle" title="%i18n:@toggle%">%fa:sort%</button>
<div class="qpdmibaztplkylerhdbllwcokyrfxeyj" :class="{ dual: props.view == 0 }" :data-darkmode="$store.state.device.darkmode"> <div class="qpdmibaztplkylerhdbllwcokyrfxeyj" :class="{ dual: props.view == 0 }">
<svg :viewBox="`0 0 ${ viewBoxX } ${ viewBoxY }`" v-show="props.view != 2"> <svg :viewBox="`0 0 ${ viewBoxX } ${ viewBoxY }`" v-show="props.view != 2">
<defs> <defs>
<linearGradient :id="localGradientId" x1="0" x2="0" y1="1" y2="0"> <linearGradient :id="localGradientId" x1="0" x2="0" y1="1" y2="0">

2
src/client/app/desktop/views/components/received-follow-requests-window.vue
View File

@ -2,7 +2,7 @@
<mk-window ref="window" is-modal width="450px" height="500px" @closed="destroyDom"> <mk-window ref="window" is-modal width="450px" height="500px" @closed="destroyDom">
<span slot="header">%fa:envelope R% %i18n:@title%</span> <span slot="header">%fa:envelope R% %i18n:@title%</span>
<div class="slpqaxdoxhvglersgjukmvizkqbmbokc" :data-darkmode="$store.state.device.darkmode"> <div class="slpqaxdoxhvglersgjukmvizkqbmbokc">
<div v-for="req in requests"> <div v-for="req in requests">
<router-link :key="req.id" :to="req.follower | userPage">{{ req.follower | userName }}</router-link> <router-link :key="req.id" :to="req.follower | userPage">{{ req.follower | userName }}</router-link>
<span> <span>

2
src/client/app/desktop/views/components/user-lists-window.vue
View File

@ -2,7 +2,7 @@
<mk-window ref="window" is-modal width="450px" height="500px" @closed="destroyDom"> <mk-window ref="window" is-modal width="450px" height="500px" @closed="destroyDom">
<span slot="header">%fa:list% %i18n:@title%</span> <span slot="header">%fa:list% %i18n:@title%</span>
<div class="xkxvokkjlptzyewouewmceqcxhpgzprp" :data-darkmode="$store.state.device.darkmode"> <div class="xkxvokkjlptzyewouewmceqcxhpgzprp">
<button class="ui" @click="add">%i18n:@create-list%</button> <button class="ui" @click="add">%i18n:@create-list%</button>
<a v-for="list in lists" :key="list.id" @click="choice(list)">{{ list.title }}</a> <a v-for="list in lists" :key="list.id" @click="choice(list)">{{ list.title }}</a>
</div> </div>

2
src/client/app/desktop/views/pages/deck/deck.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<mk-ui :class="$style.root"> <mk-ui :class="$style.root">
<div class="qlvquzbjribqcaozciifydkngcwtyzje" :data-darkmode="$store.state.device.darkmode" :style="style"> <div class="qlvquzbjribqcaozciifydkngcwtyzje" :style="style">
<template v-for="ids in layout"> <template v-for="ids in layout">
<div v-if="ids.length > 1" class="folder"> <div v-if="ids.length > 1" class="folder">
<template v-for="id, i in ids"> <template v-for="id, i in ids">

17
src/client/app/desktop/views/pages/user/user.friends.vue
View File

@ -40,7 +40,7 @@ export default Vue.extend({
</script> </script>
<style lang="stylus" scoped> <style lang="stylus" scoped>
root(isDark) .hozptpaliadatkehcmcayizwzwwctpbc
background var(--face) background var(--face)
box-shadow var(--shadow) box-shadow var(--shadow)
border-radius var(--round) border-radius var(--round)
@ -53,7 +53,7 @@ root(isDark)
line-height 42px line-height 42px
font-size 0.9em font-size 0.9em
font-weight bold font-weight bold
background isDark ? #313543 : inherit background var(--faceHeader)
color var(--faceHeaderText) color var(--faceHeaderText)
box-shadow 0 1px rgba(#000, 0.07) box-shadow 0 1px rgba(#000, 0.07)
@ -72,7 +72,7 @@ root(isDark)
> .user > .user
padding 16px padding 16px
border-bottom solid 1px isDark ? #21242f : #eee border-bottom solid 1px var(--faceDivider)
&:last-child &:last-child
border-bottom none border-bottom none
@ -98,24 +98,19 @@ root(isDark)
margin 0 margin 0
font-size 16px font-size 16px
line-height 24px line-height 24px
color isDark ? #ccc : #555 color var(--text)
> .username > .username
display block display block
margin 0 margin 0
font-size 15px font-size 15px
line-height 16px line-height 16px
color isDark ? #555 : #ccc color var(--text)
opacity 0.7
> .mk-follow-button > .mk-follow-button
position absolute position absolute
top 16px top 16px
right 16px right 16px
.hozptpaliadatkehcmcayizwzwwctpbc[data-darkmode]
root(true)
.hozptpaliadatkehcmcayizwzwwctpbc:not([data-darkmode])
root(false)
</style> </style>

18
src/client/app/desktop/views/pages/user/user.header.vue
View File

@ -100,9 +100,7 @@ export default Vue.extend({
</script> </script>
<style lang="stylus" scoped> <style lang="stylus" scoped>
.header
root(isDark)
background var(--face) background var(--face)
box-shadow var(--shadow) box-shadow var(--shadow)
border-radius var(--round) border-radius var(--round)
@ -182,12 +180,12 @@ root(isDark)
> .body > .body
padding 16px 16px 16px 154px padding 16px 16px 16px 154px
color isDark ? #c5ced6 : #555 color var(--text)
> .status > .status
margin-top 16px margin-top 16px
padding-top 16px padding-top 16px
border-top solid 1px rgba(#000, isDark ? 0.2 : 0.1) border-top solid 1px var(--faceDivider)
font-size 80% font-size 80%
> * > *
@ -196,13 +194,13 @@ root(isDark)
margin-right 16px margin-right 16px
&:not(:last-child) &:not(:last-child)
border-right solid 1px rgba(#000, isDark ? 0.2 : 0.1) border-right solid 1px var(--faceDivider)
&.clickable &.clickable
cursor pointer cursor pointer
&:hover &:hover
color isDark ? #fff : #000 color var(--faceTextButtonHover)
> b > b
margin-right 4px margin-right 4px
@ -210,10 +208,4 @@ root(isDark)
font-weight bold font-weight bold
color var(--primary) color var(--primary)
.header[data-darkmode]
root(true)
.header:not([data-darkmode])
root(false)
</style> </style>

10
src/client/app/desktop/views/pages/user/user.photos.vue
View File

@ -39,7 +39,7 @@ export default Vue.extend({
</script> </script>
<style lang="stylus" scoped> <style lang="stylus" scoped>
root(isDark) .dzsuvbsrrrwobdxifudxuefculdfiaxd
background var(--face) background var(--face)
box-shadow var(--shadow) box-shadow var(--shadow)
border-radius var(--round) border-radius var(--round)
@ -52,7 +52,7 @@ root(isDark)
line-height 42px line-height 42px
font-size 0.9em font-size 0.9em
font-weight bold font-weight bold
background: isDark ? #313543 : inherit background var(--faceHeader)
color var(--faceHeaderText) color var(--faceHeaderText)
box-shadow 0 1px rgba(#000, 0.07) box-shadow 0 1px rgba(#000, 0.07)
@ -87,10 +87,4 @@ root(isDark)
> i > i
margin-right 4px margin-right 4px
.dzsuvbsrrrwobdxifudxuefculdfiaxd[data-darkmode]
root(true)
.dzsuvbsrrrwobdxifudxuefculdfiaxd:not([data-darkmode])
root(false)
</style> </style>

12
src/client/app/desktop/views/pages/user/user.profile.vue
View File

@ -85,7 +85,7 @@ export default Vue.extend({
</script> </script>
<style lang="stylus" scoped> <style lang="stylus" scoped>
root(isDark) .profile
background var(--face) background var(--face)
box-shadow var(--shadow) box-shadow var(--shadow)
border-radius var(--round) border-radius var(--round)
@ -96,7 +96,7 @@ root(isDark)
> .friend-form > .friend-form
padding 16px padding 16px
text-align center text-align center
border-bottom solid 1px isDark ? #21242f : #eee border-bottom solid 1px var(--faceDivider)
> .followed > .followed
margin 12px 0 0 0 margin 12px 0 0 0
@ -114,7 +114,7 @@ root(isDark)
> .action-form > .action-form
padding 16px padding 16px
text-align center text-align center
border-bottom solid 1px isDark ? #21242f : #eee border-bottom solid 1px var(--faceDivider)
> * > *
width 100% width 100%
@ -122,10 +122,4 @@ root(isDark)
&:not(:last-child) &:not(:last-child)
margin-bottom 12px margin-bottom 12px
.profile[data-darkmode]
root(true)
.profile:not([data-darkmode])
root(false)
</style> </style>

16
src/client/app/desktop/views/pages/user/user.timeline.vue
View File

@ -112,9 +112,7 @@ export default Vue.extend({
</script> </script>
<style lang="stylus" scoped> <style lang="stylus" scoped>
.oh5y2r7l5lx8j6jj791ykeiwgihheguk
root(isDark)
background var(--face) background var(--face)
border-radius var(--round) border-radius var(--round)
overflow hidden overflow hidden
@ -123,7 +121,7 @@ root(isDark)
padding 0 8px padding 0 8px
z-index 10 z-index 10
background var(--faceHeader) background var(--faceHeader)
box-shadow 0 1px isDark ? rgba(#000, 0.15) : rgba(#000, 0.08) box-shadow 0 1px var(--desktopTimelineHeaderShadow)
> span > span
display inline-block display inline-block
@ -148,11 +146,11 @@ root(isDark)
background var(--primary) background var(--primary)
&:not([data-active]) &:not([data-active])
color isDark ? #9aa2a7 : #6f7477 color var(--desktopTimelineSrc)
cursor pointer cursor pointer
&:hover &:hover
color isDark ? #d9dcde : #525a5f color var(--desktopTimelineSrcHover)
> .loading > .loading
padding 64px 0 padding 64px 0
@ -171,10 +169,4 @@ root(isDark)
font-size 3em font-size 3em
color #ccc color #ccc
.oh5y2r7l5lx8j6jj791ykeiwgihheguk[data-darkmode]
root(true)
.oh5y2r7l5lx8j6jj791ykeiwgihheguk:not([data-darkmode])
root(false)
</style> </style>

26
src/client/app/desktop/views/pages/user/user.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<mk-ui> <mk-ui>
<div class="xygkxeaeontfaokvqmiblezmhvhostak" v-if="!fetching" :data-darkmode="$store.state.device.darkmode"> <div class="xygkxeaeontfaokvqmiblezmhvhostak" v-if="!fetching">
<div class="is-suspended" v-if="user.isSuspended">%fa:exclamation-triangle% %i18n:@is-suspended%</div> <div class="is-suspended" v-if="user.isSuspended">%fa:exclamation-triangle% %i18n:@is-suspended%</div>
<div class="is-remote" v-if="user.host != null">%fa:exclamation-triangle% %i18n:@is-remote%<a :href="user.url || user.uri" target="_blank">%i18n:@view-remote%</a></div> <div class="is-remote" v-if="user.host != null">%fa:exclamation-triangle% %i18n:@is-remote%<a :href="user.url || user.uri" target="_blank">%i18n:@view-remote%</a></div>
<main> <main>
@ -79,7 +79,7 @@ export default Vue.extend({
</script> </script>
<style lang="stylus" scoped> <style lang="stylus" scoped>
root(isDark) .xygkxeaeontfaokvqmiblezmhvhostak
width 980px width 980px
padding 16px padding 16px
margin 0 auto margin 0 auto
@ -93,12 +93,12 @@ root(isDark)
border-radius var(--round) border-radius var(--round)
&.is-suspended &.is-suspended
color isDark ? #ffb4b4 : #570808 color var(--suspendedInfoFg)
background isDark ? #611d1d : #ffdbdb background var(--suspendedInfoBg)
&.is-remote &.is-remote
color isDark ? #ffbd3e : #573c08 color var(--remoteInfoFg)
background isDark ? #42321c : #fff0db background var(--remoteInfoBg)
> a > a
font-weight bold font-weight bold
@ -139,21 +139,15 @@ root(isDark)
> .nav > .nav
padding 16px padding 16px
font-size 12px font-size 12px
color #aaa color var(--text)
background isDark ? #21242f : #fff background var(--face)
box-shadow var(--shadow) box-shadow var(--shadow)
border-radius var(--round) border-radius var(--round)
a a
color #999 color var(--text)99
i i
color #ccc color var(--text)
.xygkxeaeontfaokvqmiblezmhvhostak[data-darkmode]
root(true)
.xygkxeaeontfaokvqmiblezmhvhostak:not([data-darkmode])
root(false)
</style> </style>

12
src/client/app/desktop/views/widgets/polls.vue
View File

@ -4,7 +4,7 @@
<template slot="header">%fa:chart-pie%%i18n:@title%</template> <template slot="header">%fa:chart-pie%%i18n:@title%</template>
<button slot="func" title="%i18n:@refresh%" @click="fetch">%fa:sync%</button> <button slot="func" title="%i18n:@refresh%" @click="fetch">%fa:sync%</button>
<div class="mkw-polls--body" :data-darkmode="$store.state.device.darkmode"> <div class="mkw-polls--body">
<div class="poll" v-if="!fetching && poll != null"> <div class="poll" v-if="!fetching && poll != null">
<p v-if="poll.text"><router-link :to="poll | notePage">{{ poll.text }}</router-link></p> <p v-if="poll.text"><router-link :to="poll | notePage">{{ poll.text }}</router-link></p>
<p v-if="!poll.text"><router-link :to="poll | notePage">%fa:link%</router-link></p> <p v-if="!poll.text"><router-link :to="poll | notePage">%fa:link%</router-link></p>
@ -64,11 +64,11 @@ export default define({
</script> </script>
<style lang="stylus" scoped> <style lang="stylus" scoped>
root(isDark) .mkw-polls--body
> .poll > .poll
padding 16px padding 16px
font-size 12px font-size 12px
color isDark ? #9ea4ad : #555 color var(--text)
> p > p
margin 0 0 8px 0 margin 0 0 8px 0
@ -91,10 +91,4 @@ root(isDark)
> [data-fa] > [data-fa]
margin-right 4px margin-right 4px
.mkw-polls--body[data-darkmode]
root(true)
.mkw-polls--body:not([data-darkmode])
root(false)
</style> </style>

16
src/client/app/desktop/views/widgets/profile.vue
View File

@ -46,8 +46,7 @@ export default define({
</script> </script>
<style lang="stylus" scoped> <style lang="stylus" scoped>
root(isDark) .egwyvoaaryotefqhqtmiyawwefemjfsd-body
&[data-compact] &[data-compact]
> .banner:before > .banner:before
content "" content ""
@ -88,7 +87,7 @@ root(isDark)
> .banner > .banner
height 100px height 100px
background-color isDark ? #303e4a : #f5f5f5 background-color var(--primaryDarken10)
background-size cover background-size cover
background-position center background-position center
cursor pointer cursor pointer
@ -109,19 +108,14 @@ root(isDark)
margin 10px 0 0 84px margin 10px 0 0 84px
line-height 16px line-height 16px
font-weight bold font-weight bold
color isDark ? #fff : #555 color var(--text)
> .username > .username
display block display block
margin 4px 0 8px 84px margin 4px 0 8px 84px
line-height 16px line-height 16px
font-size 0.9em font-size 0.9em
color isDark ? #606984 : #999 color var(--text)
opacity 0.7
.egwyvoaaryotefqhqtmiyawwefemjfsd-body[data-darkmode]
root(true)
.egwyvoaaryotefqhqtmiyawwefemjfsd-body:not([data-darkmode])
root(false)
</style> </style>

15
src/client/app/desktop/views/widgets/users.vue
View File

@ -73,11 +73,11 @@ export default define({
</script> </script>
<style lang="stylus" scoped> <style lang="stylus" scoped>
root(isDark) .mkw-users
.mkw-users--body .mkw-users--body
> .user > .user
padding 16px padding 16px
border-bottom solid 1px isDark ? #1c2023 : #eee border-bottom solid 1px var(--faceDivider)
&:last-child &:last-child
border-bottom none border-bottom none
@ -103,14 +103,15 @@ root(isDark)
margin 0 margin 0
font-size 16px font-size 16px
line-height 24px line-height 24px
color isDark ? #fff : #555 color var(--text)
> .username > .username
display block display block
margin 0 margin 0
font-size 15px font-size 15px
line-height 16px line-height 16px
color isDark ? #606984 : #ccc color var(--text)
opacity 0.7
> .mk-follow-button > .mk-follow-button
position absolute position absolute
@ -132,10 +133,4 @@ root(isDark)
> [data-fa] > [data-fa]
margin-right 4px margin-right 4px
.mkw-users[data-darkmode]
root(true)
.mkw-users:not([data-darkmode])
root(false)
</style> </style>

14
src/client/app/mobile/views/components/drive-file-chooser.vue
View File

@ -46,7 +46,7 @@ export default Vue.extend({
</script> </script>
<style lang="stylus" scoped> <style lang="stylus" scoped>
root(isDark) .cdxzvcfawjxdyxsekbxbfgtplebnoneb
position fixed position fixed
z-index 20000 z-index 20000
top 0 top 0
@ -59,11 +59,11 @@ root(isDark)
> .body > .body
width 100% width 100%
height 100% height 100%
background var(--face) background var(--faceHeader)
> header > header
border-bottom solid 1px isDark ? #1b1f29 : #eee border-bottom solid 1px var(--faceDivider)
color isDark ? #fff : #111 color var(--text)
> h1 > h1
margin 0 margin 0
@ -96,10 +96,4 @@ root(isDark)
overflow scroll overflow scroll
-webkit-overflow-scrolling touch -webkit-overflow-scrolling touch
.cdxzvcfawjxdyxsekbxbfgtplebnoneb[data-darkmode]
root(true)
.cdxzvcfawjxdyxsekbxbfgtplebnoneb:not([data-darkmode])
root(false)
</style> </style>

2
src/client/app/mobile/views/pages/home.vue
View File

@ -22,7 +22,7 @@
<button @click="fn">%fa:pencil-alt%</button> <button @click="fn">%fa:pencil-alt%</button>
</template> </template>
<main :data-darkmode="$store.state.device.darkmode"> <main>
<div class="nav" v-if="showNav"> <div class="nav" v-if="showNav">
<div class="bg" @click="showNav = false"></div> <div class="bg" @click="showNav = false"></div>
<div class="pointer"></div> <div class="pointer"></div>

2
src/client/app/mobile/views/pages/settings.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<mk-ui> <mk-ui>
<span slot="header"><span style="margin-right:4px;">%fa:cog%</span>%i18n:@settings%</span> <span slot="header"><span style="margin-right:4px;">%fa:cog%</span>%i18n:@settings%</span>
<main :data-darkmode="$store.state.device.darkmode"> <main>
<div class="signin-as" v-html="'%i18n:@signed-in-as%'.replace('{}', `<b>${name}</b>`)"></div> <div class="signin-as" v-html="'%i18n:@signed-in-as%'.replace('{}', `<b>${name}</b>`)"></div>
<div> <div>

2
src/client/app/mobile/views/pages/user.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<mk-ui> <mk-ui>
<template slot="header" v-if="!fetching"><img :src="user.avatarUrl" alt="">{{ user | userName }}</template> <template slot="header" v-if="!fetching"><img :src="user.avatarUrl" alt="">{{ user | userName }}</template>
<main v-if="!fetching" :data-darkmode="$store.state.device.darkmode"> <main v-if="!fetching">
<div class="is-suspended" v-if="user.isSuspended"><p>%fa:exclamation-triangle% %i18n:@is-suspended%</p></div> <div class="is-suspended" v-if="user.isSuspended"><p>%fa:exclamation-triangle% %i18n:@is-suspended%</p></div>
<div class="is-remote" v-if="user.host != null"><p>%fa:exclamation-triangle% %i18n:@is-remote%<a :href="user.url || user.uri" target="_blank">%i18n:@view-remote%</a></p></div> <div class="is-remote" v-if="user.host != null"><p>%fa:exclamation-triangle% %i18n:@is-remote%<a :href="user.url || user.uri" target="_blank">%i18n:@view-remote%</a></p></div>
<header> <header>

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

@ -106,6 +106,11 @@
"mfmQuote": ":alpha<0.7<$text", "mfmQuote": ":alpha<0.7<$text",
"mfmQuoteLine": ":alpha<0.6<$text", "mfmQuoteLine": ":alpha<0.6<$text",
"suspendedInfoBg": "#611d1d",
"suspendedInfoFg": "#ffb4b4",
"remoteInfoBg": "#42321c",
"remoteInfoFg": "#ffbd3e",
"messagingRoomBg": "@bg", "messagingRoomBg": "@bg",
"messagingRoomInfo": "#fff", "messagingRoomInfo": "#fff",
"messagingRoomDateDividerLine": "rgba(255, 255, 255, 0.1)", "messagingRoomDateDividerLine": "rgba(255, 255, 255, 0.1)",

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

@ -106,6 +106,11 @@
"mfmQuote": ":alpha<0.6<$text", "mfmQuote": ":alpha<0.6<$text",
"mfmQuoteLine": ":alpha<0.5<$text", "mfmQuoteLine": ":alpha<0.5<$text",
"suspendedInfoBg": "#ffdbdb",
"suspendedInfoFg": "#570808",
"remoteInfoBg": "#fff0db",
"remoteInfoFg": "#573c08",
"messagingRoomBg": "#fff", "messagingRoomBg": "#fff",
"messagingRoomInfo": "#000", "messagingRoomInfo": "#000",
"messagingRoomDateDividerLine": "rgba(0, 0, 0, 0.1)", "messagingRoomDateDividerLine": "rgba(0, 0, 0, 0.1)",