diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2019-01-05 19:59:10 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-01-05 19:59:10 +0900 |
| commit | d0aff4409d80816ebf0a82be6f505ec7dccb9cc5 (patch) | |
| tree | 97d26ea610d93e7b6fac33219d67ed6c0d5e2eb0 /src | |
| parent | Fix typo: not -> note (diff) | |
| download | misskey-d0aff4409d80816ebf0a82be6f505ec7dccb9cc5.tar.gz misskey-d0aff4409d80816ebf0a82be6f505ec7dccb9cc5.tar.bz2 misskey-d0aff4409d80816ebf0a82be6f505ec7dccb9cc5.zip | |
Locked mark (#3836)
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/app/common/views/components/acct.vue | 5 | ||||
| -rw-r--r-- | src/client/app/desktop/views/components/user-card.vue | 6 | ||||
| -rw-r--r-- | src/client/app/desktop/views/pages/deck/deck.user-column.vue | 5 |
3 files changed, 14 insertions, 2 deletions
diff --git a/src/client/app/common/views/components/acct.vue b/src/client/app/common/views/components/acct.vue index 69259ab60f..2730e4139c 100644 --- a/src/client/app/common/views/components/acct.vue +++ b/src/client/app/common/views/components/acct.vue @@ -2,6 +2,7 @@ <span class="mk-acct"> <span class="name">@{{ user.username }}</span> <span class="host" :class="{ fade: $store.state.settings.contrastedAcct }" v-if="user.host || detail || $store.state.settings.showFullAcct">@{{ user.host || host }}</span> + <fa v-if="user.isLocked == true" class="locked" icon="lock" fixed-width/> </span> </template> @@ -23,4 +24,8 @@ export default Vue.extend({ .mk-acct > .host.fade opacity 0.5 + + > .locked + opacity 0.8 + margin-left 0.5em </style> diff --git a/src/client/app/desktop/views/components/user-card.vue b/src/client/app/desktop/views/components/user-card.vue index c59467fd09..6a42b5da00 100644 --- a/src/client/app/desktop/views/components/user-card.vue +++ b/src/client/app/desktop/views/components/user-card.vue @@ -7,7 +7,8 @@ <router-link :to="user | userPage" class="name"> <mk-user-name :user="user"/> </router-link> - <span class="username">@{{ user | acct }}</span> + <span class="username">@{{ user | acct }} <fa v-if="user.isLocked == true" class="locked" icon="lock" fixed-width/></span> + <div class="description"> <misskey-flavored-markdown v-if="user.description" :text="user.description" :author="user" :i="$store.state.i" :custom-emojis="user.emojis"/> </div> @@ -75,6 +76,9 @@ export default Vue.extend({ display block opacity 0.7 + > .locked + opacity 0.8 + > .description margin 8px 0 16px 0 diff --git a/src/client/app/desktop/views/pages/deck/deck.user-column.vue b/src/client/app/desktop/views/pages/deck/deck.user-column.vue index 0ed7916a4b..65feea9693 100644 --- a/src/client/app/desktop/views/pages/deck/deck.user-column.vue +++ b/src/client/app/desktop/views/pages/deck/deck.user-column.vue @@ -19,7 +19,7 @@ <span class="name"> <mk-user-name :user="user"/> </span> - <span class="acct">@{{ user | acct }}</span> + <span class="acct">@{{ user | acct }} <fa v-if="user.isLocked == true" class="locked" icon="lock" fixed-width/></span> </div> </header> <div class="info"> @@ -411,6 +411,9 @@ export default Vue.extend({ opacity 0.7 text-shadow 0 0 8px #000 + > .locked + opacity 0.8 + > .info padding 16px font-size 12px |