From c3e6b6544b0203b880f714c3a4f415c4e4dfaf55 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Sun, 6 Nov 2022 19:14:55 -0800 Subject: [PATCH] underline effect --- package.json | 2 +- .../client/src/components/MkChatPreview.vue | 9 -------- .../client/src/components/MkEmojiPicker.vue | 2 +- packages/client/src/components/MkNote.vue | 2 +- .../client/src/components/MkNoteDetailed.vue | 2 +- packages/client/src/components/MkPostForm.vue | 2 +- .../src/components/global/MkPageHeader.vue | 1 - packages/client/src/pages/about.vue | 2 +- packages/client/src/pages/admin/emojis.vue | 4 ++-- packages/client/src/pages/admin/index.vue | 2 +- .../pages/messaging/messaging-room.form.vue | 2 +- packages/client/src/pages/settings/index.vue | 2 +- .../client/src/pages/settings/reaction.vue | 2 +- packages/client/src/pages/user/index.vue | 2 +- packages/client/src/style.scss | 22 +++++++++++++++++-- .../src/ui/_common_/navbar-for-mobile.vue | 2 +- packages/client/src/ui/_common_/navbar.vue | 3 +-- packages/client/src/ui/classic.sidebar.vue | 2 +- 18 files changed, 36 insertions(+), 29 deletions(-) diff --git a/package.json b/package.json index 4899cc6219..778d166058 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.8-b.4", + "version": "12.119.0-calc.8-b.5", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/components/MkChatPreview.vue b/packages/client/src/components/MkChatPreview.vue index dec613a73c..4d604e2e86 100644 --- a/packages/client/src/components/MkChatPreview.vue +++ b/packages/client/src/components/MkChatPreview.vue @@ -76,7 +76,6 @@ function isMe(message): boolean { } &:hover { - text-decoration: none !important; .avatar { filter: saturate(200%); } @@ -140,10 +139,6 @@ function isMe(message): boolean { > .body { - &:hover { - text-decoration: none !important; - } - > .text { display: block; margin: 0 0 0 0; @@ -154,10 +149,6 @@ function isMe(message): boolean { font-size: 1.1em; color: var(--faceText); - &:hover { - text-decoration: none !important; - } - .me { opacity: 0.7; } diff --git a/packages/client/src/components/MkEmojiPicker.vue b/packages/client/src/components/MkEmojiPicker.vue index 541c3c363d..0c1764e822 100644 --- a/packages/client/src/components/MkEmojiPicker.vue +++ b/packages/client/src/components/MkEmojiPicker.vue @@ -70,7 +70,7 @@
- +
diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index d4027be9d8..4e8a80a79b 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -79,7 +79,7 @@ - + diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue index 5fd2f0e7fc..068e14f932 100644 --- a/packages/client/src/components/global/MkPageHeader.vue +++ b/packages/client/src/components/global/MkPageHeader.vue @@ -297,7 +297,6 @@ onUnmounted(() => { margin-right: 8px; width: 16px; text-align: center; - transform: translateY(0.1em); } > .title { diff --git a/packages/client/src/pages/about.vue b/packages/client/src/pages/about.vue index fb268f0448..0176037574 100644 --- a/packages/client/src/pages/about.vue +++ b/packages/client/src/pages/about.vue @@ -140,7 +140,7 @@ let theTabs = [{ }, { key: 'emojis', title: i18n.ts.customEmojis, - icon: 'ph-smiley-wink-bold ph-lg', + icon: 'ph-smiley-bold ph-lg', }, { key: 'charts', title: i18n.ts.charts, diff --git a/packages/client/src/pages/admin/emojis.vue b/packages/client/src/pages/admin/emojis.vue index 48c7933cfe..fa50c3e3b9 100644 --- a/packages/client/src/pages/admin/emojis.vue +++ b/packages/client/src/pages/admin/emojis.vue @@ -290,7 +290,7 @@ const headerTabs = $computed(() => [{ definePageMetadata(computed(() => ({ title: i18n.ts.customEmojis, - icon: 'ph-smiley-wink-bold ph-lg', + icon: 'ph-smiley-bold ph-lg', }))); @@ -300,7 +300,7 @@ definePageMetadata(computed(() => ({ .empty { margin: var(--margin); } - + .ldhfsamy { display: grid; grid-template-columns: repeat(auto-fill, minmax(190px, 1fr)); diff --git a/packages/client/src/pages/admin/index.vue b/packages/client/src/pages/admin/index.vue index 6bc6ac4da6..d370019cd0 100644 --- a/packages/client/src/pages/admin/index.vue +++ b/packages/client/src/pages/admin/index.vue @@ -111,7 +111,7 @@ const menuDef = $computed(() => [{ to: '/admin/users', active: currentPage?.route.name === 'users', }, { - icon: 'ph-smiley-wink-bold ph-lg', + icon: 'ph-smiley-bold ph-lg', text: i18n.ts.customEmojis, to: '/admin/emojis', active: currentPage?.route.name === 'emojis', diff --git a/packages/client/src/pages/messaging/messaging-room.form.vue b/packages/client/src/pages/messaging/messaging-room.form.vue index 1969a552ba..17a5f72139 100644 --- a/packages/client/src/pages/messaging/messaging-room.form.vue +++ b/packages/client/src/pages/messaging/messaging-room.form.vue @@ -16,7 +16,7 @@
{{ file.name }}
- + diff --git a/packages/client/src/pages/settings/index.vue b/packages/client/src/pages/settings/index.vue index a4180ebd14..9a03c8f288 100644 --- a/packages/client/src/pages/settings/index.vue +++ b/packages/client/src/pages/settings/index.vue @@ -68,7 +68,7 @@ const menuDef = computed(() => [{ to: '/settings/privacy', active: currentPage?.route.name === 'privacy', }, { - icon: 'ph-smiley-wink-bold ph-lg', + icon: 'ph-smiley-bold ph-lg', text: i18n.ts.reaction, to: '/settings/reaction', active: currentPage?.route.name === 'reaction', diff --git a/packages/client/src/pages/settings/reaction.vue b/packages/client/src/pages/settings/reaction.vue index 8196f47aef..31b400503a 100644 --- a/packages/client/src/pages/settings/reaction.vue +++ b/packages/client/src/pages/settings/reaction.vue @@ -126,7 +126,7 @@ const headerTabs = $computed(() => []); definePageMetadata({ title: i18n.ts.reaction, - icon: 'ph-smiley-wink-bold ph-lg', + icon: 'ph-smiley-bold ph-lg', action: { icon: 'ph-eye-bold ph-lg', handler: preview, diff --git a/packages/client/src/pages/user/index.vue b/packages/client/src/pages/user/index.vue index 585a890218..37b833fd89 100644 --- a/packages/client/src/pages/user/index.vue +++ b/packages/client/src/pages/user/index.vue @@ -103,7 +103,7 @@ const headerTabs = $computed(() => user ? [{ }, ...($i && ($i.id === user.id)) || user.publicReactions ? [{ key: 'reactions', title: i18n.ts.reaction, - icon: 'ph-smiley-wink-bold ph-lg', + icon: 'ph-smiley-bold ph-lg', }] : [], { key: 'clips', title: i18n.ts.clips, diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss index e0edfc9027..37867d2c31 100644 --- a/packages/client/src/style.scss +++ b/packages/client/src/style.scss @@ -97,9 +97,27 @@ a { tap-highlight-color: transparent; -webkit-tap-highlight-color: transparent; - &:hover { - text-decoration: underline; + &::after { + content: ''; + position: absolute; + width: 100%; + transform: scaleX(0); + height: 2px; + bottom: 0; + left: 0; + background-color: var(--link); + transform-origin: bottom right; + transition: transform 0.25s ease-out; } + + &:hover::after { + transform: scaleX(1); + transform-origin: bottom left; + } +} + +i { + transform: translateY(0.1em); } textarea, input { diff --git a/packages/client/src/ui/_common_/navbar-for-mobile.vue b/packages/client/src/ui/_common_/navbar-for-mobile.vue index 7a2bce7461..25a26c2ef6 100644 --- a/packages/client/src/ui/_common_/navbar-for-mobile.vue +++ b/packages/client/src/ui/_common_/navbar-for-mobile.vue @@ -80,7 +80,7 @@ function openInstanceMenu(ev: MouseEvent) { }, { type: 'link', text: i18n.ts.customEmojis, - icon: 'ph-smiley-wink-bold ph-lg', + icon: 'ph-smiley-bold ph-lg', to: '/about#emojis', }, { type: 'link', diff --git a/packages/client/src/ui/_common_/navbar.vue b/packages/client/src/ui/_common_/navbar.vue index db6072a055..4a187c71ad 100644 --- a/packages/client/src/ui/_common_/navbar.vue +++ b/packages/client/src/ui/_common_/navbar.vue @@ -133,7 +133,7 @@ function openInstanceMenu(ev: MouseEvent) { }, { type: 'link', text: i18n.ts.customEmojis, - icon: 'ph-smiley-wink-bold ph-lg', + icon: 'ph-smiley-bold ph-lg', to: '/about#emojis', }, { type: 'link', @@ -244,7 +244,6 @@ function more(ev: MouseEvent) { display: inline-block; width: 55px; aspect-ratio: 1; - transform: translateY(0.2em); } } } diff --git a/packages/client/src/ui/classic.sidebar.vue b/packages/client/src/ui/classic.sidebar.vue index 562ab5a235..92f1ab9425 100644 --- a/packages/client/src/ui/classic.sidebar.vue +++ b/packages/client/src/ui/classic.sidebar.vue @@ -146,7 +146,7 @@ function openInstanceMenu(ev: MouseEvent) { }, { type: 'link', text: i18n.ts.customEmojis, - icon: 'ph-smiley-wink-bold ph-lg', + icon: 'ph-smiley-bold ph-lg', to: '/about#emojis', }, { type: 'link',