From 81c63fba8345e55cff08d7a0b37dd452104e788f Mon Sep 17 00:00:00 2001 From: Maximilian Harz Date: Wed, 26 Jun 2024 19:48:00 +0200 Subject: [PATCH 1/7] Turn ellipsis when dropdown is open --- frontend/src/components/menu/UserInfo.vue | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/menu/UserInfo.vue b/frontend/src/components/menu/UserInfo.vue index 6047afb18e..97a7fc8803 100644 --- a/frontend/src/components/menu/UserInfo.vue +++ b/frontend/src/components/menu/UserInfo.vue @@ -1,5 +1,5 @@ m From 734387e137290a510925c170d92a5527eb692a39 Mon Sep 17 00:00:00 2001 From: Maximilian Harz Date: Wed, 26 Jun 2024 20:12:47 +0200 Subject: [PATCH 2/7] Add logout item --- frontend/src/assets/icons/index.ts | 2 ++ frontend/src/assets/icons/logout.svg | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 frontend/src/assets/icons/logout.svg diff --git a/frontend/src/assets/icons/index.ts b/frontend/src/assets/icons/index.ts index 6ce054e21d..ad2dcfd3b5 100644 --- a/frontend/src/assets/icons/index.ts +++ b/frontend/src/assets/icons/index.ts @@ -2,6 +2,7 @@ import Bell from './bell.svg?component' import Camera from './camera.svg?component' import Cockpit from './cockpit.svg?component' import Ellipsis from './ellipsis.svg?component' +import Logout from './logout.svg?component' import Mall from './mall.svg?component' import Message from './message.svg?component' import WorldCafe from './worldCafe.svg?component' @@ -13,6 +14,7 @@ const aliases: Partial = { camera: Camera, cockpit: Cockpit, ellipsis: Ellipsis, + logout: Logout, mall: Mall, message: Message, 'world-cafe': WorldCafe, diff --git a/frontend/src/assets/icons/logout.svg b/frontend/src/assets/icons/logout.svg new file mode 100644 index 0000000000..c6e2b6d625 --- /dev/null +++ b/frontend/src/assets/icons/logout.svg @@ -0,0 +1,3 @@ + + + From 19938e7df33579d6969805022ac9f3e1bd473d10 Mon Sep 17 00:00:00 2001 From: Maximilian Harz Date: Wed, 26 Jun 2024 20:13:14 +0200 Subject: [PATCH 3/7] Adapt UserDropdown to Figma (WIP) --- frontend/src/components/menu/UserDropdown.vue | 38 ++++++++++++------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/frontend/src/components/menu/UserDropdown.vue b/frontend/src/components/menu/UserDropdown.vue index 916d61533e..8e1f1e673a 100644 --- a/frontend/src/components/menu/UserDropdown.vue +++ b/frontend/src/components/menu/UserDropdown.vue @@ -1,23 +1,19 @@ + + From f882101ea63b17f90f3bbd41f0e9a7b52771ea51 Mon Sep 17 00:00:00 2001 From: Maximilian Harz Date: Thu, 27 Jun 2024 18:41:31 +0200 Subject: [PATCH 4/7] Add theme colors for dropdown, adjust spacing and wording --- frontend/renderer/plugins/vuetify.ts | 1 + frontend/src/assets/scss/dark.module.scss | 2 ++ frontend/src/assets/scss/light.module.scss | 2 ++ frontend/src/components/menu/UserDropdown.vue | 27 ++++++++++++------- frontend/src/locales/de.json | 2 +- 5 files changed, 24 insertions(+), 10 deletions(-) diff --git a/frontend/renderer/plugins/vuetify.ts b/frontend/renderer/plugins/vuetify.ts index d248b1e7f9..3e40499981 100644 --- a/frontend/renderer/plugins/vuetify.ts +++ b/frontend/renderer/plugins/vuetify.ts @@ -25,6 +25,7 @@ function makeThemeFromCssModule(theme: CSSModuleClasses, isDark: boolean): Theme error: theme.errorColor, font: theme.fontColor, icon: theme.iconColor, + 'dropdown-background': theme.dropdownBackgroundColor, }, variables: { 'border-color': theme.borderColor, diff --git a/frontend/src/assets/scss/dark.module.scss b/frontend/src/assets/scss/dark.module.scss index 599cb3c90a..88eef30776 100644 --- a/frontend/src/assets/scss/dark.module.scss +++ b/frontend/src/assets/scss/dark.module.scss @@ -13,6 +13,7 @@ $icon-color: #F5F5F5; $icon-background: rgb(61 71 83 / 85%); $bottom-menu-background: rgb(78 91 107 / 60%); $sidebar-background: rgb(61 71 83 / 60%); +$dropdown-background-color: #3D4753; :export { backgroundColor: $background-color; @@ -30,4 +31,5 @@ $sidebar-background: rgb(61 71 83 / 60%); iconBackground: $icon-background; bottomMenuBackground: $bottom-menu-background; sidebarBackground: $sidebar-background; + dropdownBackgroundColor: $dropdown-background-color; } diff --git a/frontend/src/assets/scss/light.module.scss b/frontend/src/assets/scss/light.module.scss index f936a033b3..9097074397 100644 --- a/frontend/src/assets/scss/light.module.scss +++ b/frontend/src/assets/scss/light.module.scss @@ -13,6 +13,7 @@ $icon-color: #3D4753; $icon-background: rgb(255 255 255); $bottom-menu-background: rgb(225 230 237 / 60%); $sidebar-background: rgb(225 230 237); +$dropdown-background-color: #fff; :export { backgroundColor: $background-color; @@ -30,5 +31,6 @@ $sidebar-background: rgb(225 230 237); iconBackground: $icon-background; bottomMenuBackground: $bottom-menu-background; sidebarBackground: $sidebar-background; + dropdownBackgroundColor: $dropdown-background-color; } diff --git a/frontend/src/components/menu/UserDropdown.vue b/frontend/src/components/menu/UserDropdown.vue index 8e1f1e673a..be96173561 100644 --- a/frontend/src/components/menu/UserDropdown.vue +++ b/frontend/src/components/menu/UserDropdown.vue @@ -1,11 +1,11 @@