Merge branch 'release/0.8.7'

cuweb · Mar 12, 2024 · 8c99197 · 8c99197
2 parents 5ce0da0 + c821491
commit 8c99197
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/CHANGELOG.mdx b/CHANGELOG.mdx
@@ -16,9 +16,16 @@ Prefix the change with one of these keywords:
 
 ## [Unreleased]
 
+## [0.8.7]
+
+### Fixed
+
+- Changed styling on icon listing loader component
+- Changed nav aside to not refresh page on click of avatar
+
 ## [0.8.6]
 
-### Add
+### Added
 
 - Listing loader for pages
 - Card initials

diff --git a/lib/components/Loaders/ListingLoader/ListingIconLoader.tsx b/lib/components/Loaders/ListingLoader/ListingIconLoader.tsx
@@ -5,11 +5,9 @@ export const ListingIconLoader = () => {
     <Listing>
       <Listing.Body>
         <div className="animate-pulse">
-          <div className="flex flex-wrap gap-5">
-            <div className="flex-none w-20 pb-4">
-              <span className="block w-20 h-20 rounded-md bg-cu-black-100"></span>
-            </div>
-            <div className="grid flex-auto w-64 gap-3">
+          <div className="flex flex-wrap">
+            <div className="grid flex-auto gap-3">
+              <span className="block w-10 h-10 my-3 rounded-md bg-cu-black-100"></span>
               <span className="block w-64 h-8 rounded-md bg-cu-black-100"></span>
               <span className="block w-11/12 h-4 mt-2 rounded-md bg-cu-black-100"></span>
               <span className="block w-8/12 h-4 mb-2 rounded-md bg-cu-black-100"></span>

diff --git a/lib/components/Nav/Nav.Styles.ts b/lib/components/Nav/Nav.Styles.ts
@@ -6,7 +6,7 @@ export const NavMenuItemWrapperStyles = {
 export const navMenuItemStyles = {
   navItemWrapper: `flex items-stretch justify-between`,
   navItem: `flex w-auto grow items-center gap-0.5 text-[15px] font-medium text-cu-black-700 hover:text-cu-red-700 transition ease-in`,
-  navParentItem: `cu-nav__parent-item items-between after:w-1.5 after:h-1.5 after:grow-0 after:shrink-0 after:basis-[6px]`,
+  navParentItem: `cu-nav__parent-item items-between cursor-pointer after:w-1.5 after:h-1.5 after:grow-0 after:shrink-0 after:basis-[6px]`,
   navArrow: `after:content-[''] hover:after:border-current after:ml-1 after:mt-px after:border-t after:border-t-cu-black-700 after:border-l after:border-l-cu-black-700 after:rotate-[135deg] after:transition after:ease-in after:duration-300`,
   navParentArrow: `after:w-1.5 after:h-1.5`,
   subMenuItem: `px-5 py-3.5 hover:bg-cu-black-50/50`,

diff --git a/lib/components/Nav/NavAside.tsx b/lib/components/Nav/NavAside.tsx
@@ -90,9 +90,9 @@ export const NavAside = ({
                     <Avatar user={userNoImage} size="xs" rounded="full" />
                   </a>
                 ) : (
-                  <LinkComponent href="/" className={navMenuItemStyles.navParentItem}>
+                  <div className={navMenuItemStyles.navParentItem}>
                     <Avatar user={userNoImage} size="xs" rounded="full" />
-                  </LinkComponent>
+                  </div>
                 )}
               </span>
               <NavSubMenu submenu={LoggedMenu} isSubMenu={true} isInnerSubMenu={false} id="profile" />

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@carletonuniversity/rds",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "private": false,
   "description": "Raven Design System is Carleton University's design system",
   "author": "Web Services",