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

chore: Update bottom border style for application header #29334

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+8 −8
Open

chore: Update bottom border style for application header #29334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f25788
chore: Update style for header, update snapshots
gambinish Dec 18, 2024
0571e79
fix: Add trailing comma
gambinish Dec 19, 2024
5b94e57
Merge branch 'main' into refactor/27313-refresh-app-header
gambinish Dec 19, 2024
9a6cbac
fix: Update e2e
gambinish Dec 19, 2024
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
4 changes: 2 additions & 2 deletions test/e2e/snaps/test-snap-notification.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ describe('Test Snap Notification', function () {

// try to click on the account menu icon (via xpath)
await driver.clickElement(
'[data-testid="account-options-menu-button"]',
'[data-testid="notifications-tag-counter__unread-dot"]',
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was complaining because the dot was obscuring the button

);

// try to click on the notification item (via xpath)
// // try to click on the notification item (via xpath)
await driver.waitForSelector({
text: 'Notifications 1',
css: '.menu-item',
Expand Down
4 changes: 2 additions & 2 deletions ui/components/multichain/app-header/__snapshots__/app-header.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`App Header locked state matches snapshot: locked 1`] = `
<div>
<div
class="mm-box multichain-app-header multichain-app-header-shadow mm-box--margin-bottom-4 mm-box--display-flex mm-box--align-items-center mm-box--width-full mm-box--background-color-background-default"
class="mm-box multichain-app-header multichain-app-header-border mm-box--margin-bottom-4 mm-box--display-flex mm-box--align-items-center mm-box--width-full mm-box--background-color-background-default"
>
<div
class="mm-box multichain-app-header__lock-contents mm-box--padding-2 mm-box--display-flex mm-box--gap-2 mm-box--justify-content-space-between mm-box--align-items-center mm-box--width-full mm-box--background-color-background-default"
Expand Down Expand Up @@ -431,7 +431,7 @@ exports[`App Header unlocked state matches snapshot: unlocked 1`] = `
class="mm-box multichain-app-header mm-box--margin-bottom-4 mm-box--display-flex mm-box--align-items-center mm-box--width-full mm-box--background-color-background-alternative"
>
<div
class="mm-box multichain-app-header__contents multichain-app-header-shadow mm-box--padding-2 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--gap-2 mm-box--align-items-center mm-box--width-full mm-box--background-color-background-default"
class="mm-box multichain-app-header__contents multichain-app-header-border mm-box--padding-2 mm-box--padding-right-4 mm-box--padding-left-4 mm-box--gap-2 mm-box--align-items-center mm-box--width-full mm-box--background-color-background-default"
>
<div>
<button
Expand Down
2 changes: 1 addition & 1 deletion ui/components/multichain/app-header/app-header-container.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const AppHeaderContainer = ({
<Box
display={Display.Flex}
className={classnames('multichain-app-header', {
'multichain-app-header-shadow': !isUnlocked || popupStatus,
'multichain-app-header-border': !isUnlocked || popupStatus,
})}
marginBottom={headerBottomMargin}
alignItems={AlignItems.center}
Expand Down
2 changes: 1 addition & 1 deletion ui/components/multichain/app-header/app-header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ export const AppHeader = ({ location }) => {
? 'multichain-app-header__contents'
: 'multichain-app-header__lock-contents',
{
'multichain-app-header-shadow': isUnlocked && !popupStatus,
'multichain-app-header-border': isUnlocked && !popupStatus,
},
)}
{...(isUnlocked ? unlockedStyling : lockStyling)}
Expand Down
4 changes: 2 additions & 2 deletions ui/components/multichain/app-header/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@
}
}

.multichain-app-header-shadow {
box-shadow: var(--shadow-size-md) var(--color-shadow-default);
.multichain-app-header-border {
border-bottom: 1px solid var(--color-border-muted);
gambinish marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm really confused by this change, we use box-shadow for other headers too, e.g. the Snaps confirmation headers. If anything this will make that feel more disconnected. I thought we were trying to use the box-shadow look everywhere?

Perhaps @eriknson can chime in

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here is the issue for reference, I'm open to adding this elsewhere if we need to: #27313

}

.multichain-app-header-logo {
Expand Down
Loading