Merge branch 'develop'

CHANGELOG.md

@@ -7,6 +7,11 @@
 
 -->
 
+## 12.100.1 (2021/12/17)
+
+### Bugfixes
+- クライアント: デザインの調整
+
 ## 12.100.0 (2021/12/17)
 
 ### Improvements

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.100.0",
+	"version": "12.100.1",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",

packages/client/src/components/toast.vue

@@ -1,5 +1,5 @@
 <template>
-<div class="mk-toast" style="{ zIndex }">
+<div class="mk-toast" :style="{ zIndex }">
 	<transition name="notification-slide" appear @after-leave="$emit('closed')">
 		<XNotification v-if="showing" :notification="notification" class="notification _acrylic"/>
 	</transition>

packages/client/src/components/ui/modal.vue

@@ -102,7 +102,7 @@ export default defineComponent({
 		};
 
 		if (type.value === 'drawer') {
-			maxHeight.value = window.innerHeight - 100;
+			maxHeight.value = window.innerHeight / 2;
 		}
 
 		const keymap = {

packages/client/src/components/waiting-dialog.vue

@@ -1,5 +1,5 @@
 <template>
-<MkModal ref="modal" @click="success ? done() : () => {}" @closed="$emit('closed')">
+<MkModal ref="modal" :prefer-type="'dialog'" @click="success ? done() : () => {}" @closed="$emit('closed')">
 	<div class="iuyakobc" :class="{ iconOnly: (text == null) || success }">
 		<i v-if="success" class="fas fa-check icon success"></i>
 		<i v-else class="fas fa-spinner fa-pulse icon waiting"></i>

packages/client/src/ui/_common_/common.vue

@@ -60,7 +60,7 @@ export default defineComponent({
 #wait {
 	display: block;
 	position: fixed;
-	z-index: 10000;
+	z-index: 3000000;
 	top: 15px;
 	right: 15px;