diff --git a/frontend/src/assets/scss/dark.module.scss b/frontend/src/assets/scss/dark.module.scss index 599cb3c90a..05eaa133c3 100644 --- a/frontend/src/assets/scss/dark.module.scss +++ b/frontend/src/assets/scss/dark.module.scss @@ -7,7 +7,7 @@ $info-color: #2196f3; $success-color: #4caf50; $warning-color: #ffeb3b; $border-color: #d6dfe9; -$border-opacity: 0.1; +$border-opacity: 0.4; $font-color: #222; $icon-color: #F5F5F5; $icon-background: rgb(61 71 83 / 85%); diff --git a/frontend/src/components/menu/BottomMenu.vue b/frontend/src/components/menu/BottomMenu.vue index e40243062e..b449801740 100644 --- a/frontend/src/components/menu/BottomMenu.vue +++ b/frontend/src/components/menu/BottomMenu.vue @@ -2,12 +2,10 @@
- - - +
@@ -16,8 +14,6 @@ import CreateButtonMobile from '#components/buttons/CreateButtonMobile.vue' import Circle from './CircleElement.vue' -import MessageIndicator from './MessageIndicator.vue' -import NewsIndicator from './NewsIndicator.vue' import UserInfo from './UserInfo.vue' diff --git a/frontend/src/components/menu/MessageIndicator.test.ts b/frontend/src/components/menu/MessageIndicator.test.ts new file mode 100644 index 0000000000..c50b5e3511 --- /dev/null +++ b/frontend/src/components/menu/MessageIndicator.test.ts @@ -0,0 +1,31 @@ +import { mount } from '@vue/test-utils' +import { describe, it, expect, beforeEach, afterEach } from 'vitest' + +import MessageIndicator from './MessageIndicator.vue' + +describe('LogoImage', () => { + const Wrapper = () => { + return mount(MessageIndicator) + } + + let wrapper: ReturnType + + beforeEach(() => { + wrapper = Wrapper() + }) + + afterEach(() => { + wrapper.unmount() + }) + + it('renders', () => { + expect(wrapper.element).toMatchSnapshot() + }) + + it('displays the number of messages', async () => { + await wrapper.setProps({ numberOfMessages: 1 }) + expect(wrapper.text()).toContain('1') + await wrapper.setProps({ numberOfMessages: 5 }) + expect(wrapper.text()).toContain('5') + }) +}) diff --git a/frontend/src/components/menu/NewsIndicator.test.ts b/frontend/src/components/menu/NewsIndicator.test.ts new file mode 100644 index 0000000000..ceca37748c --- /dev/null +++ b/frontend/src/components/menu/NewsIndicator.test.ts @@ -0,0 +1,24 @@ +import { mount } from '@vue/test-utils' +import { describe, it, expect, beforeEach, afterEach } from 'vitest' + +import NewsIndicator from './NewsIndicator.vue' + +describe('LogoImage', () => { + const Wrapper = () => { + return mount(NewsIndicator) + } + + let wrapper: ReturnType + + beforeEach(() => { + wrapper = Wrapper() + }) + + afterEach(() => { + wrapper.unmount() + }) + + it('renders', () => { + expect(wrapper.element).toMatchSnapshot() + }) +}) diff --git a/frontend/src/components/menu/TopMenu.vue b/frontend/src/components/menu/TopMenu.vue index a30bf3ccb6..009b7d0144 100644 --- a/frontend/src/components/menu/TopMenu.vue +++ b/frontend/src/components/menu/TopMenu.vue @@ -3,7 +3,9 @@ - + @@ -17,7 +19,6 @@ - @@ -30,8 +31,7 @@ @@ -42,6 +42,10 @@ import UserInfo from './UserInfo.vue' background: transparent !important; } +.logo { + width: 140px; +} + .top-menu { position: sticky; top: 0; diff --git a/frontend/src/components/menu/UserInfo.vue b/frontend/src/components/menu/UserInfo.vue index 6047afb18e..512a8da232 100644 --- a/frontend/src/components/menu/UserInfo.vue +++ b/frontend/src/components/menu/UserInfo.vue @@ -10,7 +10,7 @@ {{ initals?.toUpperCase() }} -
+
@@ -50,6 +50,9 @@ const userImage = authStore.user?.profile.picture } .avatar { + width: calc(var(--menu-icon-height) - 6px) !important; + height: calc(var(--menu-icon-height) - 6px) !important; + margin: 3px !important; border-color: rgb(var(--v-theme-border) 0.8); } diff --git a/frontend/src/components/menu/__snapshots__/BottomMenu.test.ts.snap b/frontend/src/components/menu/__snapshots__/BottomMenu.test.ts.snap index 861a22836c..acd0e7febf 100644 --- a/frontend/src/components/menu/__snapshots__/BottomMenu.test.ts.snap +++ b/frontend/src/components/menu/__snapshots__/BottomMenu.test.ts.snap @@ -13,80 +13,30 @@ exports[`BottomMenu > renders BottomMenu 1`] = ` data-v-96a196cc="" >
-
- - - -
-
- 3 -
-
-
- -
+ + + +
renders BottomMenu 1`] = `
-
- - - -