etc/Sharkey
0
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey synced 2024-12-22 16:30:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
syuilo 2021-12-17 19:43:00 +09:00
commit 80c88e13ff
6 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

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

2
package.json
View file

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

2
packages/client/src/components/toast.vue
View file

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

2
packages/client/src/components/ui/modal.vue
View file

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

2
packages/client/src/components/waiting-dialog.vue
View file

@ -1,5 +1,5 @@
<template> <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 }"> <div class="iuyakobc" :class="{ iconOnly: (text == null) || success }">
<i v-if="success" class="fas fa-check icon success"></i> <i v-if="success" class="fas fa-check icon success"></i>
<i v-else class="fas fa-spinner fa-pulse icon waiting"></i> <i v-else class="fas fa-spinner fa-pulse icon waiting"></i>

2
packages/client/src/ui/_common_/common.vue
View file

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