diff --git a/CHANGELOG.md b/CHANGELOG.md index f24c80fc94715ca991cacb815010f5047097ac91..d315743fe668a826649ee45eb337c4aec448fea7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,15 @@ --> +## 12.x.x (unreleased) + +### Improvements + +### Bugfixes + +### Changes +- クライアント: ノートã«ãƒ¢ãƒ‡ãƒ¬ãƒ¼ã‚¿ãƒ¼ãƒãƒƒã‚¸ã‚’表示ã™ã‚‹ã®ã‚’å»ƒæ¢ + ## 12.97.0 (2021/11/19) ### Improvements diff --git a/packages/client/src/components/note-detailed.vue b/packages/client/src/components/note-detailed.vue index 5fd8e9f6e2d52e9715970cd962bce57557d174c5..378dd6516b4f2e983e3461847198c10c83179c4a 100644 --- a/packages/client/src/components/note-detailed.vue +++ b/packages/client/src/components/note-detailed.vue @@ -42,8 +42,6 @@ <MkUserName :user="appearNote.user"/> </MkA> <span v-if="appearNote.user.isBot" class="is-bot">bot</span> - <span v-if="appearNote.user.isAdmin" class="admin"><i class="fas fa-bookmark"></i></span> - <span v-if="!appearNote.user.isAdmin && appearNote.user.isModerator" class="moderator"><i class="far fa-bookmark"></i></span> <span v-if="appearNote.visibility !== 'public'" class="visibility"> <i v-if="appearNote.visibility === 'home'" class="fas fa-home"></i> <i v-else-if="appearNote.visibility === 'followers'" class="fas fa-unlock"></i> @@ -1017,12 +1015,6 @@ export default defineComponent({ border: solid 0.5px var(--divider); border-radius: 4px; } - - > .admin, - > .moderator { - margin-right: 0.5em; - color: var(--badge); - } } } } diff --git a/packages/client/src/components/note-header.vue b/packages/client/src/components/note-header.vue index ca4be1e67f5f50446341b80e69e77937f96048ca..3bbeeece1e0006f86ddfdbc72e08bda2576e703b 100644 --- a/packages/client/src/components/note-header.vue +++ b/packages/client/src/components/note-header.vue @@ -5,8 +5,6 @@ </MkA> <div v-if="note.user.isBot" class="is-bot">bot</div> <div class="username"><MkAcct :user="note.user"/></div> - <div v-if="note.user.isAdmin" class="admin"><i class="fas fa-bookmark"></i></div> - <div v-if="!note.user.isAdmin && note.user.isModerator" class="moderator"><i class="far fa-bookmark"></i></div> <div class="info"> <MkA class="created-at" :to="notePage(note)"> <MkTime :time="note.createdAt"/> @@ -79,13 +77,6 @@ export default defineComponent({ border-radius: 3px; } - > .admin, - > .moderator { - flex-shrink: 0; - margin-right: 0.5em; - color: var(--badge); - } - > .username { flex-shrink: 9999999; margin: 0 .5em 0 0; diff --git a/packages/client/src/ui/chat/note-header.vue b/packages/client/src/ui/chat/note-header.vue index 0b318ba8f12e4e4ac1f68c7eca1284c817f4c133..32b4573dc429935449d13f4f28d65a094251ac11 100644 --- a/packages/client/src/ui/chat/note-header.vue +++ b/packages/client/src/ui/chat/note-header.vue @@ -5,8 +5,6 @@ </MkA> <span v-if="note.user.isBot" class="is-bot">bot</span> <span class="username"><MkAcct :user="note.user"/></span> - <span v-if="note.user.isAdmin" class="admin"><i class="fas fa-bookmark"></i></span> - <span v-if="!note.user.isAdmin && note.user.isModerator" class="moderator"><i class="far fa-bookmark"></i></span> <div class="info"> <MkA class="created-at" :to="notePage(note)"> <MkTime :time="note.createdAt"/> @@ -79,12 +77,6 @@ export default defineComponent({ border-radius: 3px; } - > .admin, - > .moderator { - margin-right: 0.5em; - color: var(--badge); - } - > .username { margin: 0 .5em 0 0; overflow: hidden;