summaryrefslogtreecommitdiff
path: root/packages/frontend/src
diff options
context:
space:
mode:
authorShittyKopper <shittykopper@w.on-t.work>2023-12-23 15:20:51 +0300
committerShittyKopper <shittykopper@w.on-t.work>2023-12-26 22:02:48 +0300
commit32318bbbfa1e67913100c3d03a3ee64393831d50 (patch)
tree710343bb281442666a6082fbcd6041e4ef033897 /packages/frontend/src
parentfix: don't show filename as alt text (diff)
downloadsharkey-32318bbbfa1e67913100c3d03a3ee64393831d50.tar.gz
sharkey-32318bbbfa1e67913100c3d03a3ee64393831d50.tar.bz2
sharkey-32318bbbfa1e67913100c3d03a3ee64393831d50.zip
fix: un-hardcode more border radius values
all of these are blind find and replace, no clue if they end up breaking anything
Diffstat (limited to 'packages/frontend/src')
-rw-r--r--packages/frontend/src/components/MkChannelPreview.vue2
-rw-r--r--packages/frontend/src/components/MkCode.core.vue2
-rw-r--r--packages/frontend/src/components/MkCode.vue4
-rw-r--r--packages/frontend/src/components/MkCodeEditor.vue4
-rw-r--r--packages/frontend/src/components/MkEmojiPicker.section.vue4
-rw-r--r--packages/frontend/src/components/MkPostForm.vue2
-rw-r--r--packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts2
-rw-r--r--packages/frontend/src/pages/settings/avatar-decoration.decoration.vue2
-rw-r--r--packages/frontend/src/pages/settings/emoji-picker.vue4
-rw-r--r--packages/frontend/src/pages/user/raw.vue2
10 files changed, 14 insertions, 14 deletions
diff --git a/packages/frontend/src/components/MkChannelPreview.vue b/packages/frontend/src/components/MkChannelPreview.vue
index 96590a469b..f870b0eef1 100644
--- a/packages/frontend/src/components/MkChannelPreview.vue
+++ b/packages/frontend/src/components/MkChannelPreview.vue
@@ -198,7 +198,7 @@ const bannerStyle = computed(() => {
transform: translate(25%, -25%);
background-color: var(--accent);
border: solid var(--bg) 4px;
- border-radius: 100%;
+ border-radius: var(--radius-full);
width: 1.5rem;
height: 1.5rem;
aspect-ratio: 1 / 1;
diff --git a/packages/frontend/src/components/MkCode.core.vue b/packages/frontend/src/components/MkCode.core.vue
index 19418cd4da..579c72b186 100644
--- a/packages/frontend/src/components/MkCode.core.vue
+++ b/packages/frontend/src/components/MkCode.core.vue
@@ -62,7 +62,7 @@ watch(() => props.lang, (to) => {
padding: 1em;
margin: .5em 0;
overflow: auto;
- border-radius: 8px;
+ border-radius: var(--radius-sm);
& pre,
& code {
diff --git a/packages/frontend/src/components/MkCode.vue b/packages/frontend/src/components/MkCode.vue
index 2c016e4d7c..7346d5782b 100644
--- a/packages/frontend/src/components/MkCode.vue
+++ b/packages/frontend/src/components/MkCode.vue
@@ -56,7 +56,7 @@ const XCode = defineAsyncComponent(() => import('@/components/MkCode.core.vue'))
padding: 1em;
margin: .5em 0;
overflow: auto;
- border-radius: 8px;
+ border-radius: var(--radius-sm);
}
.codeBlockFallbackCode {
@@ -74,7 +74,7 @@ const XCode = defineAsyncComponent(() => import('@/components/MkCode.core.vue'))
cursor: pointer;
box-sizing: border-box;
- border-radius: 8px;
+ border-radius: var(--radius-sm);
padding: 24px;
margin-top: 4px;
color: #D4D4D4;
diff --git a/packages/frontend/src/components/MkCodeEditor.vue b/packages/frontend/src/components/MkCodeEditor.vue
index c9bcc71196..c1aaa7f1ff 100644
--- a/packages/frontend/src/components/MkCodeEditor.vue
+++ b/packages/frontend/src/components/MkCodeEditor.vue
@@ -161,7 +161,7 @@ watch(v, newValue => {
overflow-y: hidden;
box-sizing: border-box;
margin: 0;
- border-radius: 6px;
+ border-radius: var(--radius-sm);
padding: 0;
color: var(--fg);
border: solid 1px var(--panel);
@@ -202,7 +202,7 @@ watch(v, newValue => {
caret-color: rgb(225, 228, 232);
background-color: transparent;
border: 0;
- border-radius: 6px;
+ border-radius: var(--radius-sm);
outline: 0;
min-width: calc(100% - 24px);
height: 100%;
diff --git a/packages/frontend/src/components/MkEmojiPicker.section.vue b/packages/frontend/src/components/MkEmojiPicker.section.vue
index 49c146b68d..ea9d7a0d26 100644
--- a/packages/frontend/src/components/MkEmojiPicker.section.vue
+++ b/packages/frontend/src/components/MkEmojiPicker.section.vue
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template>
<!-- このコンポーネントの要素のclassは親から利用されるのでむやみに弄らないこと -->
<!-- フォルダの中にはカスタム絵文字だけ(Unicode絵文字もこっち) -->
-<section v-if="!hasChildSection" v-panel style="border-radius: 6px; border-bottom: 0.5px solid var(--divider);">
+<section v-if="!hasChildSection" v-panel style="border-radius: var(--radius-sm); border-bottom: 0.5px solid var(--divider);">
<header class="_acrylic" @click="shown = !shown">
<i class="toggle ti-fw" :class="shown ? 'ph-caret-down ph-bold ph-lg' : 'ph-caret-up ph-bold ph-lg'"></i> <slot></slot> (<i class="ph-bold ph-lg"></i>:{{ emojis.length }})
</header>
@@ -25,7 +25,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</div>
</section>
<!-- フォルダの中にはカスタム絵文字やフォルダがある -->
-<section v-else v-panel style="border-radius: 6px; border-bottom: 0.5px solid var(--divider);">
+<section v-else v-panel style="border-radius: var(--radius-sm); border-bottom: 0.5px solid var(--divider);">
<header class="_acrylic" @click="shown = !shown">
<i class="toggle ti-fw" :class="shown ? 'ph-caret-down ph-bold ph-lg' : 'ph-caret-up ph-bold ph-lg'"></i> <slot></slot> (<i class="ph-folder ph-bold ph-lg"></i>:{{ customEmojiTree.length }} <i class="ti ti-icons ti-fw"></i>:{{ emojis.length }})
</header>
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index a209128d55..b26ce2932a 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -1059,7 +1059,7 @@ defineExpose({
left: 12px;
width: 5px;
height: 100% ;
- border-radius: 999px;
+ border-radius: var(--radius-ellipse);
pointer-events: none;
}
diff --git a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
index 83b7ef2e78..4c6034c901 100644
--- a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
+++ b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
@@ -277,7 +277,7 @@ export default function(props: MfmProps) {
const child = token.children[0];
const unixtime = parseInt(child.type === 'text' ? child.props.text : '');
return h('span', {
- style: 'display: inline-block; font-size: 90%; border: solid 1px var(--divider); border-radius: 999px; padding: 4px 10px 4px 6px;',
+ style: 'display: inline-block; font-size: 90%; border: solid 1px var(--divider); border-radius: var(--radius-ellipse); padding: 4px 10px 4px 6px;',
}, [
h('i', {
class: 'ph-clock ph-bold ph-lg',
diff --git a/packages/frontend/src/pages/settings/avatar-decoration.decoration.vue b/packages/frontend/src/pages/settings/avatar-decoration.decoration.vue
index 9c95b5547e..fcd74002f2 100644
--- a/packages/frontend/src/pages/settings/avatar-decoration.decoration.vue
+++ b/packages/frontend/src/pages/settings/avatar-decoration.decoration.vue
@@ -42,7 +42,7 @@ const emit = defineEmits<{
cursor: pointer;
padding: 16px 16px 28px 16px;
border: solid 2px var(--divider);
- border-radius: 8px;
+ border-radius: var(--radius-sm);
text-align: center;
font-size: 90%;
overflow: clip;
diff --git a/packages/frontend/src/pages/settings/emoji-picker.vue b/packages/frontend/src/pages/settings/emoji-picker.vue
index 61f3332122..1a07790e75 100644
--- a/packages/frontend/src/pages/settings/emoji-picker.vue
+++ b/packages/frontend/src/pages/settings/emoji-picker.vue
@@ -12,7 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<div class="_gaps">
<div>
- <div v-panel style="border-radius: 6px;">
+ <div v-panel style="border-radius: var(--radius-sm);">
<Sortable
v-model="pinnedEmojisForReaction"
:class="$style.emojis"
@@ -52,7 +52,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<div class="_gaps">
<div>
- <div v-panel style="border-radius: 6px;">
+ <div v-panel style="border-radius: var(--radius-sm);">
<Sortable
v-model="pinnedEmojis"
:class="$style.emojis"
diff --git a/packages/frontend/src/pages/user/raw.vue b/packages/frontend/src/pages/user/raw.vue
index 0c0bfc29ca..ebe40d5860 100644
--- a/packages/frontend/src/pages/user/raw.vue
+++ b/packages/frontend/src/pages/user/raw.vue
@@ -107,7 +107,7 @@ const suspended = computed(() => props.user.isSuspended ?? false);
> .moderator {
display: inline-block;
border: solid 1px;
- border-radius: 6px;
+ border-radius: var(--radius-sm);
padding: 2px 6px;
font-size: 85%;
}