Skip to content
This repository has been archived by the owner on Jan 31, 2024. It is now read-only.

Quick-and-dirty corner roundness toggle #124

Merged
merged 9 commits into from
Nov 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions locales/en-US.yml
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,7 @@ createAccount: "Create account"
existingAccount: "Existing account"
regenerate: "Regenerate"
fontSize: "Font size"
cornerRadius: "Corner roundness"
mediaListWithOneImageAppearance: "Height of media lists with one image only"
limitTo: "Limit to {x}"
noFollowRequests: "You don't have any pending follow requests"
Expand Down
1 change: 1 addition & 0 deletions locales/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,7 @@ export interface Locale {
"existingAccount": string;
"regenerate": string;
"fontSize": string;
"cornerRadius": string;
"mediaListWithOneImageAppearance": string;
"limitTo": string;
"noFollowRequests": string;
Expand Down
1 change: 1 addition & 0 deletions locales/ja-JP.yml
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,7 @@ createAccount: "アカウントを作成"
existingAccount: "既存のアカウント"
regenerate: "再生成"
fontSize: "フォントサイズ"
cornerRadius: "コーナーの丸み"
mediaListWithOneImageAppearance: "画像が1枚のみのメディアリストの高さ"
limitTo: "{x}を上限に"
noFollowRequests: "フォロー申請はありません"
Expand Down
9 changes: 7 additions & 2 deletions packages/backend/src/server/web/boot.js
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,11 @@
document.documentElement.classList.add('f-' + fontSize);
}

const cornerRadius = localStorage.getItem('cornerRadius');
if (cornerRadius) {
document.documentElement.classList.add(`radius-${cornerRadius}`);
}

const useSystemFont = localStorage.getItem('useSystemFont');
if (useSystemFont) {
document.documentElement.classList.add('useSystemFont');
Expand Down Expand Up @@ -228,7 +233,7 @@
}

button {
border-radius: 4px;
border-radius: 999px;
padding: 0px 12px 0px 12px;
border: none;
cursor: pointer;
Expand Down Expand Up @@ -296,7 +301,7 @@
margin-bottom: 2rem;
padding: 0.5rem 1rem;
width: 40rem;
border-radius: 5px;
border-radius: 10px;
justify-content: center;
margin: auto;
}
Expand Down
4 changes: 2 additions & 2 deletions packages/backend/src/server/web/error.css
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ html {
}

button {
border-radius: 4px;
border-radius: 999px;
padding: 0px 12px 0px 12px;
border: none;
cursor: pointer;
Expand Down Expand Up @@ -93,7 +93,7 @@ code {
background: #333;
padding: 0.5rem 1rem;
max-width: 40rem;
border-radius: 5px;
border-radius: 10px;
justify-content: center;
margin: auto;
white-space: pre-wrap;
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/components/MkAbuseReport.vue
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ function resolve() {
box-sizing: border-box;
align-items: center;
padding: 14px;
border-radius: 5px;
border-radius: var(--radius-sm);
--c: rgb(255 196 0 / 15%);
background-image: linear-gradient(45deg, var(--c) 16.67%, transparent 16.67%, transparent 50%, var(--c) 50%, var(--c) 66.67%, transparent 66.67%, transparent 100%);
background-size: 16px 16px;
Expand Down
4 changes: 2 additions & 2 deletions packages/frontend/src/components/MkAchievements.vue
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ onMounted(() => {
width: 58px;
height: 58px;
padding: 6px;
border-radius: 100%;
border-radius: var(--radius-full);
box-sizing: border-box;
pointer-events: none;
user-select: none;
Expand Down Expand Up @@ -190,7 +190,7 @@ onMounted(() => {
position: relative;
width: 100%;
height: 100%;
border-radius: 100%;
border-radius: var(--radius-full);
box-shadow: 0 1px 0px #ffffff88 inset;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/components/MkAsUi.vue
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,6 @@ function openPostForm() {

.postForm {
background: var(--bg);
border-radius: 5px;
border-radius: var(--radius-sm);
}
</style>
2 changes: 1 addition & 1 deletion packages/frontend/src/components/MkAutocomplete.vue
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ onBeforeUnmount(() => {
max-width: 28px;
max-height: 28px;
margin: 0 8px 0 0;
border-radius: 100%;
border-radius: var(--radius-full);
}

.userName {
Expand Down
8 changes: 4 additions & 4 deletions packages/frontend/src/components/MkButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ function onMousedown(evt: MouseEvent): void {
box-shadow: none;
text-decoration: none;
background: var(--buttonBg);
border-radius: 5px;
border-radius: var(--radius-xs);
overflow: clip;
box-sizing: border-box;
transition: background 0.1s ease;
Expand Down Expand Up @@ -154,7 +154,7 @@ function onMousedown(evt: MouseEvent): void {
}

&.rounded {
border-radius: 4px;
border-radius: var(--radius-ellipse);
}

&.primary {
Expand Down Expand Up @@ -264,7 +264,7 @@ function onMousedown(evt: MouseEvent): void {
left: 0;
width: 100%;
height: 100%;
border-radius: 5px;
border-radius: var(--radius-sm);
overflow: clip;
pointer-events: none;
}
Expand All @@ -273,7 +273,7 @@ function onMousedown(evt: MouseEvent): void {
position: absolute;
width: 2px;
height: 2px;
border-radius: 100%;
border-radius: var(--radius-full);
background: rgba(0, 0, 0, 0.1);
opacity: 1;
transform: scale(1);
Expand Down
4 changes: 2 additions & 2 deletions packages/frontend/src/components/MkChannelFollowButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ async function onClick() {
padding: 0;
height: 31px;
font-size: 16px;
border-radius: 5px;
border-radius: var(--radius-xl);
background: #fff;

&.full {
Expand All @@ -95,7 +95,7 @@ async function onClick() {
bottom: -5px;
left: -5px;
border: 2px solid var(--focus);
border-radius: 5px;
border-radius: var(--radius-xl);
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/frontend/src/components/MkChannelPreview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ const bannerStyle = computed(() => {
padding: 8px 12px;
font-size: 80%;
background: rgba(0, 0, 0, 0.7);
border-radius: 5px;
border-radius: var(--radius-sm);
color: #fff;
}

Expand All @@ -111,7 +111,7 @@ const bannerStyle = computed(() => {
left: 16px;
background: rgba(0, 0, 0, 0.7);
color: var(--warn);
border-radius: 5px;
border-radius: var(--radius-sm);
font-weight: bold;
font-size: 1em;
padding: 4px 7px;
Expand Down
4 changes: 2 additions & 2 deletions packages/frontend/src/components/MkChartLegend.vue
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ defineExpose({
font-size: 85%;
padding: 4px 12px 4px 8px;
border: solid 1px var(--divider);
border-radius: 4px;
border-radius: var(--radius-ellipse);

&:hover {
border-color: var(--inputBorderHover);
Expand All @@ -70,7 +70,7 @@ defineExpose({
display: inline-block;
width: 12px;
height: 12px;
border-radius: 100%;
border-radius: var(--radius-full);
vertical-align: -10%;
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/components/MkCode.core.vue
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ watch(() => props.lang, (to) => {
& :deep(.shiki) {
padding: 12px;
margin: 0;
border-radius: 6px;
border-radius: var(--radius-sm);
min-height: 130px;
pointer-events: none;
min-width: calc(100% - 24px);
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/components/MkCodeEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ watch(v, () => {

.focused.codeEditorRoot {
border-color: var(--accent) !important;
border-radius: 6px;
border-radius: var(--radius-sm);
}

.codeEditorScroller {
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/components/MkColorInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ const onInput = (ev: KeyboardEvent) => {
color: var(--fg);
background: var(--panel);
border: solid 1px var(--panel);
border-radius: 5px;
border-radius: var(--radius-sm);
outline: none;
box-shadow: none;
box-sizing: border-box;
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/components/MkContainer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ onUnmounted(() => {
background: var(--panel);
padding: 6px 10px;
font-size: 0.8em;
border-radius: 4px;
border-radius: var(--radius-ellipse);
box-shadow: 0 2px 6px rgb(0 0 0 / 20%);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/components/MkDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ onBeforeUnmount(() => {
box-sizing: border-box;
text-align: center;
background: var(--panel);
border-radius: 4px;
border-radius: var(--radius-md);
}

.icon {
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/components/MkDrive.file.vue
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ function onDragend() {
position: relative;
padding: 8px 0 0 0;
min-height: 180px;
border-radius: 5px;
border-radius: var(--radius-sm);
cursor: pointer;

&:hover {
Expand Down
4 changes: 2 additions & 2 deletions packages/frontend/src/components/MkDrive.folder.vue
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ function onContextmenu(ev: MouseEvent) {
padding: 8px;
height: 64px;
background: var(--driveFolderBg);
border-radius: 4px;
border-radius: var(--radius-xs);
cursor: pointer;

&.draghover {
Expand All @@ -302,7 +302,7 @@ function onContextmenu(ev: MouseEvent) {
bottom: -4px;
left: -4px;
border: 2px dashed var(--focus);
border-radius: 4px;
border-radius: var(--radius-xs);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/components/MkDriveFileThumbnail.vue
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const isThumbnailAvailable = computed(() => {
position: relative;
display: flex;
background: var(--panel);
border-radius: 5px;
border-radius: var(--radius-sm);
overflow: clip;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/components/MkEmojiPicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ defineExpose({
width: var(--eachSize);
height: var(--eachSize);
contain: strict;
border-radius: 4px;
border-radius: var(--radius-xs);
font-size: 24px;

&:focus-visible {
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/components/MkEmojiPickerDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ function opening() {

<style lang="scss" module>
.drawer {
border-radius: 24px;
border-radius: var(--radius-lg);
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/components/MkFileListForAdmin.vue
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ const props = defineProps<{
padding: 2px 4px;
background: #ff0000bf;
color: #fff;
border-radius: 4px;
border-radius: var(--radius-xs);
font-size: 85%;
animation: sensitive-blink 1s infinite;
}
Expand Down
6 changes: 3 additions & 3 deletions packages/frontend/src/components/MkFolder.vue
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ onMounted(() => {
background: var(--buttonBg);
-webkit-backdrop-filter: var(--blur, blur(15px));
backdrop-filter: var(--blur, blur(15px));
border-radius: 5px;
border-radius: var(--radius-sm);
transition: border-radius 0.3s;

&:hover {
Expand All @@ -153,7 +153,7 @@ onMounted(() => {
}

&.opened {
border-radius: 6px 6px 0 0;
border-radius: var(--radius-sm) var(--radius-sm) 0 0;
}
}

Expand Down Expand Up @@ -207,7 +207,7 @@ onMounted(() => {

.body {
background: var(--panel);
border-radius: 0 0 6px 6px;
border-radius: 0 0 var(--radius-sm) var(--radius-sm);
container-type: inline-size;

&.bgSame {
Expand Down
4 changes: 2 additions & 2 deletions packages/frontend/src/components/MkFollowButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ onBeforeUnmount(() => {
padding: 0;
height: 31px;
font-size: 16px;
border-radius: 5px;
border-radius: var(--radius-xl);
background: #fff;

&.full {
Expand Down Expand Up @@ -179,7 +179,7 @@ onBeforeUnmount(() => {
bottom: -5px;
left: -5px;
border: 2px solid var(--focus);
border-radius: 5px;
border-radius: var(--radius-xl);
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/frontend/src/components/MkGoogle.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const search = () => {
height: 40px;
font-size: 16px;
border: solid 1px var(--divider);
border-radius: 4px 0 0 4px;
border-radius: var(--radius-xs) 0 0 var(--radius-xs);
-webkit-appearance: textfield;
}

Expand All @@ -50,7 +50,7 @@ const search = () => {
padding: 0 16px;
border: solid 1px var(--divider);
border-left: none;
border-radius: 0 4px 4px 0;
border-radius: 0 var(--radius-xs) var(--radius-xs) 0;

&:active {
box-shadow: 0 2px 4px rgba(#000, 0.15) inset;
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/components/MkInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ defineExpose({
color: var(--fg);
background: var(--panel);
border: solid 1px var(--panel);
border-radius: 5px;
border-radius: var(--radius-sm);
outline: none;
box-shadow: none;
box-sizing: border-box;
Expand Down
Loading
Loading