From 27e11100dc6c718b3678d92ea8e7a78453dd3e6d Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Fri, 18 Nov 2022 23:20:18 -0800 Subject: [PATCH 01/40] New patron list --- README.md | 3 +- locales/en-US.yml | 4 +- package.json | 2 +- packages/client/src/pages/about-calckey.vue | 83 +-------------------- 4 files changed, 9 insertions(+), 83 deletions(-) diff --git a/README.md b/README.md index 5506e51a2..b729f421e 100644 --- a/README.md +++ b/README.md @@ -33,9 +33,10 @@ # ๐Ÿฅ‚ Links +- ๐Ÿ’ธ Liberapay: + - Donate publicly to get your name on the Patron list! - ๐Ÿšข Flagship instance: - ๐Ÿ“ฃ Official account: -- ๐Ÿ’ธ Liberapay: - ๐Ÿ’ Matrix support room: - ๐Ÿ“œ Instance list: - ๐Ÿ“– JoinFediverse Wiki: diff --git a/locales/en-US.yml b/locales/en-US.yml index e9867f523..6ad3bf614 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -1001,9 +1001,9 @@ _aboutMisskey: allContributors: "All contributors" source: "Source code" translation: "Translate Misskey" - donate: "Donate to Misskey" + donate: "Donate to Calckey" morePatrons: "We also appreciate the support of many other helpers not listed here. Thank you! ๐Ÿฅฐ" - patrons: "Misskey patrons" + patrons: "Calckey patrons" _nsfw: respect: "Hide NSFW media" ignore: "Don't hide NSFW media" diff --git a/package.json b/package.json index 4827b5e07..78380d18e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.15", + "version": "12.119.0-calc.15.1", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/pages/about-calckey.vue b/packages/client/src/pages/about-calckey.vue index 420071c48..29a5be686 100644 --- a/packages/client/src/pages/about-calckey.vue +++ b/packages/client/src/pages/about-calckey.vue @@ -37,7 +37,7 @@ -
{{ patron }}
+ @@ -60,84 +60,9 @@ import * as os from '@/os'; import { definePageMetadata } from '@/scripts/page-metadata'; const patrons = [ - 'ใพใฃใกใ‚ƒใจใƒผใซใ‚…', - 'mametsuko', - 'noellabo', - 'AureoleArk', - 'Gargron', - 'Nokotaro Takeda', - 'Suji Yan', - 'oi_yekssim', - 'regtan', - 'Hekovic', - 'nenohi', - 'Gitmo Life Services', - 'naga_rus', - 'Efertone', - 'Melilot', - 'motcha', - 'nanami kan', - 'sevvie Rose', - 'Hayato Ishikawa', - 'Puniko', - 'skehmatics', - 'Quinton Macejkovic', - 'YUKIMOCHI', - 'dansup', - 'mewl hayabusa', - 'Emilis', - 'Fristi', - 'makokunsan', - 'chidori ninokura', - 'Peter G.', - '่ฆ‹ๅฝ“ใ‹ใชใฟ', - 'natalie', - 'Maronu', - 'Steffen K9', - 'takimura', - 'sikyosyounin', - 'Nesakko', - 'YuzuRyo61', - 'blackskye', - 'sheeta.s', - 'osapon', - 'public_yusuke', - 'CG', - 'ๅดๆตฅ', - 't_w', - 'Jerry', - 'nafuchoco', - 'Takumi Sugita', - 'GLaTAN', - 'mkatze', - 'kabo2468y', - 'mydarkstar', - 'Roujo', - 'DignifiedSilence', - 'uroco @99', - 'totokoro', - 'ใ†ใ—', - 'kiritan', - 'weepjp', - 'Liaizon Wakest', - 'Duponin', - 'Blue', - 'Naoki Hirayama', - 'wara', - 'Wataru Manji (manji0)', - 'ใฟใชใ—ใพ', - 'kanoy', - 'xianon', - 'Denshi', - 'Osushimaru', - 'ใซใ‚‡ใ‚“ใธใ‚‰', - 'ใŠใฎใ ใ„', - 'Leni', - 'oss', - 'Weeble', - '่‰ๆšฎใ›ใ›ใ›', - 'ThatOneCalculator', - 'pixeldesu', + '@atomicpoet@vancity.social', + '@shoq@newsroom.social', + '@pikadude@erisly.social', ]; let easterEggReady = false; From d678711a365f734b6243ffa40333e9280e05f1fa Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Fri, 18 Nov 2022 23:26:43 -0800 Subject: [PATCH 02/40] improve patrons style --- package.json | 2 +- packages/client/src/pages/about-calckey.vue | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 78380d18e..5c730d2b7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.15.1", + "version": "12.119.0-calc.15.2", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/pages/about-calckey.vue b/packages/client/src/pages/about-calckey.vue index 29a5be686..c73d8535e 100644 --- a/packages/client/src/pages/about-calckey.vue +++ b/packages/client/src/pages/about-calckey.vue @@ -37,7 +37,11 @@ - + +
+ +
+ @@ -53,6 +57,7 @@ import FormLink from '@/components/form/link.vue'; import FormSection from '@/components/form/section.vue'; import MkButton from '@/components/MkButton.vue'; import MkLink from '@/components/MkLink.vue'; +import MkSparkle from '@/components/MkSparkle.vue'; import { physics } from '@/scripts/physics'; import { i18n } from '@/i18n'; import { defaultStore } from '@/store'; From 720c1cfd69c7f334d4d42edc7ea0b5b2d36207ab Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Fri, 18 Nov 2022 23:27:40 -0800 Subject: [PATCH 03/40] cl --- CALCKEY.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CALCKEY.md b/CALCKEY.md index 7eb807867..fef8002be 100644 --- a/CALCKEY.md +++ b/CALCKEY.md @@ -86,6 +86,7 @@ - Replace all `$ts` with i18n - AVIF support - Page drafts +- Patron list - Obliteration of Ai-chan - [Make showing ads optional](https://github.com/misskey-dev/misskey/pull/8996) - [Tapping avatar in mobile opens account modal](https://github.com/misskey-dev/misskey/pull/9056) From 5aa3cbe12d5a2f9ca02b40cafa996c3902757a85 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Fri, 18 Nov 2022 23:28:18 -0800 Subject: [PATCH 04/40] no x2 --- package.json | 2 +- packages/client/src/pages/about-calckey.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 5c730d2b7..29cb61687 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.15.2", + "version": "12.119.0-calc.15.3", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/pages/about-calckey.vue b/packages/client/src/pages/about-calckey.vue index c73d8535e..497126954 100644 --- a/packages/client/src/pages/about-calckey.vue +++ b/packages/client/src/pages/about-calckey.vue @@ -39,7 +39,7 @@
- +
From 5606cdae557b42891e5e6cdd93b8db58374e07b1 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Fri, 18 Nov 2022 23:33:03 -0800 Subject: [PATCH 05/40] donate link --- packages/client/src/pages/about-calckey.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/client/src/pages/about-calckey.vue b/packages/client/src/pages/about-calckey.vue index 497126954..ddd13d9c7 100644 --- a/packages/client/src/pages/about-calckey.vue +++ b/packages/client/src/pages/about-calckey.vue @@ -24,6 +24,11 @@ {{ i18n.ts._aboutMisskey.source }} + + + {{ i18n.ts._aboutMisskey.donate }} + + From 58badd7ec62e56eb92c61488120229feb27a15b3 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Fri, 18 Nov 2022 23:54:50 -0800 Subject: [PATCH 06/40] fetch patrons remotely --- package.json | 2 +- packages/backend/src/server/api/endpoints.ts | 2 ++ .../src/server/api/endpoints/patrons.ts | 28 +++++++++++++++++++ packages/client/src/pages/about-calckey.vue | 6 +--- patrons.json | 7 +++++ 5 files changed, 39 insertions(+), 6 deletions(-) create mode 100644 packages/backend/src/server/api/endpoints/patrons.ts create mode 100644 patrons.json diff --git a/package.json b/package.json index 29cb61687..c37277e1c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.15.3", + "version": "12.119.0-calc.15.4", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/backend/src/server/api/endpoints.ts b/packages/backend/src/server/api/endpoints.ts index 29cd19026..d662d53af 100644 --- a/packages/backend/src/server/api/endpoints.ts +++ b/packages/backend/src/server/api/endpoints.ts @@ -275,6 +275,7 @@ import * as ep___pinnedUsers from './endpoints/pinned-users.js'; import * as ep___customMOTD from './endpoints/custom-motd.js'; import * as ep___customSplashIcons from './endpoints/custom-splash-icons.js'; import * as ep___latestVersion from './endpoints/latest-version.js'; +import * as ep___patrons from './endpoints/patrons.js'; import * as ep___promo_read from './endpoints/promo/read.js'; import * as ep___requestResetPassword from './endpoints/request-reset-password.js'; import * as ep___resetDb from './endpoints/reset-db.js'; @@ -599,6 +600,7 @@ const eps = [ ['custom-motd', ep___customMOTD], ['custom-splash-icons', ep___customSplashIcons], ['latest-version', ep___latestVersion], + ['patrons', ep___patrons], ['promo/read', ep___promo_read], ['request-reset-password', ep___requestResetPassword], ['reset-db', ep___resetDb], diff --git a/packages/backend/src/server/api/endpoints/patrons.ts b/packages/backend/src/server/api/endpoints/patrons.ts new file mode 100644 index 000000000..21f8d6717 --- /dev/null +++ b/packages/backend/src/server/api/endpoints/patrons.ts @@ -0,0 +1,28 @@ +import define from '../define.js'; + +export const meta = { + tags: ['meta'], + + requireCredential: false, + requireCredentialPrivateMode: false, +} as const; + +export const paramDef = { + type: 'object', + properties: {}, + required: [], +} as const; + +// eslint-disable-next-line import/no-default-export +export default define(meta, paramDef, async () => { + let patrons; + await fetch('https://codeberg.org/thatonecalculator/calckey/raw/branch/develop/patrons.json') + .then((response) => response.json()) + .then((data) => { + patrons = data[0]; + }); + + return { + patrons, + }; +}); diff --git a/packages/client/src/pages/about-calckey.vue b/packages/client/src/pages/about-calckey.vue index ddd13d9c7..4124e795d 100644 --- a/packages/client/src/pages/about-calckey.vue +++ b/packages/client/src/pages/about-calckey.vue @@ -69,11 +69,7 @@ import { defaultStore } from '@/store'; import * as os from '@/os'; import { definePageMetadata } from '@/scripts/page-metadata'; -const patrons = [ - '@atomicpoet@vancity.social', - '@shoq@newsroom.social', - '@pikadude@erisly.social', -]; +const patrons = await os.api('patrons'); let easterEggReady = false; let easterEggEmojis = $ref([]); diff --git a/patrons.json b/patrons.json new file mode 100644 index 000000000..d2f9c2e34 --- /dev/null +++ b/patrons.json @@ -0,0 +1,7 @@ +[{ + [ + "@atomicpoet@vancity.social" + "@shoq@newsroom.social" + "@pikadude@erisly.social" + ] +}] From 1acc4848fb0b63570a8c667689518e996cc93539 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Sat, 19 Nov 2022 00:01:32 -0800 Subject: [PATCH 07/40] patrons list --- patrons.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/patrons.json b/patrons.json index d2f9c2e34..cb9551947 100644 --- a/patrons.json +++ b/patrons.json @@ -1,7 +1,7 @@ -[{ - [ - "@atomicpoet@vancity.social" - "@shoq@newsroom.social" +{ + "patrons": [ + "@atomicpoet@vancity.social", + "@shoq@newsroom.social", "@pikadude@erisly.social" ] -}] +} From 61fbc74e6ca4a99b78401424d5538422857e640e Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Sat, 19 Nov 2022 00:04:35 -0800 Subject: [PATCH 08/40] fix patrons --- packages/backend/src/server/api/endpoints/patrons.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend/src/server/api/endpoints/patrons.ts b/packages/backend/src/server/api/endpoints/patrons.ts index 21f8d6717..6cdd1fac1 100644 --- a/packages/backend/src/server/api/endpoints/patrons.ts +++ b/packages/backend/src/server/api/endpoints/patrons.ts @@ -19,7 +19,7 @@ export default define(meta, paramDef, async () => { await fetch('https://codeberg.org/thatonecalculator/calckey/raw/branch/develop/patrons.json') .then((response) => response.json()) .then((data) => { - patrons = data[0]; + patrons = data['patrons']; }); return { From 3e44dbdee3ff96b7a7b90460f2369290ed86712c Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Sat, 19 Nov 2022 00:08:45 -0800 Subject: [PATCH 09/40] Add Sage to patron list --- packages/backend/src/server/api/endpoints/patrons.ts | 4 +--- patrons.json | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/backend/src/server/api/endpoints/patrons.ts b/packages/backend/src/server/api/endpoints/patrons.ts index 6cdd1fac1..fd865cc81 100644 --- a/packages/backend/src/server/api/endpoints/patrons.ts +++ b/packages/backend/src/server/api/endpoints/patrons.ts @@ -22,7 +22,5 @@ export default define(meta, paramDef, async () => { patrons = data['patrons']; }); - return { - patrons, - }; + return patrons; }); diff --git a/patrons.json b/patrons.json index cb9551947..6c74f9319 100644 --- a/patrons.json +++ b/patrons.json @@ -2,6 +2,7 @@ "patrons": [ "@atomicpoet@vancity.social", "@shoq@newsroom.social", - "@pikadude@erisly.social" + "@pikadude@erisly.social", + "@sage@stop.voring.me" ] } From 3eb9ed5ad08772a53e278c2247cfba7bc111e836 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Sat, 19 Nov 2022 00:14:15 -0800 Subject: [PATCH 10/40] tag myself --- packages/client/src/pages/about-calckey.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/pages/about-calckey.vue b/packages/client/src/pages/about-calckey.vue index 4124e795d..44a661ce0 100644 --- a/packages/client/src/pages/about-calckey.vue +++ b/packages/client/src/pages/about-calckey.vue @@ -34,7 +34,7 @@
- ThatOneCalculator (fork developer) + Syuilo (Misskey developer) Henki (error images artist)
From e06bbd36006fb056d146a8358d292892af20d75e Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Sat, 19 Nov 2022 00:52:41 -0800 Subject: [PATCH 11/40] perf: :zap: load icons css last --- packages/backend/src/server/web/views/base.pug | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug index 547fc34a8..ad6572488 100644 --- a/packages/backend/src/server/web/views/base.pug +++ b/packages/backend/src/server/web/views/base.pug @@ -38,7 +38,6 @@ html link(rel='prefetch' href=`/static-assets/badges/info.png?${ timestamp }`) link(rel='prefetch' href=`/static-assets/badges/not-found.png?${ timestamp }`) link(rel='prefetch' href=`/static-assets/badges/error.png?${ timestamp }`) - link(rel='stylesheet' href='/assets/phosphor/icons.css') link(rel='stylesheet' href=`/static-assets/instance.css?${ timestamp }`) link(rel='modulepreload' href=`/assets/${clientEntry.file}`) @@ -48,6 +47,8 @@ html each href in clientEntry.css link(rel='preload' href=`/assets/${href}` as='style') + link(rel='stylesheet' href='/assets/phosphor/icons.css') + title block title = title || 'Calckey' From 736345481098765ca5d3adb4c2c0c5c3f6af763e Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Sat, 19 Nov 2022 01:15:35 -0800 Subject: [PATCH 12/40] test api docs --- packages/backend/src/server/api/endpoints/patrons.ts | 1 + packages/backend/src/server/api/openapi/gen-spec.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/backend/src/server/api/endpoints/patrons.ts b/packages/backend/src/server/api/endpoints/patrons.ts index fd865cc81..9eb0e01b7 100644 --- a/packages/backend/src/server/api/endpoints/patrons.ts +++ b/packages/backend/src/server/api/endpoints/patrons.ts @@ -2,6 +2,7 @@ import define from '../define.js'; export const meta = { tags: ['meta'], + summary: 'Get list of Calckey patrons from Codeberg', requireCredential: false, requireCredentialPrivateMode: false, diff --git a/packages/backend/src/server/api/openapi/gen-spec.ts b/packages/backend/src/server/api/openapi/gen-spec.ts index 00769d100..18473d79b 100644 --- a/packages/backend/src/server/api/openapi/gen-spec.ts +++ b/packages/backend/src/server/api/openapi/gen-spec.ts @@ -9,7 +9,7 @@ export function genOpenapiSpec() { info: { version: 'v1', - title: 'Misskey API', + title: 'Calckey API', 'x-logo': { url: '/static-assets/api-doc.png' }, }, From 804e5ac3e71bd5a03bb6818a02202bdf02e80edc Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Sat, 19 Nov 2022 01:15:49 -0800 Subject: [PATCH 13/40] .5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c37277e1c..55ec2d747 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.15.4", + "version": "12.119.0-calc.15.5", "codename": "aqua", "repository": { "type": "git", From b80d709517c68bd2fa5e718cf34c209cde260262 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Sat, 19 Nov 2022 01:17:31 -0800 Subject: [PATCH 14/40] cl --- CALCKEY.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CALCKEY.md b/CALCKEY.md index fef8002be..3b6afb177 100644 --- a/CALCKEY.md +++ b/CALCKEY.md @@ -20,7 +20,7 @@ ## Work in progress - Better Messaging UI -- Make your password hasn't been pwned +- Better API Documentation - Remote follow button - Admin custom CSS - Add back time machine (jump to date) From bd8581b25a4b5c8b95195139aec8bf7844cdeb2f Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Sat, 19 Nov 2022 01:20:31 -0800 Subject: [PATCH 15/40] description, not summary --- packages/backend/src/server/api/endpoints/patrons.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend/src/server/api/endpoints/patrons.ts b/packages/backend/src/server/api/endpoints/patrons.ts index 9eb0e01b7..de6632fb9 100644 --- a/packages/backend/src/server/api/endpoints/patrons.ts +++ b/packages/backend/src/server/api/endpoints/patrons.ts @@ -2,7 +2,7 @@ import define from '../define.js'; export const meta = { tags: ['meta'], - summary: 'Get list of Calckey patrons from Codeberg', + description: 'Get list of Calckey patrons from Codeberg', requireCredential: false, requireCredentialPrivateMode: false, From 9876a0987035ce056ffacc751674ca95370b5f0f Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Sun, 20 Nov 2022 13:16:06 -0800 Subject: [PATCH 16/40] style --- .../client/src/pages/messaging/messaging-room.message.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/client/src/pages/messaging/messaging-room.message.vue b/packages/client/src/pages/messaging/messaging-room.message.vue index 2ecfc0aad..9e2af5046 100644 --- a/packages/client/src/pages/messaging/messaging-room.message.vue +++ b/packages/client/src/pages/messaging/messaging-room.message.vue @@ -90,7 +90,7 @@ function del(): void { min-height: 38px; border-radius: 16px; max-width: 100%; - margin-left: 10rem; + margin-left: 4%; & + * { clear: both; @@ -215,8 +215,8 @@ function del(): void { > .balloon { $color: var(--X4); - margin-right: 10rem; - margin-left: 0rem !important; + margin-right: 4%; + margin-left: 0%; background: $color; &.noText { From 35a141963928a0847f03d939406ef7da852c6af8 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Mon, 21 Nov 2022 14:55:41 -0800 Subject: [PATCH 17/40] page style --- package.json | 2 +- packages/client/src/pages/page.vue | 58 +++++++++++++++++++++++------- 2 files changed, 46 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 55ec2d747..396758003 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.15.5", + "version": "12.119.0-calc.16", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/pages/page.vue b/packages/client/src/pages/page.vue index 913009010..818c89a4e 100644 --- a/packages/client/src/pages/page.vue +++ b/packages/client/src/pages/page.vue @@ -4,14 +4,25 @@
-
- +
@@ -34,18 +45,14 @@
-
+
@@ -191,12 +198,37 @@ definePageMetadata(computed(() => page ? { > .banner { margin: 0rem !important; - > img { + > .banner-image { // TODO: ่‰ฏใ„ๆ„Ÿใ˜ใฎใ‚ขใ‚นใƒšใ‚ฏใƒˆๆฏ”ใง่กจ็คบ display: block; width: 100%; height: 150px; object-fit: cover; + + > .menu-actions { + position: absolute; + top: 12px; + right: 12px; + -webkit-backdrop-filter: var(--blur, blur(8px)); + backdrop-filter: var(--blur, blur(8px)); + background: rgba(0, 0, 0, 0.2); + padding: 8px; + border-radius: 24px; + + > .menu { + vertical-align: bottom; + height: 31px; + width: 31px; + color: #fff; + text-shadow: 0 0 8px #000; + font-size: 16px; + } + + > .koudoku { + margin-left: 4px; + vertical-align: bottom; + } + } } } From 23e443281f6ec05f3db2619aac32f3fe249c3d4c Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Mon, 21 Nov 2022 15:03:35 -0800 Subject: [PATCH 18/40] fixes --- package.json | 2 +- packages/client/src/pages/page.vue | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 396758003..94d2533ba 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.16", + "version": "12.119.0-calc.16.1", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/pages/page.vue b/packages/client/src/pages/page.vue index 818c89a4e..bfcece542 100644 --- a/packages/client/src/pages/page.vue +++ b/packages/client/src/pages/page.vue @@ -187,14 +187,6 @@ definePageMetadata(computed(() => page ? { margin: 1rem; } - > .header { - padding: 16px; - - > h1 { - margin: 0; - } - } - > .banner { margin: 0rem !important; @@ -203,12 +195,20 @@ definePageMetadata(computed(() => page ? { display: block; width: 100%; height: 150px; - object-fit: cover; + background-position: center; + background-size: cover; + + > .header { + padding: 16px; + + > h1 { + margin: 0; + color: white; + text-shadow: 0 0 8px #000; + } + } > .menu-actions { - position: absolute; - top: 12px; - right: 12px; -webkit-backdrop-filter: var(--blur, blur(8px)); backdrop-filter: var(--blur, blur(8px)); background: rgba(0, 0, 0, 0.2); From fc5c147902a201848eb231611861cced5b0ded0b Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Mon, 21 Nov 2022 15:04:57 -0800 Subject: [PATCH 19/40] icon --- packages/client/src/pages/page.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/client/src/pages/page.vue b/packages/client/src/pages/page.vue index bfcece542..eebfd4e50 100644 --- a/packages/client/src/pages/page.vue +++ b/packages/client/src/pages/page.vue @@ -15,11 +15,11 @@

{{ page.title }}

- {{ i18n.ts._pages.viewSource }} +
From 34b4744b384847a95efef466204f928c216ab760 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Mon, 21 Nov 2022 15:10:00 -0800 Subject: [PATCH 20/40] more fixes --- package.json | 2 +- packages/client/src/pages/page.vue | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 94d2533ba..5e220ebda 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.16.1", + "version": "12.119.0-calc.16.2", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/pages/page.vue b/packages/client/src/pages/page.vue index eebfd4e50..49a68fc8e 100644 --- a/packages/client/src/pages/page.vue +++ b/packages/client/src/pages/page.vue @@ -17,9 +17,9 @@
@@ -214,6 +214,9 @@ definePageMetadata(computed(() => page ? { background: rgba(0, 0, 0, 0.2); padding: 8px; border-radius: 24px; + width: fit-content; + top: -10px; + left: 1rem; > .menu { vertical-align: bottom; From 6f3e66df186dbfa0bbcf9a184e3bec95a85a0d7c Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Mon, 21 Nov 2022 15:11:57 -0800 Subject: [PATCH 21/40] tooltips --- packages/client/src/pages/page.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/client/src/pages/page.vue b/packages/client/src/pages/page.vue index 49a68fc8e..4cafc1164 100644 --- a/packages/client/src/pages/page.vue +++ b/packages/client/src/pages/page.vue @@ -17,9 +17,9 @@
From a073bd48adecc5ba08969bbd62d6dc4ae18d0854 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Mon, 21 Nov 2022 15:26:18 -0800 Subject: [PATCH 22/40] more style fixes --- package.json | 2 +- packages/client/src/pages/page.vue | 85 +++++++++++++++--------------- 2 files changed, 44 insertions(+), 43 deletions(-) diff --git a/package.json b/package.json index 5e220ebda..b0d28a689 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.16.2", + "version": "12.119.0-calc.16.3", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/pages/page.vue b/packages/client/src/pages/page.vue index 4cafc1164..7b3ee27f7 100644 --- a/packages/client/src/pages/page.vue +++ b/packages/client/src/pages/page.vue @@ -10,18 +10,17 @@