From d4c0d85cbc6a6dad4e12031693747ce1e06c3169 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 23 Oct 2021 22:09:48 +0900 Subject: [PATCH 01/24] :art: --- src/client/components/queue-chart.vue | 5 +++-- src/client/pages/admin/overview.vue | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/client/components/queue-chart.vue b/src/client/components/queue-chart.vue index 59c9723f89..c66f83ecdf 100644 --- a/src/client/components/queue-chart.vue +++ b/src/client/components/queue-chart.vue @@ -122,12 +122,13 @@ export default defineComponent({ scales: { x: { grid: { - display: false, + display: true, color: gridColor, borderColor: 'rgb(0, 0, 0, 0)', }, ticks: { - display: false, + display: true, + maxTicksLimit: 10 }, }, y: { diff --git a/src/client/pages/admin/overview.vue b/src/client/pages/admin/overview.vue index bb9c10f106..4e761f0217 100644 --- a/src/client/pages/admin/overview.vue +++ b/src/client/pages/admin/overview.vue @@ -2,7 +2,7 @@
-
+
Users
@@ -225,12 +225,14 @@ export default defineComponent({ } } - &.max-width_800px { + &.max-width_740px { > .queue { display: block; > .deliver, > .inbox { + width: 100%; + &:not(:first-child) { margin-top: var(--margin); margin-left: 0; From 2d21685d2239aa0b2bf855c2d0f6391dc6c0c4d8 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 23 Oct 2021 22:41:34 +0900 Subject: [PATCH 02/24] :art: --- src/client/components/queue-chart.vue | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/client/components/queue-chart.vue b/src/client/components/queue-chart.vue index c66f83ecdf..99bc9478a3 100644 --- a/src/client/components/queue-chart.vue +++ b/src/client/components/queue-chart.vue @@ -79,6 +79,7 @@ export default defineComponent({ pointRadius: 0, tension: 0, borderWidth: 2, + borderJoinStyle: 'round', borderColor: '#00E396', backgroundColor: alpha('#00E396', 0.1), data: [] @@ -87,6 +88,7 @@ export default defineComponent({ pointRadius: 0, tension: 0, borderWidth: 2, + borderJoinStyle: 'round', borderColor: '#00BCD4', backgroundColor: alpha('#00BCD4', 0.1), data: [] @@ -95,6 +97,7 @@ export default defineComponent({ pointRadius: 0, tension: 0, borderWidth: 2, + borderJoinStyle: 'round', borderColor: '#FFB300', backgroundColor: alpha('#FFB300', 0.1), data: [] @@ -103,9 +106,11 @@ export default defineComponent({ pointRadius: 0, tension: 0, borderWidth: 2, + borderJoinStyle: 'round', borderColor: '#E53935', borderDash: [5, 5], fill: false, + yAxisID: 'y2', data: [] }], }, @@ -132,6 +137,19 @@ export default defineComponent({ }, }, y: { + min: 0, + stack: 'queue', + stackWeight: 2, + grid: { + color: gridColor, + borderColor: 'rgb(0, 0, 0, 0)', + }, + }, + y2: { + min: 0, + offset: true, + stack: 'queue', + stackWeight: 1, grid: { color: gridColor, borderColor: 'rgb(0, 0, 0, 0)', From ae5d5371970ad5fc95d4f2fcc4c1effbdbb58eef Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 23 Oct 2021 22:43:42 +0900 Subject: [PATCH 03/24] :art: --- src/client/components/queue-chart.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/components/queue-chart.vue b/src/client/components/queue-chart.vue index 99bc9478a3..b06bda5446 100644 --- a/src/client/components/queue-chart.vue +++ b/src/client/components/queue-chart.vue @@ -132,7 +132,7 @@ export default defineComponent({ borderColor: 'rgb(0, 0, 0, 0)', }, ticks: { - display: true, + display: false, maxTicksLimit: 10 }, }, From 4d1c723496655da459d3803d20d11a80a5df7978 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 23 Oct 2021 23:22:20 +0900 Subject: [PATCH 04/24] refactor clinet --- src/client/components/modal-page-window.vue | 2 +- src/client/components/page-window.vue | 2 +- src/client/components/ui/folder.vue | 6 - src/client/components/ui/info.vue | 4 - src/client/pages/admin/index.vue | 1 - src/client/pages/messaging/index.vue | 68 +++---- src/client/pages/note.vue | 82 +++++---- src/client/pages/settings/index.vue | 1 - src/client/pages/user/index.timeline.vue | 7 - src/client/pages/user/index.vue | 190 ++++++++++---------- src/client/style.scss | 44 ----- src/client/ui/chat/side.vue | 2 +- src/client/ui/deck/main-column.vue | 2 +- src/client/ui/default.vue | 2 +- src/client/widgets/notifications.vue | 2 +- 15 files changed, 171 insertions(+), 244 deletions(-) diff --git a/src/client/components/modal-page-window.vue b/src/client/components/modal-page-window.vue index cb81a974f5..621119294e 100644 --- a/src/client/components/modal-page-window.vue +++ b/src/client/components/modal-page-window.vue @@ -10,7 +10,7 @@
-
+
diff --git a/src/client/components/page-window.vue b/src/client/components/page-window.vue index 7d15c75d62..2b77a214c5 100644 --- a/src/client/components/page-window.vue +++ b/src/client/components/page-window.vue @@ -16,7 +16,7 @@ -
+
diff --git a/src/client/components/ui/folder.vue b/src/client/components/ui/folder.vue index d0616a57c1..3997421d08 100644 --- a/src/client/components/ui/folder.vue +++ b/src/client/components/ui/folder.vue @@ -153,10 +153,4 @@ export default defineComponent({ } } } - -._fitSide_ .ssazuxis { - > header { - padding: 0 16px; - } -} diff --git a/src/client/components/ui/info.vue b/src/client/components/ui/info.vue index e16f2736f1..f6b2edf267 100644 --- a/src/client/components/ui/info.vue +++ b/src/client/components/ui/info.vue @@ -42,8 +42,4 @@ export default defineComponent({ margin-right: 4px; } } - -._fitSide_ .fpezltsf { - border-radius: 0; -} diff --git a/src/client/pages/admin/index.vue b/src/client/pages/admin/index.vue index 416e68206c..f18c634959 100644 --- a/src/client/pages/admin/index.vue +++ b/src/client/pages/admin/index.vue @@ -343,7 +343,6 @@ export default defineComponent({ > .main { flex: 1; min-width: 0; - --baseContentWidth: 100%; } } diff --git a/src/client/pages/messaging/index.vue b/src/client/pages/messaging/index.vue index fef3b76e10..b3e0b6edd0 100644 --- a/src/client/pages/messaging/index.vue +++ b/src/client/pages/messaging/index.vue @@ -2,41 +2,43 @@
-
- {{ $ts.startMessaging }} + +
+ {{ $ts.startMessaging }} -
- -
- -
- {{ message.group.name }} - -
-
- - @{{ acct(isMe(message) ? message.recipient : message.user) }} - -
-
-

{{ $ts.you }}:{{ message.text }}

+
+ +
+ +
+ {{ message.group.name }} + +
+
+ + @{{ acct(isMe(message) ? message.recipient : message.user) }} + +
+
+

{{ $ts.you }}:{{ message.text }}

+
-
- + +
+
+ +
{{ $ts.noHistory }}
+
+
-
- -
{{ $ts.noHistory }}
-
- -
+
@@ -177,7 +179,7 @@ export default defineComponent({ .yweeujhr { > .start { - margin: var(--margin) auto var(--margin) auto; + margin: 0 auto var(--margin) auto; } > .history { diff --git a/src/client/pages/note.vue b/src/client/pages/note.vue index fe85d7364e..8e95430d67 100644 --- a/src/client/pages/note.vue +++ b/src/client/pages/note.vue @@ -1,6 +1,6 @@ + + diff --git a/src/client/components/index.ts b/src/client/components/index.ts index ecf66ea0e8..2340b228f8 100644 --- a/src/client/components/index.ts +++ b/src/client/components/index.ts @@ -15,6 +15,7 @@ import error from './global/error.vue'; import ad from './global/ad.vue'; import header from './global/header.vue'; import spacer from './global/spacer.vue'; +import stickyContainer from './global/sticky-container.vue'; export default function(app: App) { app.component('I18n', i18n); @@ -32,4 +33,5 @@ export default function(app: App) { app.component('MkAd', ad); app.component('MkHeader', header); app.component('MkSpacer', spacer); + app.component('MkStickyContainer', stickyContainer); } diff --git a/src/client/components/modal-page-window.vue b/src/client/components/modal-page-window.vue index 621119294e..e47d3dc62c 100644 --- a/src/client/components/modal-page-window.vue +++ b/src/client/components/modal-page-window.vue @@ -11,9 +11,12 @@
- - - + + + + + +
diff --git a/src/client/components/page-window.vue b/src/client/components/page-window.vue index 2b77a214c5..bc7c5b7a19 100644 --- a/src/client/components/page-window.vue +++ b/src/client/components/page-window.vue @@ -17,7 +17,10 @@
- + + + +
diff --git a/src/client/pages/admin/ads.vue b/src/client/pages/admin/ads.vue index e776f99a4c..4d39bb4e40 100644 --- a/src/client/pages/admin/ads.vue +++ b/src/client/pages/admin/ads.vue @@ -1,45 +1,42 @@ @@ -68,11 +65,6 @@ export default defineComponent({ title: this.$ts.ads, icon: 'fas fa-audio-description', bg: 'var(--bg)', - }, - header: { - title: this.$ts.ads, - icon: 'fas fa-audio-description', - bg: 'var(--bg)', actions: [{ asFullButton: true, icon: 'fas fa-plus', diff --git a/src/client/pages/admin/announcements.vue b/src/client/pages/admin/announcements.vue index 78637c095a..4ace515b0b 100644 --- a/src/client/pages/admin/announcements.vue +++ b/src/client/pages/admin/announcements.vue @@ -1,27 +1,23 @@ @@ -48,11 +44,6 @@ export default defineComponent({ title: this.$ts.announcements, icon: 'fas fa-broadcast-tower', bg: 'var(--bg)', - }, - header: { - title: this.$ts.announcements, - icon: 'fas fa-broadcast-tower', - bg: 'var(--bg)', actions: [{ asFullButton: true, icon: 'fas fa-plus', diff --git a/src/client/pages/admin/emojis.vue b/src/client/pages/admin/emojis.vue index 4cd34b046d..80e0e00ba9 100644 --- a/src/client/pages/admin/emojis.vue +++ b/src/client/pages/admin/emojis.vue @@ -1,7 +1,5 @@ @@ -41,6 +44,10 @@ export default defineComponent({ MkInfo, }, + provide: { + shouldOmitHeaderTitle: false, + }, + props: { initialPage: { type: String, @@ -50,17 +57,19 @@ export default defineComponent({ setup(props, context) { const indexInfo = { - title: i18n.locale.instance, + title: i18n.locale.controlPanel, icon: 'fas fa-cog', bg: 'var(--bg)', + hideHeader: true, }; const INFO = ref(indexInfo); + const childInfo = ref(null); const page = ref(props.initialPage); const narrow = ref(false); const view = ref(null); const el = ref(null); const onInfo = (viewInfo) => { - INFO.value = viewInfo; + childInfo.value = viewInfo; }; const pageProps = ref({}); @@ -315,6 +324,7 @@ export default defineComponent({ view, el, onInfo, + childInfo, pageProps, component, invite, diff --git a/src/client/pages/admin/overview.vue b/src/client/pages/admin/overview.vue index 4e761f0217..ced200351e 100644 --- a/src/client/pages/admin/overview.vue +++ b/src/client/pages/admin/overview.vue @@ -1,71 +1,67 @@ @@ -107,10 +103,6 @@ export default defineComponent({ icon: 'fas fa-tachometer-alt', bg: 'var(--bg)', }, - header: { - title: this.$ts.dashboard, - icon: 'fas fa-tachometer-alt', - }, version, vueVersion, url, diff --git a/src/client/pages/admin/users.vue b/src/client/pages/admin/users.vue index f7f9306b70..37a54d2de3 100644 --- a/src/client/pages/admin/users.vue +++ b/src/client/pages/admin/users.vue @@ -1,7 +1,5 @@