Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ui): adjust spacing in AppLayout toolbar and logo alignment #4195

Merged
merged 1 commit into from
Oct 3, 2024
Merged

fix(ui): adjust spacing in AppLayout toolbar and logo alignment #4195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 10 additions & 11 deletions ui/src/layouts/AppLayout.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,21 @@
class="bg-v-theme-surface"
data-test="navigation-drawer"
>
<v-app-bar-title data-test="app-bar-title">
<v-toolbar class="bg-v-theme-surface" data-test="drawer-toolbar">
<v-spacer />
<router-link
to="/"
class="text-decoration-none"
>
<div class="d-flex justify-center pa-4 pb-2">
<v-img
class="d-sm-flex hidden-sm-and-down"
:src="Logo"
max-width="140"
alt="Shell logo, a cloud with the writing 'ShellHub' on the right side"
data-test="logo"
/>
</div>
<v-img
:src="Logo"
min-width="140"
alt="Shell logo, a cloud with the writing 'ShellHub' on the right side"
data-test="logo"
/>
</router-link>
</v-app-bar-title>
<v-spacer />
</v-toolbar>

<div class="pa-2" v-if="hasNamespaces">
<Namespace data-test="namespace-component" />
Expand Down
2 changes: 1 addition & 1 deletion ui/tests/layouts/AppLayout.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ describe("App Layout Component", () => {

it("Renders internal components", () => {
expect(wrapper.find('[data-test="navigation-drawer"]').exists()).toBe(true);
expect(wrapper.find('[data-test="app-bar-title"]').exists()).toBe(true);
expect(wrapper.find('[data-test="drawer-toolbar"]').exists()).toBe(true);
expect(wrapper.find('[data-test="logo"]').exists()).toBe(true);
expect(wrapper.find('[data-test="list"]').exists()).toBe(true);
expect(wrapper.find('[data-test="list-item"]').exists()).toBe(true);
Expand Down
36 changes: 21 additions & 15 deletions ui/tests/layouts/__snapshots__/AppLayout.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,31 @@ exports[`App Layout Component > Renders the component 1`] = `
<!---->
<!---->
<div class=\\"v-navigation-drawer__content\\">
<div data-v-e7291ef4=\\"\\" class=\\"v-toolbar-title v-app-bar-title\\" data-test=\\"app-bar-title\\">
<div class=\\"v-toolbar-title__placeholder\\">
<!----><a data-v-e7291ef4=\\"\\" href=\\"/\\" class=\\"text-decoration-none\\">
<div data-v-e7291ef4=\\"\\" class=\\"d-flex justify-center pa-4 pb-2\\">
<div data-v-e7291ef4=\\"\\" class=\\"v-responsive v-img v-img--booting d-sm-flex hidden-sm-and-down\\" style=\\"max-width: 140px;\\" aria-label=\\"Shell logo, a cloud with the writing 'ShellHub' on the right side\\" role=\\"img\\" data-test=\\"logo\\">
<div class=\\"v-responsive__sizer\\"></div>
<transition-stub name=\\"fade-transition\\" appear=\\"true\\" persisted=\\"false\\" css=\\"true\\"><img class=\\"v-img__img v-img__img--contain\\" src=\\"/src/assets/logo-inverted.png\\" alt=\\"Shell logo, a cloud with the writing 'ShellHub' on the right side\\" style=\\"display: none;\\"></transition-stub>
<transition-stub name=\\"fade-transition\\" appear=\\"false\\" persisted=\\"false\\" css=\\"true\\">
<!---->
</transition-stub>
<!---->
<!---->
<!---->
<header data-v-e7291ef4=\\"\\" class=\\"v-toolbar v-toolbar--density-default v-theme--dark v-locale--is-ltr bg-v-theme-surface\\" data-test=\\"drawer-toolbar\\">
<!---->
<div class=\\"v-toolbar__content\\" style=\\"height: 64px;\\">
<!---->
<!---->
<div data-v-e7291ef4=\\"\\" class=\\"v-spacer\\"></div><a data-v-e7291ef4=\\"\\" href=\\"/\\" class=\\"text-decoration-none\\">
<div data-v-e7291ef4=\\"\\" class=\\"v-responsive v-img v-img--booting\\" style=\\"min-width: 140px;\\" aria-label=\\"Shell logo, a cloud with the writing 'ShellHub' on the right side\\" role=\\"img\\" data-test=\\"logo\\">
<div class=\\"v-responsive__sizer\\"></div>
<transition-stub name=\\"fade-transition\\" appear=\\"true\\" persisted=\\"false\\" css=\\"true\\"><img class=\\"v-img__img v-img__img--contain\\" src=\\"/src/assets/logo-inverted.png\\" alt=\\"Shell logo, a cloud with the writing 'ShellHub' on the right side\\" style=\\"display: none;\\"></transition-stub>
<transition-stub name=\\"fade-transition\\" appear=\\"false\\" persisted=\\"false\\" css=\\"true\\">
<!---->
</div>
</transition-stub>
<!---->
<!---->
<!---->
<!---->
</div>
</a>
<div data-v-e7291ef4=\\"\\" class=\\"v-spacer\\"></div>
<!---->
</div>
</div>
<transition-stub name=\\"expand-transition\\" appear=\\"false\\" persisted=\\"false\\" css=\\"true\\">
<!---->
</transition-stub>
</header>
<!--v-if-->
<div data-v-e7291ef4=\\"\\" class=\\"v-list v-theme--dark bg-transparent v-list--density-compact v-list--one-line bg-v-theme-surface\\" tabindex=\\"0\\" role=\\"listbox\\" data-test=\\"list\\"><a data-v-e7291ef4=\\"\\" class=\\"v-list-item v-list-item--link v-theme--dark v-list-item--density-compact v-list-item--two-line rounded-0 v-list-item--variant-text mb-2\\" href=\\"/\\" tabindex=\\"-2\\" data-test=\\"list-item\\"><span class=\\"v-list-item__overlay\\"></span><span class=\\"v-list-item__underlay\\"></span>
<div class=\\"v-list-item__prepend\\"><i data-v-e7291ef4=\\"\\" class=\\"mdi-home mdi v-icon notranslate v-theme--dark v-icon--size-default\\" aria-hidden=\\"true\\" data-test=\\"icon\\"></i>
Expand Down
Loading