heartles/egirlskey
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Refactor

Browse source
This commit is contained in:
syuilo 2020-02-14 01:24:05 +09:00
parent f5f7654f4b
commit 6e6b12519a
11 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/client/components/ui/input.vue
View file

@ -239,6 +239,10 @@ export default Vue.extend({
position: relative; position: relative;
margin: 32px 0; margin: 32px 0;
&:not(.inline):first-child {
margin-top: 8px;
}
> .icon { > .icon {
position: absolute; position: absolute;
top: 0; top: 0;

4
src/client/components/ui/select.vue
View file

@ -77,6 +77,10 @@ export default Vue.extend({
position: relative; position: relative;
margin: 32px 0; margin: 32px 0;
&:not(.inline):first-child {
margin-top: 8px;
}
> .icon { > .icon {
position: absolute; position: absolute;
top: 0; top: 0;

4
src/client/components/ui/textarea.vue
View file

@ -85,6 +85,10 @@ export default Vue.extend({
margin: 42px 0 32px 0; margin: 42px 0 32px 0;
position: relative; position: relative;
&:first-child {
margin-top: 16px;
}
&:last-child { &:last-child {
margin-bottom: 0; margin-bottom: 0;
} }

2
src/client/pages/instance/announcements.vue
View file

@ -5,7 +5,7 @@
<mk-button @click="add()" primary style="margin: 0 auto 16px auto;"><fa :icon="faPlus"/> {{ $t('add') }}</mk-button> <mk-button @click="add()" primary style="margin: 0 auto 16px auto;"><fa :icon="faPlus"/> {{ $t('add') }}</mk-button>
<section class="_card announcements"> <section class="_card announcements">
<div class="_content announcement" v-for="announcement in announcements"> <div class="_content announcement" v-for="announcement in announcements">
<mk-input v-model="announcement.title" style="margin-top: 8px;"> <mk-input v-model="announcement.title">
<span>{{ $t('title') }}</span> <span>{{ $t('title') }}</span>
</mk-input> </mk-input>
<mk-textarea v-model="announcement.text"> <mk-textarea v-model="announcement.text">

2
src/client/pages/instance/emojis.vue
View file

@ -36,7 +36,7 @@
<section class="_card remote"> <section class="_card remote">
<div class="_title"><fa :icon="faLaugh"/> {{ $t('customEmojisOfRemote') }}</div> <div class="_title"><fa :icon="faLaugh"/> {{ $t('customEmojisOfRemote') }}</div>
<div class="_content"> <div class="_content">
<mk-input v-model="host" :debounce="true" style="margin-top: 0;"><span>{{ $t('host') }}</span></mk-input> <mk-input v-model="host" :debounce="true"><span>{{ $t('host') }}</span></mk-input>
<mk-pagination :pagination="remotePagination" class="emojis" ref="remoteEmojis"> <mk-pagination :pagination="remotePagination" class="emojis" ref="remoteEmojis">
<template #empty><span>{{ $t('noCustomEmojis') }}</span></template> <template #empty><span>{{ $t('noCustomEmojis') }}</span></template>
<template #default="{items}"> <template #default="{items}">

6
src/client/pages/instance/index.vue
View file

@ -6,7 +6,7 @@
<section class="_card info"> <section class="_card info">
<div class="_title"><fa :icon="faInfoCircle"/> {{ $t('basicInfo') }}</div> <div class="_title"><fa :icon="faInfoCircle"/> {{ $t('basicInfo') }}</div>
<div class="_content"> <div class="_content">
<mk-input v-model="name" style="margin-top: 8px;">{{ $t('instanceName') }}</mk-input> <mk-input v-model="name">{{ $t('instanceName') }}</mk-input>
<mk-textarea v-model="description">{{ $t('instanceDescription') }}</mk-textarea> <mk-textarea v-model="description">{{ $t('instanceDescription') }}</mk-textarea>
<mk-input v-model="iconUrl"><template #icon><fa :icon="faLink"/></template>{{ $t('iconUrl') }}</mk-input> <mk-input v-model="iconUrl"><template #icon><fa :icon="faLink"/></template>{{ $t('iconUrl') }}</mk-input>
<mk-input v-model="bannerUrl"><template #icon><fa :icon="faLink"/></template>{{ $t('bannerUrl') }}</mk-input> <mk-input v-model="bannerUrl"><template #icon><fa :icon="faLink"/></template>{{ $t('bannerUrl') }}</mk-input>
@ -78,7 +78,7 @@
<section class="_card"> <section class="_card">
<div class="_title"><fa :icon="faThumbtack"/> {{ $t('pinnedUsers') }}</div> <div class="_title"><fa :icon="faThumbtack"/> {{ $t('pinnedUsers') }}</div>
<div class="_content"> <div class="_content">
<mk-textarea v-model="pinnedUsers" style="margin-top: 0;"> <mk-textarea v-model="pinnedUsers">
<template #desc>{{ $t('pinnedUsersDescription') }} <button class="_textButton" @click="addPinUser">{{ $t('addUser') }}</button></template> <template #desc>{{ $t('pinnedUsersDescription') }} <button class="_textButton" @click="addPinUser">{{ $t('addUser') }}</button></template>
</mk-textarea> </mk-textarea>
</div> </div>
@ -111,7 +111,7 @@
<section class="_card"> <section class="_card">
<div class="_title"><fa :icon="faBan"/> {{ $t('blockedInstances') }}</div> <div class="_title"><fa :icon="faBan"/> {{ $t('blockedInstances') }}</div>
<div class="_content"> <div class="_content">
<mk-textarea v-model="blockedHosts" style="margin-top: 0;"> <mk-textarea v-model="blockedHosts">
<template #desc>{{ $t('blockedInstancesDescription') }}</template> <template #desc>{{ $t('blockedInstancesDescription') }}</template>
</mk-textarea> </mk-textarea>
</div> </div>

2
src/client/pages/instance/users.vue
View file

@ -6,7 +6,7 @@
<section class="_card lookup"> <section class="_card lookup">
<div class="_title"><fa :icon="faSearch"/> {{ $t('lookup') }}</div> <div class="_title"><fa :icon="faSearch"/> {{ $t('lookup') }}</div>
<div class="_content"> <div class="_content">
<mk-input class="target" v-model="target" type="text" @enter="showUser()" style="margin-top: 0;"> <mk-input class="target" v-model="target" type="text" @enter="showUser()">
<span>{{ $t('usernameOrUserId') }}</span> <span>{{ $t('usernameOrUserId') }}</span>
</mk-input> </mk-input>
<mk-button @click="showUser()" primary><fa :icon="faSearch"/> {{ $t('lookup') }}</mk-button> <mk-button @click="showUser()" primary><fa :icon="faSearch"/> {{ $t('lookup') }}</mk-button>

2
src/client/pages/my-antennas/index.antenna.vue
View file

@ -2,7 +2,7 @@
<div class="shaynizk _card"> <div class="shaynizk _card">
<div class="_title" v-if="antenna.name">{{ antenna.name }}</div> <div class="_title" v-if="antenna.name">{{ antenna.name }}</div>
<div class="_content body"> <div class="_content body">
<mk-input v-model="name" style="margin-top: 8px;"> <mk-input v-model="name">
<span>{{ $t('name') }}</span> <span>{{ $t('name') }}</span>
</mk-input> </mk-input>
<mk-select v-model="src"> <mk-select v-model="src">

2
src/client/pages/settings/general.vue
View file

@ -2,7 +2,7 @@
<section class="_card"> <section class="_card">
<div class="_title"><fa :icon="faCog"/> {{ $t('general') }}</div> <div class="_title"><fa :icon="faCog"/> {{ $t('general') }}</div>
<div class="_content"> <div class="_content">
<mk-input type="file" @change="onWallpaperChange" style="margin-top: 0;"> <mk-input type="file" @change="onWallpaperChange">
<span>{{ $t('wallpaper') }}</span> <span>{{ $t('wallpaper') }}</span>
<template #icon><fa :icon="faImage"/></template> <template #icon><fa :icon="faImage"/></template>
<template #desc v-if="wallpaperUploading">{{ $t('uploading') }}<mk-ellipsis/></template> <template #desc v-if="wallpaperUploading">{{ $t('uploading') }}<mk-ellipsis/></template>

4
src/client/pages/settings/import-export.vue
View file

@ -2,8 +2,7 @@
<section class="_card"> <section class="_card">
<div class="_title"><fa :icon="faBoxes"/> {{ $t('importAndExport') }}</div> <div class="_title"><fa :icon="faBoxes"/> {{ $t('importAndExport') }}</div>
<div class="_content"> <div class="_content">
<input ref="file" type="file" style="display: none;" @change="onChangeFile"/> <mk-select v-model="exportTarget">
<mk-select v-model="exportTarget" style="margin-top: 0;">
<option value="notes">{{ $t('_exportOrImport.allNotes') }}</option> <option value="notes">{{ $t('_exportOrImport.allNotes') }}</option>
<option value="following">{{ $t('_exportOrImport.followingList') }}</option> <option value="following">{{ $t('_exportOrImport.followingList') }}</option>
<option value="user-lists">{{ $t('_exportOrImport.userLists') }}</option> <option value="user-lists">{{ $t('_exportOrImport.userLists') }}</option>
@ -13,6 +12,7 @@
<mk-button inline @click="doExport()"><fa :icon="faDownload"/> {{ $t('export') }}</mk-button> <mk-button inline @click="doExport()"><fa :icon="faDownload"/> {{ $t('export') }}</mk-button>
<mk-button inline @click="doImport()" :disabled="!['following', 'user-lists'].includes(exportTarget)"><fa :icon="faUpload"/> {{ $t('import') }}</mk-button> <mk-button inline @click="doImport()" :disabled="!['following', 'user-lists'].includes(exportTarget)"><fa :icon="faUpload"/> {{ $t('import') }}</mk-button>
</div> </div>
<input ref="file" type="file" style="display: none;" @change="onChangeFile"/>
</section> </section>
</template> </template>

2
src/client/pages/settings/reaction.vue
View file

@ -2,7 +2,7 @@
<section class="_card"> <section class="_card">
<div class="_title"><fa :icon="faLaugh"/> {{ $t('reaction') }}</div> <div class="_title"><fa :icon="faLaugh"/> {{ $t('reaction') }}</div>
<div class="_content"> <div class="_content">
<mk-textarea v-model="reactions" style="margin-top: 16px;">{{ $t('reaction') }}<template #desc>{{ $t('reactionSettingDescription') }}</template></mk-textarea> <mk-textarea v-model="reactions">{{ $t('reaction') }}<template #desc>{{ $t('reactionSettingDescription') }}</template></mk-textarea>
</div> </div>
<div class="_footer"> <div class="_footer">
<mk-button @click="save()" primary inline :disabled="!changed"><fa :icon="faSave"/> {{ $t('save') }}</mk-button> <mk-button @click="save()" primary inline :disabled="!changed"><fa :icon="faSave"/> {{ $t('save') }}</mk-button>