Remove duplicate settings button

webkom · Nov 6, 2024 · a705278 · a705278
1 parent 01aac3d
commit a705278
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/app/routes/users/components/UserProfile/UserProfile.module.css b/app/routes/users/components/UserProfile/UserProfile.module.css
@@ -77,14 +77,18 @@
   margin-bottom: var(--spacing-lg);
 }
 
-.settingsIcon {
-  transition: transform var(--easing-medium);
-
+.settingsButton {
   &:hover {
-    transform: rotate(90deg);
+    .settingsIcon {
+      transform: rotate(90deg);
+    }
   }
 }
 
+.settingsIcon {
+  transition: transform var(--easing-medium);
+}
+
 .soMeIcon {
   color: var(--lego-font-color);
   margin-right: var(--spacing-sm);

diff --git a/app/routes/users/components/UserProfile/index.tsx b/app/routes/users/components/UserProfile/index.tsx
@@ -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}
+              className={styles.settingsIcon}
+            />{' '}
+            Innstillinger
+          </LinkButton>
         )
       }
     >
@@ -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"