diff --git a/addons/rose/app/styles/rose/components/header/_dropdown.scss b/addons/rose/app/styles/rose/components/header/_dropdown.scss index e9377d2ee..931955817 100644 --- a/addons/rose/app/styles/rose/components/header/_dropdown.scss +++ b/addons/rose/app/styles/rose/components/header/_dropdown.scss @@ -3,35 +3,11 @@ * SPDX-License-Identifier: BUSL-1.1 */ -@use '../../variables/sizing'; -@use '../../utilities/type'; -@use '../../variables/color/sass'; - -$chevron: "data:image/svg+xml;utf-8,"; - .rose-header { - .rose-dropdown { - &, - &[open] { - .rose-dropdown-trigger { - color: #{sass.color(ui-gray, 300)}; - background: url($chevron) no-repeat right sizing.rems(s) center; - background-size: sizing.rems(m); - - $y-padding: sizing.rems(xxxs); - $right-padding: sizing.rems(xs) + sizing.rems(l); - - padding: $y-padding $right-padding $y-padding sizing.rems(s); - - &.has-icon-only { - padding-left: sizing.rems(xs); - } - - &:hover, - &:focus { - background-color: transparent; - } - } - } + // Temporary fix: This header component will be retired upon integrating HDS side nav for desktop. + .header-dropdown-button-override > button { + background: var(--black); + border: none; + color: var(--white); } } diff --git a/e2e-tests/desktop/tests/authentication.spec.js b/e2e-tests/desktop/tests/authentication.spec.js index dac13f915..24c573967 100644 --- a/e2e-tests/desktop/tests/authentication.spec.js +++ b/e2e-tests/desktop/tests/authentication.spec.js @@ -21,15 +21,14 @@ test.describe('user/password authentication tests', () => { /.*\/scopes\/global\/projects\/targets$/, ); + // click dropdown await electronPage - .locator('details') - .filter({ hasText: 'Sign Out' }) + .getByRole('button', { name: 'admin' }) .click(); await electronPage.getByRole('button', { name: 'Sign Out' }).click(); await expect(electronPage).toHaveURL(/.*\/scopes\/global\/authenticate\//); }); - test('Fails to authenticate with wrong password', async ({ electronPage, clusterUrl, diff --git a/ui/desktop/app/styles/app.scss b/ui/desktop/app/styles/app.scss index 0d18788f4..3a1698ae8 100644 --- a/ui/desktop/app/styles/app.scss +++ b/ui/desktop/app/styles/app.scss @@ -109,7 +109,8 @@ .rose-header-utilities button { -webkit-app-region: no-drag; } - + + &.header-cushion { padding-left: sizing.rems(l) * 3; } diff --git a/ui/desktop/app/templates/application.hbs b/ui/desktop/app/templates/application.hbs index d5d525362..29b525a90 100644 --- a/ui/desktop/app/templates/application.hbs +++ b/ui/desktop/app/templates/application.hbs @@ -19,7 +19,7 @@
- + {{#if this.showWindowActions}} - + + {{#if this.session.data.authenticated.username}} + + {{else}} + + {{/if}} + {{t 'actions.deauthenticate'}} - - + + {{/if}} diff --git a/ui/desktop/app/templates/scopes/scope.hbs b/ui/desktop/app/templates/scopes/scope.hbs index b2a570455..fbfb7f32b 100644 --- a/ui/desktop/app/templates/scopes/scope.hbs +++ b/ui/desktop/app/templates/scopes/scope.hbs @@ -7,7 +7,11 @@ {{#if this.session.isAuthenticated}} - +