Merge branch 'develop' into release

urfit-tech · Oct 18, 2023 · 6083d41 · 6083d41
2 parents b2eb3e1 + a4f2ae2
commit 6083d41
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/components/package/ProgramPackageCollectionBlock.tsx b/src/components/package/ProgramPackageCollectionBlock.tsx
@@ -225,10 +225,9 @@ const ProgramPackageCollectionBlock: React.VFC<{
         display="flex"
         flexDirection={{ base: 'column', md: 'row' }}
         justifyContent="space-between"
-        alignItems="center"
         marginBottom="24px"
       >
-        <HStack justifyContent="space-between">
+        <HStack justifyContent="space-between" marginBottom={{ base: '20px', md: '0px' }}>
           {(programCounts > 0 || programPackageCounts > 0) && (
             <ProgramTab
               onProgramTabClick={onProgramTabClick}
@@ -258,6 +257,7 @@ const ProgramPackageCollectionBlock: React.VFC<{
           className="member-page-program-search"
           width={{ base: '100%' }}
           display={{ base: 'block', md: 'none' }}
+          backgroundColor="white"
         >
           <Input
             placeholder="搜尋關鍵字"
@@ -323,7 +323,7 @@ const ProgramPackageCollectionBlock: React.VFC<{
         (expiredProgramPackageEnrollment.length > 0 && isExpired)) && (
         <>
           <HStack justifyContent={'space-between'} display={{ base: 'none', md: 'flex' }} marginBottom="32px">
-            <InputGroup className="member-page-program-sort" width="fit-content">
+            <InputGroup className="member-page-program-sort" width="fit-content" backgroundColor="white">
               <InputLeftElement>
                 <BiSort />
               </InputLeftElement>
@@ -338,7 +338,7 @@ const ProgramPackageCollectionBlock: React.VFC<{
                 ))}
               </StyledSelect>
             </InputGroup>
-            <InputGroup className="member-page-program-search" width="fit-content">
+            <InputGroup className="member-page-program-search" width="fit-content" backgroundColor="white">
               <Input
                 placeholder="搜尋關鍵字"
                 onChange={(event: React.ChangeEvent<HTMLInputElement>) => setSearch(event.target.value)}

diff --git a/src/containers/program/EnrolledProgramCollectionBlock.tsx b/src/containers/program/EnrolledProgramCollectionBlock.tsx
@@ -248,10 +248,9 @@ const EnrolledProgramCollectionBlock: React.VFC<{
         display="flex"
         flexDirection={{ base: 'column', md: 'row' }}
         justifyContent="space-between"
-        alignItems="center"
         marginBottom="24px"
       >
-        <HStack justifyContent="space-between">
+        <HStack justifyContent="space-between" marginBottom={{ base: '20px', md: '0px' }}>
           {(programCounts > 0 || programPackageCounts > 0) && (
             <ProgramTab
               onProgramTabClick={onProgramTabClick}
@@ -296,6 +295,7 @@ const EnrolledProgramCollectionBlock: React.VFC<{
           className="member-page-program-search"
           width={{ base: '100%' }}
           display={{ base: 'block', md: 'none' }}
+          backgroundColor="white"
         >
           <Input
             placeholder="搜尋關鍵字"
@@ -360,7 +360,7 @@ const EnrolledProgramCollectionBlock: React.VFC<{
         <>
           <HStack justifyContent={'space-between'} marginBottom="32px" display={{ base: 'none', md: 'flex' }}>
             <HStack spacing="12px">
-              <InputGroup className="member-page-program-sort">
+              <InputGroup className="member-page-program-sort" backgroundColor="white">
                 <InputLeftElement>
                   <BiSort />
                 </InputLeftElement>
@@ -376,7 +376,7 @@ const EnrolledProgramCollectionBlock: React.VFC<{
                 </StyledSelect>
               </InputGroup>
               {!isExpired && (
-                <InputGroup className="member-page-program-filter">
+                <InputGroup className="member-page-program-filter" backgroundColor="white">
                   <InputLeftElement>
                     <RiFilter2Fill />
                   </InputLeftElement>
@@ -393,7 +393,7 @@ const EnrolledProgramCollectionBlock: React.VFC<{
                 </InputGroup>
               )}
             </HStack>
-            <InputGroup className="member-page-program-search" width="fit-content">
+            <InputGroup className="member-page-program-search" width="fit-content" backgroundColor="white">
               <Input
                 placeholder="搜尋關鍵字"
                 value={search}