diff options
Diffstat (limited to 'src/client/pages/instance')
| -rw-r--r-- | src/client/pages/instance/abuses.vue | 5 | ||||
| -rw-r--r-- | src/client/pages/instance/announcements.vue | 5 | ||||
| -rw-r--r-- | src/client/pages/instance/emojis.vue | 3 | ||||
| -rw-r--r-- | src/client/pages/instance/federation.vue | 3 | ||||
| -rw-r--r-- | src/client/pages/instance/files.vue | 5 | ||||
| -rw-r--r-- | src/client/pages/instance/index.metrics.vue | 6 | ||||
| -rw-r--r-- | src/client/pages/instance/index.vue | 9 | ||||
| -rw-r--r-- | src/client/pages/instance/instance.vue | 4 | ||||
| -rw-r--r-- | src/client/pages/instance/logs.vue | 3 | ||||
| -rw-r--r-- | src/client/pages/instance/queue.vue | 3 | ||||
| -rw-r--r-- | src/client/pages/instance/relays.vue | 3 | ||||
| -rw-r--r-- | src/client/pages/instance/settings.vue | 33 | ||||
| -rw-r--r-- | src/client/pages/instance/users.vue | 5 |
13 files changed, 49 insertions, 38 deletions
diff --git a/src/client/pages/instance/abuses.vue b/src/client/pages/instance/abuses.vue index d7d7697ebd..736f05cc72 100644 --- a/src/client/pages/instance/abuses.vue +++ b/src/client/pages/instance/abuses.vue @@ -34,7 +34,7 @@ --> <MkPagination :pagination="pagination" #default="{items}" ref="reports" style="margin-top: var(--margin);"> - <div class="bcekxzvu _card _vMargin" v-for="report in items" :key="report.id"> + <div class="bcekxzvu _card _gap" v-for="report in items" :key="report.id"> <div class="_content target"> <MkAvatar class="avatar" :user="report.targetUser"/> <div class="info"> @@ -72,6 +72,7 @@ import MkSelect from '@client/components/ui/select.vue'; import MkPagination from '@client/components/ui/pagination.vue'; import { acct } from '../../filters/user'; import * as os from '@client/os'; +import * as symbols from '@client/symbols'; export default defineComponent({ components: { @@ -83,7 +84,7 @@ export default defineComponent({ data() { return { - INFO: { + [symbols.PAGE_INFO]: { title: this.$ts.abuseReports, icon: faExclamationCircle }, diff --git a/src/client/pages/instance/announcements.vue b/src/client/pages/instance/announcements.vue index 15e5f389bc..f9d58a29c4 100644 --- a/src/client/pages/instance/announcements.vue +++ b/src/client/pages/instance/announcements.vue @@ -3,7 +3,7 @@ <div class="_section"> <div class="_content"> <MkButton @click="add()" primary style="margin: 0 auto 16px auto;"><Fa :icon="faPlus"/> {{ $ts.add }}</MkButton> - <section class="_card _vMargin announcements" v-for="announcement in announcements"> + <section class="_card _gap announcements" v-for="announcement in announcements"> <div class="_content announcement"> <MkInput v-model:value="announcement.title"> <span>{{ $ts.title }}</span> @@ -34,6 +34,7 @@ import MkButton from '@client/components/ui/button.vue'; import MkInput from '@client/components/ui/input.vue'; import MkTextarea from '@client/components/ui/textarea.vue'; import * as os from '@client/os'; +import * as symbols from '@client/symbols'; export default defineComponent({ components: { @@ -44,7 +45,7 @@ export default defineComponent({ data() { return { - INFO: { + [symbols.PAGE_INFO]: { title: this.$ts.announcements, icon: faBroadcastTower }, diff --git a/src/client/pages/instance/emojis.vue b/src/client/pages/instance/emojis.vue index 01e207f491..722ed0063f 100644 --- a/src/client/pages/instance/emojis.vue +++ b/src/client/pages/instance/emojis.vue @@ -59,6 +59,7 @@ import MkPagination from '@client/components/ui/pagination.vue'; import MkTab from '@client/components/tab.vue'; import { selectFile } from '@client/scripts/select-file'; import * as os from '@client/os'; +import * as symbols from '@client/symbols'; export default defineComponent({ components: { @@ -70,7 +71,7 @@ export default defineComponent({ data() { return { - INFO: { + [symbols.PAGE_INFO]: { title: this.$ts.customEmojis, icon: faLaugh, action: { diff --git a/src/client/pages/instance/federation.vue b/src/client/pages/instance/federation.vue index ba452c5458..2a820e5baf 100644 --- a/src/client/pages/instance/federation.vue +++ b/src/client/pages/instance/federation.vue @@ -67,6 +67,7 @@ import MkSelect from '@client/components/ui/select.vue'; import MkPagination from '@client/components/ui/pagination.vue'; import MkInstanceInfo from './instance.vue'; import * as os from '@client/os'; +import * as symbols from '@client/symbols'; export default defineComponent({ components: { @@ -78,7 +79,7 @@ export default defineComponent({ data() { return { - INFO: { + [symbols.PAGE_INFO]: { title: this.$ts.federation, icon: faGlobe }, diff --git a/src/client/pages/instance/files.vue b/src/client/pages/instance/files.vue index aa66713789..e7de050df8 100644 --- a/src/client/pages/instance/files.vue +++ b/src/client/pages/instance/files.vue @@ -35,7 +35,7 @@ </MkInput> </div> <MkPagination :pagination="pagination" #default="{items}" class="urempief" ref="files"> - <button class="file _panel _button _vMargin" v-for="file in items" :key="file.id" @click="show(file, $event)"> + <button class="file _panel _button _gap" v-for="file in items" :key="file.id" @click="show(file, $event)"> <MkDriveFileThumbnail class="thumbnail" :file="file" fit="contain"/> <div class="body"> <div> @@ -71,6 +71,7 @@ import MkPagination from '@client/components/ui/pagination.vue'; import MkDriveFileThumbnail from '@client/components/drive-file-thumbnail.vue'; import bytes from '@client/filters/bytes'; import * as os from '@client/os'; +import * as symbols from '@client/symbols'; export default defineComponent({ components: { @@ -83,7 +84,7 @@ export default defineComponent({ data() { return { - INFO: { + [symbols.PAGE_INFO]: { title: this.$ts.files, icon: faCloud }, diff --git a/src/client/pages/instance/index.metrics.vue b/src/client/pages/instance/index.metrics.vue index b467ce06f5..48844e0681 100644 --- a/src/client/pages/instance/index.metrics.vue +++ b/src/client/pages/instance/index.metrics.vue @@ -4,7 +4,7 @@ <template #header><Fa :icon="faHeartbeat"/> {{ $ts.metrics }}</template> <div class="_section" style="padding: 0 var(--margin);"> <div class="_content"> - <MkContainer :body-togglable="false" class="_vMargin"> + <MkContainer :body-togglable="false" class="_gap"> <template #header><Fa :icon="faMicrochip"/>{{ $ts.cpuAndMemory }}</template> <!-- <template #func> @@ -27,7 +27,7 @@ </div> </MkContainer> - <MkContainer :body-togglable="false" class="_vMargin"> + <MkContainer :body-togglable="false" class="_gap"> <template #header><Fa :icon="faHdd"/> {{ $ts.disk }}</template> <!-- <template #func> @@ -50,7 +50,7 @@ </div> </MkContainer> - <MkContainer :body-togglable="false" class="_vMargin"> + <MkContainer :body-togglable="false" class="_gap"> <template #header><Fa :icon="faExchangeAlt"/> {{ $ts.network }}</template> <!-- <template #func> diff --git a/src/client/pages/instance/index.vue b/src/client/pages/instance/index.vue index 5a35309ed4..54a0584ccc 100644 --- a/src/client/pages/instance/index.vue +++ b/src/client/pages/instance/index.vue @@ -4,9 +4,9 @@ <template #header><Fa :icon="faTachometerAlt"/> {{ $ts.overview }}</template> <div class="sboqnrfi" :style="{ gridTemplateRows: overviewHeight }"> - <MkInstanceStats :chart-limit="300" :detailed="true" class="_vMargin" ref="stats"/> + <MkInstanceStats :chart-limit="300" :detailed="true" class="_gap" ref="stats"/> - <MkContainer :body-togglable="true" class="_vMargin"> + <MkContainer :body-togglable="true" class="_gap"> <template #header><Fa :icon="faInfoCircle"/>{{ $ts.instanceInfo }}</template> <div class="_content"> @@ -19,7 +19,7 @@ </div> </MkContainer> - <MkContainer :body-togglable="true" :scrollable="true" class="_vMargin" style="height: 300px;"> + <MkContainer :body-togglable="true" :scrollable="true" class="_gap" style="height: 300px;"> <template #header><Fa :icon="faDatabase"/>{{ $ts.database }}</template> <div class="_content" v-if="dbInfo"> @@ -70,6 +70,7 @@ import number from '../../filters/number'; import MkInstanceInfo from './instance.vue'; import XMetrics from './index.metrics.vue'; import * as os from '@client/os'; +import * as symbols from '@client/symbols'; export default defineComponent({ components: { @@ -85,7 +86,7 @@ export default defineComponent({ data() { return { - INFO: { + [symbols.PAGE_INFO]: { tabs: [{ id: 'index', title: null, diff --git a/src/client/pages/instance/instance.vue b/src/client/pages/instance/instance.vue index 118e8eae6e..1adb3ab9d2 100644 --- a/src/client/pages/instance/instance.vue +++ b/src/client/pages/instance/instance.vue @@ -500,12 +500,12 @@ export default defineComponent({ } &:not(:first-child) { - border-top: solid 1px var(--divider); + border-top: solid 0.5px var(--divider); } } > .chart { - border-top: solid 1px var(--divider); + border-top: solid 0.5px var(--divider); padding: 16px 0 12px 0; > .header { diff --git a/src/client/pages/instance/logs.vue b/src/client/pages/instance/logs.vue index de1e81750f..f27546a401 100644 --- a/src/client/pages/instance/logs.vue +++ b/src/client/pages/instance/logs.vue @@ -37,6 +37,7 @@ import MkInput from '@client/components/ui/input.vue'; import MkSelect from '@client/components/ui/select.vue'; import MkTextarea from '@client/components/ui/textarea.vue'; import * as os from '@client/os'; +import * as symbols from '@client/symbols'; export default defineComponent({ components: { @@ -48,7 +49,7 @@ export default defineComponent({ data() { return { - INFO: { + [symbols.PAGE_INFO]: { title: this.$ts.serverLogs, icon: faStream }, diff --git a/src/client/pages/instance/queue.vue b/src/client/pages/instance/queue.vue index 17c8430a01..249babcf41 100644 --- a/src/client/pages/instance/queue.vue +++ b/src/client/pages/instance/queue.vue @@ -21,6 +21,7 @@ import { faTrashAlt } from '@fortawesome/free-regular-svg-icons'; import MkButton from '@client/components/ui/button.vue'; import XQueue from './queue.chart.vue'; import * as os from '@client/os'; +import * as symbols from '@client/symbols'; export default defineComponent({ components: { @@ -30,7 +31,7 @@ export default defineComponent({ data() { return { - INFO: { + [symbols.PAGE_INFO]: { title: this.$ts.jobQueue, icon: faExchangeAlt, }, diff --git a/src/client/pages/instance/relays.vue b/src/client/pages/instance/relays.vue index ef11366a14..d97a07cbb2 100644 --- a/src/client/pages/instance/relays.vue +++ b/src/client/pages/instance/relays.vue @@ -28,6 +28,7 @@ import { faSave, faTrashAlt } from '@fortawesome/free-regular-svg-icons'; import MkButton from '@client/components/ui/button.vue'; import MkInput from '@client/components/ui/input.vue'; import * as os from '@client/os'; +import * as symbols from '@client/symbols'; export default defineComponent({ components: { @@ -37,7 +38,7 @@ export default defineComponent({ data() { return { - INFO: { + [symbols.PAGE_INFO]: { title: this.$ts.relays, icon: faProjectDiagram, }, diff --git a/src/client/pages/instance/settings.vue b/src/client/pages/instance/settings.vue index 891eba3cf0..038ecfd5ac 100644 --- a/src/client/pages/instance/settings.vue +++ b/src/client/pages/instance/settings.vue @@ -1,6 +1,6 @@ <template> <div v-if="meta" class="_section"> - <section class="_card _vMargin"> + <section class="_card _gap"> <div class="_title"><Fa :icon="faInfoCircle"/> {{ $ts.basicInfo }}</div> <div class="_content"> <MkInput v-model:value="name">{{ $ts.instanceName }}</MkInput> @@ -20,7 +20,7 @@ <MkInput v-model:value="pinnedClipId">{{ $ts.pinnedClipId }}</MkInput> - <section class="_card _vMargin"> + <section class="_card _gap"> <div class="_content"> <MkInput v-model:value="maxNoteTextLength" type="number" :save="() => save()"><template #icon><Fa :icon="faPencilAlt"/></template>{{ $ts.maxNoteTextLength }}</MkInput> </div> @@ -34,7 +34,7 @@ </div> </section> - <section class="_card _vMargin"> + <section class="_card _gap"> <div class="_title"><Fa :icon="faUser"/> {{ $ts.registration }}</div> <div class="_content"> <MkSwitch v-model:value="enableRegistration" @update:value="save()">{{ $ts.enableRegistration }}</MkSwitch> @@ -42,7 +42,7 @@ </div> </section> - <section class="_card _vMargin"> + <section class="_card _gap"> <div class="_title"><Fa :icon="faShieldAlt"/> {{ $ts.hcaptcha }}</div> <div class="_content"> <MkSwitch v-model:value="enableHcaptcha">{{ $ts.enableHcaptcha }}</MkSwitch> @@ -60,7 +60,7 @@ </div> </section> - <section class="_card _vMargin"> + <section class="_card _gap"> <div class="_title"><Fa :icon="faShieldAlt"/> {{ $ts.recaptcha }}</div> <div class="_content"> <MkSwitch v-model:value="enableRecaptcha" ref="enableRecaptcha">{{ $ts.enableRecaptcha }}</MkSwitch> @@ -78,7 +78,7 @@ </div> </section> - <section class="_card _vMargin"> + <section class="_card _gap"> <div class="_title"><Fa :icon="faEnvelope" /> {{ $ts.emailConfig }}</div> <div class="_content"> <MkSwitch v-model:value="enableEmail" @update:value="save()">{{ $ts.enableEmail }}<template #desc>{{ $ts.emailConfigInfo }}</template></MkSwitch> @@ -101,7 +101,7 @@ </div> </section> - <section class="_card _vMargin"> + <section class="_card _gap"> <div class="_title"><Fa :icon="faBolt"/> {{ $ts.serviceworker }}</div> <div class="_content"> <MkSwitch v-model:value="enableServiceWorker">{{ $ts.enableServiceworker }}<template #desc>{{ $ts.serviceworkerInfo }}</template></MkSwitch> @@ -117,7 +117,7 @@ </div> </section> - <section class="_card _vMargin"> + <section class="_card _gap"> <div class="_title"><Fa :icon="faThumbtack"/> {{ $ts.pinnedUsers }}</div> <div class="_content"> <MkTextarea v-model:value="pinnedUsers"> @@ -129,7 +129,7 @@ </div> </section> - <section class="_card _vMargin"> + <section class="_card _gap"> <div class="_title"><Fa :icon="faThumbtack"/> {{ $ts.pinnedPages }}</div> <div class="_content"> <MkTextarea v-model:value="pinnedPages"> @@ -141,7 +141,7 @@ </div> </section> - <section class="_card _vMargin"> + <section class="_card _gap"> <div class="_title"><Fa :icon="faCloud"/> {{ $ts.files }}</div> <div class="_content"> <MkSwitch v-model:value="cacheRemoteFiles">{{ $ts.cacheRemoteFiles }}<template #desc>{{ $ts.cacheRemoteFilesDescription }}</template></MkSwitch> @@ -154,7 +154,7 @@ </div> </section> - <section class="_card _vMargin"> + <section class="_card _gap"> <div class="_title"><Fa :icon="faCloud"/> {{ $ts.objectStorage }}</div> <div class="_content"> <MkSwitch v-model:value="useObjectStorage">{{ $ts.useObjectStorage }}</MkSwitch> @@ -183,7 +183,7 @@ </div> </section> - <section class="_card _vMargin"> + <section class="_card _gap"> <div class="_title"><Fa :icon="faGhost"/> {{ $ts.proxyAccount }}</div> <div class="_content"> <MkInput :value="proxyAccount ? proxyAccount.username : null" disabled><template #prefix>@</template>{{ $ts.proxyAccount }}<template #desc>{{ $ts.proxyAccountDescription }}</template></MkInput> @@ -191,7 +191,7 @@ </div> </section> - <section class="_card _vMargin"> + <section class="_card _gap"> <div class="_title"><Fa :icon="faBan"/> {{ $ts.blockedInstances }}</div> <div class="_content"> <MkTextarea v-model:value="blockedHosts"> @@ -203,7 +203,7 @@ </div> </section> - <section class="_card _vMargin"> + <section class="_card _gap"> <div class="_title"><Fa :icon="faShareAlt"/> {{ $ts.integration }}</div> <div class="_content"> <header><Fa :icon="faTwitter"/> Twitter</header> @@ -237,7 +237,7 @@ </div> </section> - <section class="_card _vMargin"> + <section class="_card _gap"> <div class="_title"><Fa :icon="faArchway" /> Summaly Proxy</div> <div class="_content"> <MkInput v-model:value="summalyProxy">URL</MkInput> @@ -261,6 +261,7 @@ import { url } from '@client/config'; import getAcct from '@/misc/acct/render'; import * as os from '@client/os'; import { fetchInstance } from '@client/instance'; +import * as symbols from '@client/symbols'; export default defineComponent({ components: { @@ -274,7 +275,7 @@ export default defineComponent({ data() { return { - INFO: { + [symbols.PAGE_INFO]: { title: this.$ts.instance, icon: faCog, }, diff --git a/src/client/pages/instance/users.vue b/src/client/pages/instance/users.vue index 013eed3971..e998971830 100644 --- a/src/client/pages/instance/users.vue +++ b/src/client/pages/instance/users.vue @@ -53,7 +53,7 @@ </div> <MkPagination :pagination="pagination" #default="{items}" class="users" ref="users"> - <button class="user _panel _button _vMargin" v-for="user in items" :key="user.id" @click="show(user)"> + <button class="user _panel _button _gap" v-for="user in items" :key="user.id" @click="show(user)"> <MkAvatar class="avatar" :user="user" :disable-link="true"/> <div class="body"> <header> @@ -89,6 +89,7 @@ import MkSelect from '@client/components/ui/select.vue'; import MkPagination from '@client/components/ui/pagination.vue'; import { acct } from '../../filters/user'; import * as os from '@client/os'; +import * as symbols from '@client/symbols'; export default defineComponent({ components: { @@ -100,7 +101,7 @@ export default defineComponent({ data() { return { - INFO: { + [symbols.PAGE_INFO]: { title: this.$ts.users, icon: faUsers, action: { |