diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2023-04-19 21:24:31 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-19 21:24:31 +0900 |
| commit | e1f9ab77f86f5a12091c864cdb502970715cd46e (patch) | |
| tree | 46990eae87d352e6674e43a64c3bdcd74c13119e /packages/frontend/src/components/MkModalWindow.vue | |
| parent | Update test-frontend.yml (diff) | |
| download | misskey-e1f9ab77f86f5a12091c864cdb502970715cd46e.tar.gz misskey-e1f9ab77f86f5a12091c864cdb502970715cd46e.tar.bz2 misskey-e1f9ab77f86f5a12091c864cdb502970715cd46e.zip | |
feat: Server rules (#10660)
* enhance(frontend): サーバールールのデザイン調整
* enhance(frontend): i18n
* enhance(frontend): 利用規約URLの設定を「モデレーション」ページへ移動
* enhance(frontend): サーバールールのデザイン調整
* Update CHANGELOG.md
* 不要な差分を削除
* fix(frontend): lint
* ui tweak
* test: add stories
* tweak
* test: bind args
* test: add interaction tests
* fix bug
* Update packages/frontend/src/pages/admin/server-rules.vue
Co-authored-by: Ebise Lutica <7106976+EbiseLutica@users.noreply.github.com>
* Update misskey-js.api.md
* chore: windowを明示
* :art:
* refactor
* :art:
* :art:
* fix e2e test
* :art:
* :art:
* fix icon
* fix e2e
---------
Co-authored-by: Ebise Lutica <7106976+EbiseLutica@users.noreply.github.com>
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Diffstat (limited to 'packages/frontend/src/components/MkModalWindow.vue')
| -rw-r--r-- | packages/frontend/src/components/MkModalWindow.vue | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/packages/frontend/src/components/MkModalWindow.vue b/packages/frontend/src/components/MkModalWindow.vue index dd115246ff..2d2f8411f1 100644 --- a/packages/frontend/src/components/MkModalWindow.vue +++ b/packages/frontend/src/components/MkModalWindow.vue @@ -1,6 +1,6 @@ <template> <MkModal ref="modal" :prefer-type="'dialog'" @click="onBgClick" @closed="$emit('closed')"> - <div ref="rootEl" class="ebkgoccj" :style="{ width: `${width}px`, height: scroll ? (height ? `${height}px` : null) : (height ? `min(${height}px, 100%)` : '100%') }" @keydown="onKeydown"> + <div ref="rootEl" class="ebkgoccj" :style="{ width: `${width}px`, height: height ? `${height}px` : null }" @keydown="onKeydown"> <div ref="headerEl" class="header"> <button v-if="withOkButton" class="_button" @click="$emit('close')"><i class="ti ti-x"></i></button> <span class="title"> @@ -25,13 +25,11 @@ const props = withDefaults(defineProps<{ okButtonDisabled: boolean; width: number; height: number | null; - scroll: boolean; }>(), { withOkButton: false, okButtonDisabled: false, width: 400, height: null, - scroll: true, }); const emit = defineEmits<{ @@ -86,6 +84,7 @@ defineExpose({ <style lang="scss" scoped> .ebkgoccj { margin: auto; + max-height: 100%; overflow: hidden; display: flex; flex-direction: column; |