This commit is contained in:
syuilo
2018-09-22 15:58:11 +09:00
parent 82d94b5963
commit 251629ab61
13 changed files with 67 additions and 77 deletions

View File

@@ -133,8 +133,7 @@ export default Vue.extend({
root(isDark)
color isDark ? #c5ced6 : #777
background isDark ? #282C37 : #fff
border solid 1px rgba(#000, 0.075)
border-radius 6px
box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)
overflow hidden
&[data-melt]

View File

@@ -231,8 +231,7 @@ root(isDark)
overflow hidden
text-align left
background isDark ? #282C37 : #fff
border solid 1px rgba(#000, 0.1)
border-radius 8px
box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)
> .read-more
display block

View File

@@ -179,14 +179,12 @@ export default Vue.extend({
root(isDark)
background isDark ? #282C37 : #fff
border solid 1px rgba(#000, 0.075)
border-radius 6px
box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)
> header
padding 0 8px
z-index 10
background isDark ? #313543 : #fff
border-radius 6px 6px 0 0
box-shadow 0 1px isDark ? rgba(#000, 0.15) : rgba(#000, 0.08)
> .buttons

View File

@@ -125,7 +125,7 @@ root(isDark)
top 0
z-index 1000
width 100%
box-shadow 0 1px 1px rgba(#000, 0.075)
box-shadow 0 0px 8px rgba(#000, 0.2)
> .warn
display block

View File

@@ -36,13 +36,12 @@ export default Vue.extend({
<style lang="stylus" scoped>
root(isDark)
background isDark ? #282C37 : #fff
border solid 1px rgba(#000, isDark ? 0.2 : 0.075)
border-radius 6px
box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)
overflow hidden
&.naked
background transparent !important
border none !important
box-shadow none !important
> header
background isDark ? #313543 : #fff

View File

@@ -38,8 +38,7 @@ export default Vue.extend({
<style lang="stylus" scoped>
root(isDark)
background isDark ? #282C37 : #fff
border solid 1px rgba(#000, 0.075)
border-radius 6px
box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)
> .title
z-index 1

View File

@@ -42,8 +42,7 @@ export default Vue.extend({
<style lang="stylus" scoped>
root(isDark)
background isDark ? #282C37 : #fff
border solid 1px rgba(#000, 0.075)
border-radius 6px
box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)
overflow hidden
> .title

View File

@@ -104,8 +104,7 @@ export default Vue.extend({
root(isDark)
background isDark ? #282C37 : #fff
border 1px solid rgba(#000, 0.075)
border-radius 6px
box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)
overflow hidden
&[data-is-dark-background]

View File

@@ -41,8 +41,7 @@ export default Vue.extend({
<style lang="stylus" scoped>
root(isDark)
background isDark ? #282C37 : #fff
border solid 1px rgba(#000, 0.075)
border-radius 6px
box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)
overflow hidden
> .title

View File

@@ -87,8 +87,7 @@ export default Vue.extend({
<style lang="stylus" scoped>
root(isDark)
background isDark ? #282C37 : #fff
border solid 1px rgba(#000, 0.075)
border-radius 6px
box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)
> *:first-child
border-top none !important

View File

@@ -118,8 +118,7 @@ root(isDark)
margin-right 16px
> .timeline
border 1px solid rgba(#000, 0.075)
border-radius 6px
box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)
> .side
width 275px
@@ -138,8 +137,7 @@ root(isDark)
font-size 12px
color #aaa
background isDark ? #21242f : #fff
border solid 1px rgba(#000, 0.075)
border-radius 6px
box-shadow 0 3px 8px rgba(0, 0, 0, 0.2)
a
color #999

View File

@@ -1,20 +1,25 @@
<template>
<div class="mkw-profile"
:data-compact="props.design == 1 || props.design == 2"
:data-melt="props.design == 2"
>
<div class="banner"
:style="$store.state.i.bannerUrl ? `background-image: url(${$store.state.i.bannerUrl})` : ''"
title="%i18n:@update-banner%"
@click="() => os.apis.updateBanner()"
></div>
<mk-avatar class="avatar" :user="$store.state.i"
:disable-link="true"
@click="() => os.apis.updateAvatar()"
title="%i18n:@update-avatar%"
/>
<router-link class="name" :to="$store.state.i | userPage">{{ $store.state.i | userName }}</router-link>
<p class="username">@{{ $store.state.i | acct }}</p>
<div class="egwyvoaaryotefqhqtmiyawwefemjfsd">
<mk-widget-container :show-header="false" :naked="props.design == 2">
<div class="egwyvoaaryotefqhqtmiyawwefemjfsd-body"
:data-compact="props.design == 1 || props.design == 2"
:data-melt="props.design == 2"
:data-darkmode="$store.state.device.darkmode"
>
<div class="banner"
:style="$store.state.i.bannerUrl ? `background-image: url(${$store.state.i.bannerUrl})` : ''"
title="%i18n:@update-banner%"
@click="() => os.apis.updateBanner()"
></div>
<mk-avatar class="avatar" :user="$store.state.i"
:disable-link="true"
@click="() => os.apis.updateAvatar()"
title="%i18n:@update-avatar%"
/>
<router-link class="name" :to="$store.state.i | userPage">{{ $store.state.i | userName }}</router-link>
<p class="username">@{{ $store.state.i | acct }}</p>
</div>
</mk-widget-container>
</div>
</template>
@@ -42,10 +47,6 @@ export default define({
<style lang="stylus" scoped>
root(isDark)
overflow hidden
background isDark ? #282c37 : #fff
border solid 1px rgba(#000, 0.075)
border-radius 6px
&[data-compact]
> .banner:before
@@ -75,9 +76,6 @@ root(isDark)
display none
&[data-melt]
background transparent !important
border none !important
> .banner
visibility hidden
@@ -120,10 +118,10 @@ root(isDark)
font-size 0.9em
color isDark ? #606984 : #999
.mkw-profile[data-darkmode]
.egwyvoaaryotefqhqtmiyawwefemjfsd-body[data-darkmode]
root(true)
.mkw-profile:not([data-darkmode])
.egwyvoaaryotefqhqtmiyawwefemjfsd-body:not([data-darkmode])
root(false)
</style>