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

Jump to bottom

Remove duplicate settings button #5161

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −13
Open

Remove duplicate settings button #5161

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
6 changes: 5 additions & 1 deletion app/routes/users/components/UserProfile/UserProfile.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,13 @@

.settingsIcon {
transition: transform var(--easing-medium);
}

.settingsButton {
&:hover {
transform: rotate(90deg);
.settingsIcon {
transform: rotate(90deg);
}
}
}

Expand Down
23 changes: 11 additions & 12 deletions app/routes/users/components/UserProfile/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,12 +157,17 @@ const UserProfile = () => {
title={user.fullName}
actionButtons={
showSettings && (
<Icon
iconNode={<SettingsIcon />}
size={22}
className={styles.settingsIcon}
to={`/users/${user.username}/settings/profile`}
/>
<LinkButton
className={styles.settingsButton}
href={`/users/${user.username}/settings/profile`}
>
<Icon
iconNode={<SettingsIcon />}
size={22}
Copy link
Member

Choose a reason for hiding this comment

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

22 is a bit large when it is inside a button - perhaps we could do something like 19 (like we do for most other buttons with icons)

className={styles.settingsIcon}
/>{' '}
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
/>{' '}
/>

Innstillinger
</LinkButton>
)
}
>
Expand Down Expand Up @@ -195,12 +200,6 @@ const UserProfile = () => {
</Modal>
</DialogTrigger>
)}
{showSettings && (
<LinkButton href={`/users/${user.username}/settings/profile`}>
<Icon iconNode={<SettingsIcon />} size={19} />
Innstillinger
</LinkButton>
)}
</Flex>
<Flex
alignItems="center"
Expand Down
Loading