fix: style buttons consistently; adds dashboard in navbar

open-craft · May 6, 2024 · d8725d7 · d8725d7
1 parent 23d615e
commit d8725d7
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/src/components/course/SubsidyRequestButton.jsx b/src/components/course/SubsidyRequestButton.jsx
@@ -18,7 +18,7 @@ const props = {
     requested: 'Awaiting approval',
   },
   disabledStates: ['requested'],
-  variant: 'primary',
+  variant: 'outline-primary',
   className: 'mb-4 mt-1',
 };
 
@@ -114,7 +114,9 @@ const SubsidyRequestButton = () => {
   };
 
   return (
-    <StatefulButton {...props} state={getButtonState()} onClick={handleRequestButtonClick} />
+    <div>
+      <StatefulButton {...props} state={getButtonState()} onClick={handleRequestButtonClick} />
+    </div>
   );
 };
 

diff --git a/src/components/dashboard/main-content/DashboardMainContent.jsx b/src/components/dashboard/main-content/DashboardMainContent.jsx
@@ -37,7 +37,7 @@ const DashboardMainContent = ({ canOnlyViewHighlightSets }) => {
           <img src={CourseSearchIcon} alt="Search Courses Icon" />
           <h4 className="h3 my-5">Enroll in Learning Paths or Courses</h4>
           <p>
-            <Button as={Link} to={`/${slug}/search`} variant="primary">Explore Now</Button>
+            <Button as={Link} to={`/${slug}/search`} variant="outline-primary">Explore Now</Button>
           </p>
         </div>
       </CourseEnrollments>

diff --git a/src/components/site-header/SiteHeaderNavMenu.jsx b/src/components/site-header/SiteHeaderNavMenu.jsx
@@ -11,9 +11,14 @@ const SiteHeaderNavMenu = () => {
   }
 
   return (
-    <NavLink to={`/${enterpriseConfig.slug}/search`} className={mainMenuLinkClassName} exact>
-      Course Finder
-    </NavLink>
+    <>
+      <NavLink to={`/${enterpriseConfig.slug}`} className={mainMenuLinkClassName} exact>
+        Dashboard
+      </NavLink>
+      <NavLink to={`/${enterpriseConfig.slug}/search`} className={mainMenuLinkClassName} exact>
+        Course Finder
+      </NavLink>
+    </>
   );
 };
 

diff --git a/src/components/site-header/styles/_Header.scss b/src/components/site-header/styles/_Header.scss
@@ -53,6 +53,11 @@ $header-logo-height-mobile: 1.5rem;
   background: $white;
   .nav-link {
     text-decoration: none;
+    border-radius: $border-radius;
+    &:hover {
+      background-color: $primary;
+      color: $white;
+    }
   }
   .logo,
   .vertical-divider {