diff options
| author | tamaina <tamaina@hotmail.co.jp> | 2022-02-20 16:13:21 +0900 |
|---|---|---|
| committer | tamaina <tamaina@hotmail.co.jp> | 2022-02-20 16:13:21 +0900 |
| commit | ed9fef408e4588750c59cd2b1971769a41742f60 (patch) | |
| tree | c569c3179fee599db807425f80ff1c464e6b15c6 /packages/client | |
| parent | clean up (diff) | |
| parent | Update CHANGELOG.md (diff) | |
| download | misskey-ed9fef408e4588750c59cd2b1971769a41742f60.tar.gz misskey-ed9fef408e4588750c59cd2b1971769a41742f60.tar.bz2 misskey-ed9fef408e4588750c59cd2b1971769a41742f60.zip | |
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'packages/client')
| -rw-r--r-- | packages/client/src/components/widgets.vue | 7 | ||||
| -rw-r--r-- | packages/client/src/pages/admin/settings.vue | 8 |
2 files changed, 2 insertions, 13 deletions
diff --git a/packages/client/src/components/widgets.vue b/packages/client/src/components/widgets.vue index ccde5fbe55..da9d935281 100644 --- a/packages/client/src/components/widgets.vue +++ b/packages/client/src/components/widgets.vue @@ -12,13 +12,14 @@ <XDraggable v-model="widgets_" item-key="id" + handle=".handle" animation="150" > <template #item="{element}"> <div class="customize-container"> <button class="config _button" @click.prevent.stop="configWidget(element.id)"><i class="fas fa-cog"></i></button> <button class="remove _button" @click.prevent.stop="removeWidget(element)"><i class="fas fa-times"></i></button> - <component :ref="el => widgetRefs[element.id] = el" :is="`mkw-${element.name}`" :widget="element" @updateProps="updateWidget(element.id, $event)"/> + <component class="handle" :ref="el => widgetRefs[element.id] = el" :is="`mkw-${element.name}`" :widget="element" @updateProps="updateWidget(element.id, $event)"/> </div> </template> </XDraggable> @@ -121,10 +122,6 @@ export default defineComponent({ position: relative; cursor: move; - > *:not(.remove):not(.config) { - pointer-events: none; - } - > .config, > .remove { position: absolute; diff --git a/packages/client/src/pages/admin/settings.vue b/packages/client/src/pages/admin/settings.vue index 81204f6e2f..17f7842ab2 100644 --- a/packages/client/src/pages/admin/settings.vue +++ b/packages/client/src/pages/admin/settings.vue @@ -52,11 +52,6 @@ <template #caption>{{ $ts.pinnedUsersDescription }}</template> </FormTextarea> - <FormInput v-model="maxNoteTextLength" type="number" class="_formBlock"> - <template #prefix><i class="fas fa-pencil-alt"></i></template> - <template #label>{{ $ts.maxNoteTextLength }}</template> - </FormInput> - <FormSection> <FormSwitch v-model="enableRegistration" class="_formBlock"> <template #label>{{ $ts.enableRegistration }}</template> @@ -186,7 +181,6 @@ export default defineComponent({ bannerUrl: null, backgroundImageUrl: null, themeColor: null, - maxNoteTextLength: 0, enableLocalTimeline: false, enableGlobalTimeline: false, pinnedUsers: '', @@ -216,7 +210,6 @@ export default defineComponent({ this.themeColor = meta.themeColor; this.maintainerName = meta.maintainerName; this.maintainerEmail = meta.maintainerEmail; - this.maxNoteTextLength = meta.maxNoteTextLength; this.enableLocalTimeline = !meta.disableLocalTimeline; this.enableGlobalTimeline = !meta.disableGlobalTimeline; this.pinnedUsers = meta.pinnedUsers.join('\n'); @@ -244,7 +237,6 @@ export default defineComponent({ themeColor: this.themeColor === '' ? null : this.themeColor, maintainerName: this.maintainerName, maintainerEmail: this.maintainerEmail, - maxNoteTextLength: this.maxNoteTextLength, disableLocalTimeline: !this.enableLocalTimeline, disableGlobalTimeline: !this.enableGlobalTimeline, pinnedUsers: this.pinnedUsers.split('\n'), |