diff --git a/apps/admin-web/public/logos/icon-color.svg b/apps/admin-web/public/logos/icon-color.svg new file mode 100644 index 0000000..b6cebf8 --- /dev/null +++ b/apps/admin-web/public/logos/icon-color.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/apps/admin-web/public/logos/icon-white.svg b/apps/admin-web/public/logos/icon-white.svg new file mode 100644 index 0000000..bbf6a90 --- /dev/null +++ b/apps/admin-web/public/logos/icon-white.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/apps/admin-web/public/logos/icon-with-title.svg b/apps/admin-web/public/logos/icon-with-title.svg new file mode 100644 index 0000000..fd84798 --- /dev/null +++ b/apps/admin-web/public/logos/icon-with-title.svg @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/apps/admin-web/src/layouts/AppShell.vue b/apps/admin-web/src/layouts/AppShell.vue index 26b46f8..030e6f5 100644 --- a/apps/admin-web/src/layouts/AppShell.vue +++ b/apps/admin-web/src/layouts/AppShell.vue @@ -522,9 +522,19 @@ onBeforeUnmount(() => { class="admin-sider" :class="{ 'admin-sider--collapsed': siderCollapsed }" > -
- {{ t('app.name') }} - +
+ +
{ :closable="false" :body-style="{ padding: 0 }" > -
- {{ t('app.name') }} +
+
@@ -921,40 +936,52 @@ onBeforeUnmount(() => { } .admin-brand { - height: 40px; - background: #f0f8ff; - border: 1px solid #bae0ff; - margin: 16px; - border-radius: 6px; + height: 38px; + margin: 14px 24px 18px; + padding: 0; display: flex; align-items: center; justify-content: center; - color: #1677ff; - font-weight: 800; - font-size: 16px; - letter-spacing: 0.05em; - white-space: nowrap; + overflow: hidden; transition: margin 0.2s ease, width 0.2s ease; } -.admin-brand__short { +.admin-brand__logo { + display: block; + max-width: 100%; + max-height: 100%; + object-fit: contain; +} + +.admin-brand__logo--full { + width: 128px; + height: 38px; +} + +.admin-brand__logo--icon { display: none; - letter-spacing: 0; + width: 34px; + height: 34px; } .admin-sider--collapsed .admin-brand { width: 40px; - margin-inline: auto; + margin: 14px auto 18px; + justify-content: center; } -.admin-sider--collapsed .admin-brand__full { +.admin-sider--collapsed .admin-brand__logo--full { display: none; } -.admin-sider--collapsed .admin-brand__short { - display: inline; +.admin-sider--collapsed .admin-brand__logo--icon { + display: block; +} + +.admin-brand--drawer { + margin: 16px 20px; } .admin-menu { diff --git a/apps/admin-web/src/views/LoginView.vue b/apps/admin-web/src/views/LoginView.vue index a980ad7..f925267 100644 --- a/apps/admin-web/src/views/LoginView.vue +++ b/apps/admin-web/src/views/LoginView.vue @@ -7,8 +7,7 @@ }" >
-
- {{ t('app.name') }} +
-
- {{ t('app.name') }} +

{{ t('auth.welcomeBack') }}

@@ -88,7 +86,7 @@