merging and alignment fix

SU-SWS · Aug 21, 2024 · c085eea · c085eea
2 parents 532205d + 64bcb92
commit c085eea
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 87 deletions.
diff --git a/src/components/layout/header.tsx b/src/components/layout/header.tsx
@@ -35,7 +35,7 @@ const Header = async () => {
               <li>
                 <Link
                   href="/support-stanford-libraries"
-                  className="cta-button group rs-mt-neg1 mt-0 block w-fit whitespace-nowrap rounded-full bg-cardinal-red px-16 py-6 text-18 font-normal leading-[1.5] text-white no-underline transition-colors hover:bg-cardinal-red-dark focus:bg-black-true active:bg-black-true hocus:text-white hocus:underline"
+                  className="cta-button group rs-mt-neg1 mt-0 block w-fit whitespace-nowrap rounded-full bg-digital-red px-16 py-6 text-18 font-normal leading-[1.5] text-white no-underline transition-colors hover:bg-cardinal-red-dark focus:bg-black-true active:bg-black-true hocus:text-white hocus:underline"
                 >
                   Donate now
                 </Link>

diff --git a/src/components/menu/main-menu.tsx b/src/components/menu/main-menu.tsx
@@ -72,7 +72,7 @@ const MainMenu = ({menuItems}: {menuItems: MenuItemType[]}) => {
               !isDesktop && !menuOpen ? "hidden" : "block"
             )}
           >
-            <div className="mr-20">Quick links:</div>
+            <div className="mb-10 mr-20 text-left">Quick links:</div>
             <ul className="list-unstyled flex flex-wrap items-center gap-10">
               <li className="m-0">
                 <Link

diff --git a/...omponents/views/sul-branch-locations/filtering-table/branch-locations-filtering-table.tsx b/...omponents/views/sul-branch-locations/filtering-table/branch-locations-filtering-table.tsx
@@ -93,7 +93,7 @@ const BranchLocationFilteringTable = ({items}: Props) => {
         </fieldset>
       </form>
 
-      <Table className="responsive-table responsive-table-branches ml-[-20px] sm:ml-0">
+      <Table className="responsive-table responsive-table-branches sm:ml-0">
         <Thead className="sr-only lg:not-sr-only">
           <Tr className="block sm:hidden lg:!table-row">
             <Th className="type-1 block min-w-[100px] pl-[0px] md:table-cell lg:pr-16" scope="col">
@@ -243,6 +243,7 @@ const BranchHours = ({hoursId}: {hoursId: string}) => {
       <div className="flex w-fit items-center whitespace-nowrap sm:text-center md:text-left lg:mx-auto lg:text-center">
         {isOpen && closingTime && `until ${closingTime}`}
         {!isOpen && nextOpeningTime && `until ${nextOpeningTime}`}
+        {!isOpen && !nextOpeningTime && `Hours this week`}
 
         <button ref={buttonRef} onClick={toggleExpandedHours} aria-controls={id} aria-expanded={expandedHours}>
           <span className="sr-only">Show this weeks hours</span>

diff --git a/src/components/views/sul-study-place/filtering-table/study-place-filtering-table.tsx b/src/components/views/sul-study-place/filtering-table/study-place-filtering-table.tsx
@@ -109,7 +109,7 @@ const StudyPlaceFilteringTable = ({items}: Props) => {
           <legend className="sr-only">Filter places to study</legend>
           <div className="mb-30 flex w-full flex-wrap items-center justify-around gap-10 *:min-w-300 *:flex-1 *:2xl:min-w-0">
             {!!Object.keys(libraryHours).length && (
-              <fieldset className="mr-10 flex h-25 w-full items-center">
+              <fieldset className="mb-10 mr-0 flex h-25 w-full items-center md:mb-0 md:mr-10">
                 <legend className="sr-only">Show only open now or all locations</legend>
                 <label className="group w-1/2 min-w-[134px] cursor-pointer">
                   <input
@@ -119,7 +119,7 @@ const StudyPlaceFilteringTable = ({items}: Props) => {
                     onChange={showOpenAndClosed}
                     checked={!onlyOpenNow}
                   />
-                  <span className="flex items-center whitespace-nowrap rounded-l-full border border-r-0 border-black-80 px-24 py-9 text-18 no-underline group-hover:border-cardinal-red-dark group-hover:text-cardinal-red-dark group-hover:underline peer-checked:bg-[#979694] peer-checked:bg-opacity-20 peer-focus:border-2 peer-focus:border-black-80 peer-focus:bg-[#979694] peer-focus:bg-opacity-10">
+                  <span className="flex items-center justify-center whitespace-nowrap rounded-l-full border border-r-0 border-black-80 px-24 py-9 text-18 no-underline group-hover:border-cardinal-red-dark group-hover:text-cardinal-red-dark group-hover:underline peer-checked:bg-[#979694] peer-checked:bg-opacity-20 peer-focus:border-2 peer-focus:border-black-80 peer-focus:bg-[#979694] peer-focus:bg-opacity-10">
                     All locations
                   </span>
                 </label>
@@ -132,7 +132,7 @@ const StudyPlaceFilteringTable = ({items}: Props) => {
                     onChange={showOnlyOpenNow}
                     checked={onlyOpenNow}
                   />
-                  <span className="flex items-center whitespace-nowrap rounded-r-full border border-black-80 px-22 py-9 text-18 no-underline group-hover:border-cardinal-red-dark group-hover:text-cardinal-red-dark group-hover:underline peer-checked:bg-[#979694] peer-checked:bg-opacity-20 peer-focus:border-2 peer-focus:border-black-80 peer-focus:bg-[#979694] peer-focus:bg-opacity-10">
+                  <span className="flex items-center justify-center whitespace-nowrap rounded-r-full border border-black-80 px-24 py-9 text-18 no-underline group-hover:border-cardinal-red-dark group-hover:text-cardinal-red-dark group-hover:underline peer-checked:bg-[#979694] peer-checked:bg-opacity-20 peer-focus:border-2 peer-focus:border-black-80 peer-focus:bg-[#979694] peer-focus:bg-opacity-10">
                     <ClockIcon
                       title="Hours"
                       width={15}