diff --git a/src/app.css b/src/app.css index ed934950..cea60488 100644 --- a/src/app.css +++ b/src/app.css @@ -1,72 +1,11 @@ -@import 'animate.css/animate.min.css'; -@import 'noty/lib/noty.css'; -@import 'remixicon/fonts/remixicon.css'; -@import 'vue-sonner/style.css'; -@import 'vue-json-pretty/lib/styles.css'; - -@import './styles/flags.css'; -@import './styles/animated-emoji.css'; -@import './styles/fonts.css'; -@import './styles/noty.css'; - -:root { - --font-western: - 'ellipsis-font', -apple-system, 'Inter', 'Segoe UI', 'Roboto', 'Ubuntu', - 'Cantarell', 'DejaVu Sans', sans-serif; - --font-symbol: 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; - --font-fallback-cjk: sans-serif; - --font-primary-cjk: - 'Noto Sans JP Variable', 'Noto Sans SC Variable', - 'Noto Sans KR Variable', 'Noto Sans TC Variable'; -} -:root[lang='zh-CN'] { - --font-primary-cjk: - 'Noto Sans SC Variable', 'Noto Sans JP Variable', - 'Noto Sans KR Variable', 'Noto Sans TC Variable'; -} -:root[lang='ja'] { - --font-primary-cjk: - 'Noto Sans JP Variable', 'Noto Sans KR Variable', - 'Noto Sans TC Variable', 'Noto Sans SC Variable'; -} -:root[lang='ko'] { - --font-primary-cjk: - 'Noto Sans KR Variable', 'Noto Sans JP Variable', - 'Noto Sans TC Variable', 'Noto Sans SC Variable'; -} -:root[lang='zh-TW'] { - --font-primary-cjk: - 'Noto Sans TC Variable', 'Noto Sans JP Variable', - 'Noto Sans KR Variable', 'Noto Sans SC Variable'; -} - - html { overflow: hidden; } -body { - font-family: - var(--font-western), var(--font-symbol), var(--font-primary-cjk), - var(--font-fallback-cjk); - - margin: 0; -} - - .lucide.is-loading { animation: rotating 2s linear infinite; } - - - -.x-ellipsis { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} - .x-app { display: flex; width: 100vw; @@ -84,95 +23,6 @@ body { height: 100%; } -.x-login-container { - position: absolute; - display: flex; - align-items: center; - justify-content: center; - width: 100%; - height: 100%; -} - -.x-login { - display: grid; - grid-template-rows: repeat(2, auto); - align-items: center; - max-width: clamp(600px, 60svw, 800px); -} - -.x-login-form-container { - display: grid; - gap: 8px; - height: 380px; -} - -.x-login-form-container:has(> div:nth-child(3)) { - grid-template-columns: 1fr 1px 1fr; -} - -.x-login-form-container > div { - display: flex; - flex-direction: column; - min-height: 0; - padding: 16px; - overflow-y: auto; -} - -.x-scroll-wrapper { - width: 100%; - height: 100%; - overflow-y: auto; -} - -hr.x-vertical-divider { - height: 100%; - width: 100%; - margin: 0; - border: 0; -} - -.x-saved-account-list { - display: grid; - - > .x-friend-item { - width: 100%; - } -} - -.x-legal-notice-container { - margin-top: 8px; -} - -.x-menu-container { - flex: none; - overflow: hidden auto; -} - -.notify::after { - position: absolute; - top: 45%; - left: 8px; - width: 4px; - height: 4px; - content: ''; - border-radius: 50%; -} - -.pending-update { - height: 56px; - width: 64px; - cursor: pointer; -} - -.x-aside-container { - display: flex; - flex: none; - flex-direction: column; - padding: 13px 5px 5px 5px; - order: 99; - height: 100%; - box-sizing: border-box; -} .x-friend-list { padding: 0 10px; @@ -183,10 +33,6 @@ hr.x-vertical-divider { transition: transform 0.3s; } -.x-aside-container > .x-friend-list { - flex: 1; -} - .x-dialog .x-friend-list { display: flex; flex-wrap: wrap; @@ -339,32 +185,15 @@ img.friends-list-avatar { line-height: 16px; } -.x-friend-item > .detail > .extra, -.extra { +.x-friend-item > .detail > .extra { font-size: 12px; - & > span > span:first-child { - scale: 0.9; - margin-right: 2px; - } } -.x-friend-item > .vrcplus-icon { - border-radius: 20px; - width: 200px; - height: 200px; - cursor: pointer; +.x-friend-item > .detail > .extra > span > span:first-child { + scale: 0.9; + margin-right: 2px; } -.x-friend-item > .current-vrcplus-icon { - cursor: default; -} - -.x-friend-item > .vrcplus-icon > img { - width: 100%; - height: 100%; - border-radius: 15px; - object-fit: cover; -} .x-friend-item:hover { border-radius: 8px; @@ -381,31 +210,10 @@ img.friends-list-avatar { border-bottom-left-radius: 25px; } -.x-aside-container > .x-friend-list > .x-friend-item:hover { -} - .x-dialog .x-friend-item { width: 167px; } -.x-user-badge-hidden { - filter: grayscale(1); -} - -.x-user-badge:hover { - filter: none; -} - -.x-change-image-item { - display: inline-block; - padding: 4px 4px 0 4px; -} - -.x-change-image-item:hover { - border-radius: 2px; -} - - i.x-user-status, i.x-status-icon { @@ -470,7 +278,6 @@ i.x-status-icon.red { border-color: var(--color-amber-400) !important; } - .x-tag-age-verification { color: #3b82f6; border-color: #3b82f6 !important; @@ -483,13 +290,6 @@ i.x-status-icon.red { padding-bottom: 0.5px; } - - -.x-popover-image { - max-width: 100%; - max-height: 100%; -} - .options-container { margin-top: 30px; padding: 0 10px 10px 10px; @@ -522,77 +322,7 @@ i.x-status-icon.red { width: 235px; } -.toggle-switch { - display: inline-block; -} - -.toggle-list { - font-size: 15px; -} - -.toggle-list .toggle-item { - margin-bottom: 5px; -} - -.toggle-list .toggle-name { - display: inline-block; - min-width: 190px; - padding-right: 10px; - text-align: right; -} - -.color-picker { - font-size: 18px; - vertical-align: top; -} - -.avatar-info { - cursor: pointer; - width: fit-content; - vertical-align: top; -} - - - -.photon-event-table { - margin-top: 20px; -} - -.current-instance-table img.friends-list-avatar { - width: unset; - height: 16px; - margin-right: 0; - margin-left: 1px; - margin-top: 4px; - border-radius: 2px; - margin-bottom: -1px; -} - -.dialog-title { - font-weight: bold; -} - -.vrc-instance-queue-message { - padding: 3px; - top: 0 !important; -} - - - .x-app > .x-container { padding-top: 15px; } -.x-text-removed { - text-decoration: line-through; - - padding: 2px 2px; - border-radius: 4px; -} - -.x-text-added { - padding: 2px 2px; - border-radius: 4px; -} - - diff --git a/src/components/AvatarInfo.vue b/src/components/AvatarInfo.vue index d78a9b3b..83606660 100644 --- a/src/components/AvatarInfo.vue +++ b/src/components/AvatarInfo.vue @@ -1,5 +1,5 @@ diff --git a/src/components/dialogs/GroupDialog/GroupDialog.vue b/src/components/dialogs/GroupDialog/GroupDialog.vue index 5019f695..36854c0f 100644 --- a/src/components/dialogs/GroupDialog/GroupDialog.vue +++ b/src/components/dialogs/GroupDialog/GroupDialog.vue @@ -22,7 +22,7 @@
👑 @@ -1133,7 +1133,7 @@ class="p-0 overflow-hidden transition-shadow hover:shadow-md"> diff --git a/src/components/dialogs/GroupDialog/GroupMemberModerationDialog.vue b/src/components/dialogs/GroupDialog/GroupMemberModerationDialog.vue index 0df5cfdc..70d535a9 100644 --- a/src/components/dialogs/GroupDialog/GroupMemberModerationDialog.vue +++ b/src/components/dialogs/GroupDialog/GroupMemberModerationDialog.vue @@ -444,7 +444,7 @@ {{ t('dialog.group_member_moderation.notes') }} 0 && image.versions[image.versions.length - 1].file.url " - class="x-popover-image" + class="max-w-full max-h-full" style="padding: 8px">
diff --git a/src/components/dialogs/UserDialog/EditNoteAndMemoDialog.vue b/src/components/dialogs/UserDialog/EditNoteAndMemoDialog.vue index d31ba61c..d9165fe0 100644 --- a/src/components/dialogs/UserDialog/EditNoteAndMemoDialog.vue +++ b/src/components/dialogs/UserDialog/EditNoteAndMemoDialog.vue @@ -20,7 +20,7 @@ :maxlength="256" :rows="6" :placeholder="t('dialog.user.info.note_placeholder')" - input-class="extra resize-none" + input-class="text-xs resize-none" class="my-2" show-count /> @@ -28,7 +28,7 @@ {{ t('dialog.user.info.memo') }} diff --git a/src/components/dialogs/UserDialog/UserSummaryHeader.vue b/src/components/dialogs/UserDialog/UserSummaryHeader.vue index 4bcafc69..1c30622a 100644 --- a/src/components/dialogs/UserDialog/UserSummaryHeader.vue +++ b/src/components/dialogs/UserDialog/UserSummaryHeader.vue @@ -44,7 +44,7 @@ @@ -152,8 +152,11 @@ - - + +
diff --git a/src/components/dialogs/WorldDialog/ChangeWorldImageDialog.vue b/src/components/dialogs/WorldDialog/ChangeWorldImageDialog.vue index d7ac5985..21789313 100644 --- a/src/components/dialogs/WorldDialog/ChangeWorldImageDialog.vue +++ b/src/components/dialogs/WorldDialog/ChangeWorldImageDialog.vue @@ -25,7 +25,7 @@ {{ t('dialog.change_content_image.upload') }}
-
+
diff --git a/src/components/dialogs/WorldDialog/WorldDialog.vue b/src/components/dialogs/WorldDialog/WorldDialog.vue index 67207b0d..3682906d 100644 --- a/src/components/dialogs/WorldDialog/WorldDialog.vue +++ b/src/components/dialogs/WorldDialog/WorldDialog.vue @@ -22,7 +22,7 @@
- + > + :class="['x-grey', 'x-tag-border-left', 'text-[#8e8e93]', 'border-[#8e8e93]']"> {{ worldDialog.bundleSizes['ios'].fileSize }} diff --git a/src/styles/globals.css b/src/styles/globals.css index d4c59bbc..6d110470 100644 --- a/src/styles/globals.css +++ b/src/styles/globals.css @@ -1,10 +1,20 @@ @import 'tailwindcss'; @import 'tw-animate-css'; +@import 'animate.css/animate.min.css'; +@import 'noty/lib/noty.css'; +@import 'remixicon/fonts/remixicon.css'; +@import 'vue-sonner/style.css'; +@import 'vue-json-pretty/lib/styles.css'; + +@import './flags.css'; +@import './animated-emoji.css'; +@import './fonts.css'; +@import './noty.css'; + @custom-variant dark (&:is(.dark *)); :root { - --background: oklch(1 0 0); --foreground: oklch(0.145 0 0); --card: oklch(1 0 0); @@ -38,6 +48,38 @@ --sidebar-accent-foreground: oklch(0.205 0 0); --sidebar-border: oklch(0.922 0 0); --sidebar-ring: oklch(0.708 0 0); + --font-western: + 'ellipsis-font', -apple-system, 'Inter', 'Segoe UI', 'Roboto', 'Ubuntu', + 'Cantarell', 'DejaVu Sans', sans-serif; + --font-symbol: 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; + --font-fallback-cjk: sans-serif; + --font-primary-cjk: + 'Noto Sans JP Variable', 'Noto Sans SC Variable', + 'Noto Sans KR Variable', 'Noto Sans TC Variable'; +} + +:root[lang='zh-CN'] { + --font-primary-cjk: + 'Noto Sans SC Variable', 'Noto Sans JP Variable', + 'Noto Sans KR Variable', 'Noto Sans TC Variable'; +} + +:root[lang='ja'] { + --font-primary-cjk: + 'Noto Sans JP Variable', 'Noto Sans KR Variable', + 'Noto Sans TC Variable', 'Noto Sans SC Variable'; +} + +:root[lang='ko'] { + --font-primary-cjk: + 'Noto Sans KR Variable', 'Noto Sans JP Variable', + 'Noto Sans TC Variable', 'Noto Sans SC Variable'; +} + +:root[lang='zh-TW'] { + --font-primary-cjk: + 'Noto Sans TC Variable', 'Noto Sans JP Variable', + 'Noto Sans KR Variable', 'Noto Sans SC Variable'; } .dark { @@ -120,6 +162,10 @@ } body { @apply bg-background text-foreground; + font-family: + var(--font-western), var(--font-symbol), var(--font-primary-cjk), + var(--font-fallback-cjk); + margin: 0; } } diff --git a/src/styles/options.css b/src/styles/options.css new file mode 100644 index 00000000..e69de29b diff --git a/src/views/Charts/components/InstanceActivity.vue b/src/views/Charts/components/InstanceActivity.vue index 84c3467a..aea673ce 100644 --- a/src/views/Charts/components/InstanceActivity.vue +++ b/src/views/Charts/components/InstanceActivity.vue @@ -189,6 +189,7 @@ import InstanceActivityDetail from './InstanceActivityDetail.vue'; + import * as echarts from 'echarts'; const appearanceSettingsStore = useAppearanceSettingsStore(); diff --git a/src/views/Charts/components/MutualFriends.vue b/src/views/Charts/components/MutualFriends.vue index cb2d52c6..85eab2e9 100644 --- a/src/views/Charts/components/MutualFriends.vue +++ b/src/views/Charts/components/MutualFriends.vue @@ -166,6 +166,7 @@ import { database } from '../../../service/database'; import { userRequest } from '../../../api'; + import configRepository from '../../../service/config'; import * as echarts from 'echarts'; diff --git a/src/views/Favorites/FavoritesAvatar.vue b/src/views/Favorites/FavoritesAvatar.vue index de3fbb21..80022c79 100644 --- a/src/views/Favorites/FavoritesAvatar.vue +++ b/src/views/Favorites/FavoritesAvatar.vue @@ -435,7 +435,7 @@
{{ favorite.name }}
- {{ favorite.authorName }} + {{ favorite.authorName }}
diff --git a/src/views/Favorites/FavoritesFriend.vue b/src/views/Favorites/FavoritesFriend.vue index 57dd7c14..2d658f00 100644 --- a/src/views/Favorites/FavoritesFriend.vue +++ b/src/views/Favorites/FavoritesFriend.vue @@ -292,7 +292,7 @@ :traveling="favorite.travelingToLocation" :link="false" /> - {{ favorite.statusDescription }} + {{ favorite.statusDescription }} diff --git a/src/views/Favorites/FavoritesWorld.vue b/src/views/Favorites/FavoritesWorld.vue index 8f5b845d..9a927885 100644 --- a/src/views/Favorites/FavoritesWorld.vue +++ b/src/views/Favorites/FavoritesWorld.vue @@ -370,7 +370,7 @@
{{ favorite.name || favorite.id }} - + {{ favorite.authorName }}