Merge branch 'master' into feature/upgradecsv

Samfundet · Jan 2, 2025 · 08e2e89 · 08e2e89
2 parents c44fc92 + 39fda68
commit 08e2e89
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/frontend/src/Components/Navbar/Navbar.tsx b/frontend/src/Components/Navbar/Navbar.tsx
@@ -56,6 +56,8 @@ export function Navbar() {
     });
   }, []);
 
+  const showActiveRecruitments = activeRecruitments !== undefined && activeRecruitments?.length > 0;
+
   // Return profile button for navbar if logged in.
   const mobileProfileButton = (
     <div className={styles.navbar_profile_button}>
@@ -133,7 +135,7 @@ export function Navbar() {
         expandedDropdown={expandedDropdown}
         route={ROUTES.frontend.recruitment}
         label={t(KEY.common_volunteer)}
-        labelClassName={activeRecruitments && styles.active_recruitment}
+        labelClassName={showActiveRecruitments ? styles.active_recruitment : ''}
       />
     </div>
   );

diff --git a/frontend/src/Components/Table/Table.module.scss b/frontend/src/Components/Table/Table.module.scss
@@ -96,16 +96,13 @@ th {
 
 .sortable_th {
   cursor: pointer;
+  position: relative;
   transition: 0.2s;
 }
 
 .sort_icons {
-  display: flex;
-  flex-direction: row;
-  justify-content: center;
-  align-items: center;
-  float: right;
-
+  position: absolute;
+  right: 0;
   .icon {
     background-color: transparent;
     padding: 2px;