Merge pull request #130

fix: grantee-item active color for icons/labels
jobstash · Aug 27, 2024 · f07d1ce · f07d1ce
2 parents 3b5c233 + 8fea9be
commit f07d1ce
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 48 deletions.
diff --git a/src/grants/components/ui/grantee-funding-items.tsx b/src/grants/components/ui/grantee-funding-items.tsx
@@ -39,7 +39,11 @@ export const GranteeFundingItems = ({ granteeItem }: Props) => {
   return (
     <DetailItems
       items={fundingItems}
-      classNames={{ container: 'gap-x-4 gap-y-1.5', root: 'text-13' }}
+      classNames={{
+        container: 'gap-x-4 gap-y-1.5',
+        root: 'text-13',
+        label: 'text-current',
+      }}
     />
   );
 };
diff --git a/src/grants/components/ui/icons/caret-right-icon.tsx b/src/grants/components/ui/icons/caret-right-icon.tsx
@@ -5,14 +5,13 @@ export const CaretRightIcon = memo(() => (
     width="32"
     height="33"
     viewBox="0 0 32 33"
-    fill="none"
+    fill="currentColor"
     xmlns="http://www.w3.org/2000/svg"
   >
     <path
       fillRule="evenodd"
       clipRule="evenodd"
       d="M12.2929 10.7929C12.6834 10.4024 13.3166 10.4024 13.7071 10.7929L18.7071 15.7929C19.0976 16.1834 19.0976 16.8166 18.7071 17.2071L13.7071 22.2071C13.3166 22.5976 12.6834 22.5976 12.2929 22.2071C11.9024 21.8166 11.9024 21.1834 12.2929 20.7929L16.5858 16.5L12.2929 12.2071C11.9024 11.8166 11.9024 11.1834 12.2929 10.7929Z"
-      fill="#F9FAFB"
     />
   </svg>
 ));

diff --git a/src/shared/components/icons/bank-icon.tsx b/src/shared/components/icons/bank-icon.tsx
@@ -5,39 +5,20 @@ export const BankIcon = memo(() => (
     width="13"
     height="13"
     viewBox="0 0 13 13"
-    fill="none"
+    fill="currentColor"
     xmlns="http://www.w3.org/2000/svg"
   >
     <path
       fillRule="evenodd"
       clipRule="evenodd"
       d="M6.27289 0.0803518C6.41217 -0.0267839 6.58783 -0.0267839 6.72711 0.0803518L12.3604 4.41369C12.4886 4.51227 12.5667 4.6869 12.5667 4.875C12.5667 5.17415 12.3727 5.41667 12.1333 5.41667H0.866668C0.716188 5.41667 0.576482 5.31908 0.497616 5.15889C0.372187 4.90411 0.435737 4.57047 0.639559 4.41369L6.27289 0.0803518ZM2.39765 4.33333L6.5 1.17768L10.6024 4.33333H2.39765Z"
-      fill="white"
-    />
-    <path
-      d="M2.16667 4.875V10.2917C2.16667 10.5908 2.36068 10.8333 2.6 10.8333C2.83932 10.8333 3.03333 10.5908 3.03333 10.2917V4.875C3.03333 4.57585 2.83932 4.33333 2.6 4.33333C2.36068 4.33333 2.16667 4.57585 2.16667 4.875Z"
-      fill="white"
-    />
-    <path
-      d="M4.76667 4.875V10.2917C4.76667 10.5908 4.96068 10.8333 5.2 10.8333C5.43932 10.8333 5.63333 10.5908 5.63333 10.2917V4.875C5.63333 4.57585 5.43932 4.33333 5.2 4.33333C4.96068 4.33333 4.76667 4.57585 4.76667 4.875Z"
-      fill="white"
-    />
-    <path
-      d="M7.36667 4.875V10.2917C7.36667 10.5908 7.56068 10.8333 7.8 10.8333C8.03932 10.8333 8.23333 10.5908 8.23333 10.2917V4.875C8.23333 4.57585 8.03932 4.33333 7.8 4.33333C7.56068 4.33333 7.36667 4.57585 7.36667 4.875Z"
-      fill="white"
-    />
-    <path
-      d="M9.96667 4.875V10.2917C9.96667 10.5908 10.1607 10.8333 10.4 10.8333C10.6393 10.8333 10.8333 10.5908 10.8333 10.2917V4.875C10.8333 4.57585 10.6393 4.33333 10.4 4.33333C10.1607 4.33333 9.96667 4.57585 9.96667 4.875Z"
-      fill="white"
-    />
-    <path
-      d="M1.3 10.8333H11.7C11.9393 10.8333 12.1333 10.5908 12.1333 10.2917C12.1333 9.99251 11.9393 9.75 11.7 9.75H1.3C1.06068 9.75 0.866667 9.99251 0.866667 10.2917C0.866667 10.5908 1.06068 10.8333 1.3 10.8333Z"
-      fill="white"
-    />
-    <path
-      d="M0.433333 13H12.5667C12.806 13 13 12.7575 13 12.4583C13 12.1592 12.806 11.9167 12.5667 11.9167H0.433333C0.19401 11.9167 0 12.1592 0 12.4583C0 12.7575 0.19401 13 0.433333 13Z"
-      fill="white"
     />
+    <path d="M2.16667 4.875V10.2917C2.16667 10.5908 2.36068 10.8333 2.6 10.8333C2.83932 10.8333 3.03333 10.5908 3.03333 10.2917V4.875C3.03333 4.57585 2.83932 4.33333 2.6 4.33333C2.36068 4.33333 2.16667 4.57585 2.16667 4.875Z" />
+    <path d="M4.76667 4.875V10.2917C4.76667 10.5908 4.96068 10.8333 5.2 10.8333C5.43932 10.8333 5.63333 10.5908 5.63333 10.2917V4.875C5.63333 4.57585 5.43932 4.33333 5.2 4.33333C4.96068 4.33333 4.76667 4.57585 4.76667 4.875Z" />
+    <path d="M7.36667 4.875V10.2917C7.36667 10.5908 7.56068 10.8333 7.8 10.8333C8.03932 10.8333 8.23333 10.5908 8.23333 10.2917V4.875C8.23333 4.57585 8.03932 4.33333 7.8 4.33333C7.56068 4.33333 7.36667 4.57585 7.36667 4.875Z" />
+    <path d="M9.96667 4.875V10.2917C9.96667 10.5908 10.1607 10.8333 10.4 10.8333C10.6393 10.8333 10.8333 10.5908 10.8333 10.2917V4.875C10.8333 4.57585 10.6393 4.33333 10.4 4.33333C10.1607 4.33333 9.96667 4.57585 9.96667 4.875Z" />
+    <path d="M1.3 10.8333H11.7C11.9393 10.8333 12.1333 10.5908 12.1333 10.2917C12.1333 9.99251 11.9393 9.75 11.7 9.75H1.3C1.06068 9.75 0.866667 9.99251 0.866667 10.2917C0.866667 10.5908 1.06068 10.8333 1.3 10.8333Z" />
+    <path d="M0.433333 13H12.5667C12.806 13 13 12.7575 13 12.4583C13 12.1592 12.806 11.9167 12.5667 11.9167H0.433333C0.19401 11.9167 0 12.1592 0 12.4583C0 12.7575 0.19401 13 0.433333 13Z" />
   </svg>
 ));
 

diff --git a/src/shared/components/icons/paperbill-icon.tsx b/src/shared/components/icons/paperbill-icon.tsx
@@ -5,37 +5,23 @@ export const PaperbillIcon = memo(() => (
     width="13"
     height="13"
     viewBox="0 0 13 13"
-    fill="none"
+    fill="currentColor"
     xmlns="http://www.w3.org/2000/svg"
   >
     <path
       fillRule="evenodd"
       clipRule="evenodd"
       d="M0.40625 3.65625C0.40625 3.65625 0.40625 3.3197 0.644226 3.08173C0.644226 3.08173 0.882202 2.84375 1.21875 2.84375H11.7812C11.7812 2.84375 12.1178 2.84375 12.3558 3.08173C12.3558 3.08173 12.5938 3.3197 12.5938 3.65625V9.34375C12.5938 9.34375 12.5938 9.6803 12.3558 9.91827C12.3558 9.91827 12.1178 10.1562 11.7812 10.1562H1.21875C1.21875 10.1562 0.882202 10.1562 0.644225 9.91827C0.644225 9.91827 0.40625 9.6803 0.40625 9.34375V3.65625ZM1.21875 3.65625V9.34375L11.7812 9.34375V3.65625H1.21875Z"
-      fill="white"
     />
     <path
       fillRule="evenodd"
       clipRule="evenodd"
       d="M6.5 4.46875C6.5 4.46875 7.34137 4.46875 7.93631 5.06369C7.93631 5.06369 8.53125 5.65863 8.53125 6.5C8.53125 6.5 8.53125 7.34137 7.93631 7.93631C7.93631 7.93631 7.34137 8.53125 6.5 8.53125C6.5 8.53125 5.65863 8.53125 5.06369 7.93631C5.06369 7.93631 4.46875 7.34137 4.46875 6.5C4.46875 6.5 4.46875 5.65863 5.06369 5.06369C5.06369 5.06369 5.65863 4.46875 6.5 4.46875ZM6.5 5.28125C6.5 5.28125 5.99518 5.28125 5.63821 5.63821C5.63821 5.63821 5.28125 5.99518 5.28125 6.5C5.28125 6.5 5.28125 7.00482 5.63821 7.36179C5.63821 7.36179 5.99518 7.71875 6.5 7.71875C6.5 7.71875 7.00482 7.71875 7.36179 7.36179C7.36179 7.36179 7.71875 7.00482 7.71875 6.5C7.71875 6.5 7.71875 5.99518 7.36179 5.63821C7.36179 5.63821 7.00482 5.28125 6.5 5.28125Z"
-      fill="white"
-    />
-    <path
-      d="M8.66998 3.55573L11.92 6.39948C11.994 6.46428 12.0891 6.5 12.1875 6.5C12.1965 6.5 12.2055 6.4997 12.2145 6.4991C12.322 6.49193 12.4223 6.44235 12.4932 6.36127C12.558 6.28721 12.5938 6.19215 12.5938 6.09375C12.5938 6.08473 12.5935 6.07572 12.5929 6.06673C12.5857 5.95922 12.5361 5.85897 12.455 5.78802L9.20502 2.94427C9.13096 2.87947 9.0359 2.84375 8.9375 2.84375C8.92848 2.84375 8.91947 2.84405 8.91048 2.84465C8.80297 2.85182 8.70272 2.9014 8.63177 2.98248C8.56697 3.05654 8.53125 3.1516 8.53125 3.25C8.53125 3.25902 8.53155 3.26803 8.53215 3.27702C8.53932 3.38453 8.5889 3.48478 8.66998 3.55573Z"
-      fill="white"
-    />
-    <path
-      d="M12.4549 7.21208C12.5431 7.13494 12.5937 7.0234 12.5938 6.90625C12.5938 6.90125 12.5937 6.89626 12.5935 6.89127C12.59 6.79808 12.5546 6.70891 12.4932 6.63873C12.4161 6.55057 12.3046 6.5 12.1875 6.5C12.1825 6.5 12.1775 6.50009 12.1725 6.50028C12.0793 6.50372 11.9902 6.53911 11.92 6.60052L8.66998 9.44427C8.58182 9.52141 8.53125 9.63285 8.53125 9.75C8.53125 9.755 8.53134 9.75999 8.53153 9.76498C8.53497 9.85817 8.57036 9.94734 8.63177 10.0175C8.70891 10.1057 8.82035 10.1562 8.9375 10.1562C8.9425 10.1562 8.94749 10.1562 8.95248 10.156C9.04567 10.1525 9.13484 10.1171 9.20502 10.0557L12.4549 7.21208Z"
-      fill="white"
-    />
-    <path
-      d="M3.79487 2.94436L0.544983 5.78802C0.45682 5.86516 0.40625 5.9766 0.40625 6.09375C0.40625 6.09875 0.406342 6.10374 0.406526 6.10873C0.409966 6.20192 0.44536 6.29109 0.506766 6.36127C0.583908 6.44943 0.695353 6.5 0.8125 6.5C0.817496 6.5 0.822492 6.49991 0.827484 6.49972C0.920672 6.49628 1.00984 6.46089 1.08002 6.39948L4.32991 3.55583C4.41807 3.47869 4.46875 3.36715 4.46875 3.25C4.46875 3.245 4.46866 3.24001 4.46847 3.23502C4.46503 3.14183 4.42964 3.05266 4.36823 2.98248C4.29109 2.89432 4.17965 2.84375 4.0625 2.84375C4.0575 2.84375 4.05251 2.84384 4.04752 2.84403C3.95433 2.84747 3.86505 2.88296 3.79487 2.94436Z"
-      fill="white"
-    />
-    <path
-      d="M4.33002 9.44427L1.08002 6.60052C1.00596 6.53572 0.910903 6.5 0.8125 6.5C0.803485 6.5 0.794472 6.5003 0.785477 6.5009C0.677971 6.50807 0.577716 6.55765 0.506766 6.63873C0.441967 6.71279 0.40625 6.80785 0.40625 6.90625C0.40625 6.91527 0.40655 6.92428 0.40715 6.93327C0.414317 7.04078 0.463897 7.14103 0.544983 7.21198L3.79498 10.0557C3.86904 10.1205 3.9641 10.1562 4.0625 10.1562C4.07152 10.1562 4.08053 10.156 4.08952 10.1554C4.19703 10.1482 4.29728 10.0986 4.36823 10.0175C4.43303 9.94346 4.46875 9.8484 4.46875 9.75C4.46875 9.74098 4.46845 9.73197 4.46785 9.72298C4.46068 9.61547 4.4111 9.51522 4.33002 9.44427Z"
-      fill="white"
     />
+    <path d="M8.66998 3.55573L11.92 6.39948C11.994 6.46428 12.0891 6.5 12.1875 6.5C12.1965 6.5 12.2055 6.4997 12.2145 6.4991C12.322 6.49193 12.4223 6.44235 12.4932 6.36127C12.558 6.28721 12.5938 6.19215 12.5938 6.09375C12.5938 6.08473 12.5935 6.07572 12.5929 6.06673C12.5857 5.95922 12.5361 5.85897 12.455 5.78802L9.20502 2.94427C9.13096 2.87947 9.0359 2.84375 8.9375 2.84375C8.92848 2.84375 8.91947 2.84405 8.91048 2.84465C8.80297 2.85182 8.70272 2.9014 8.63177 2.98248C8.56697 3.05654 8.53125 3.1516 8.53125 3.25C8.53125 3.25902 8.53155 3.26803 8.53215 3.27702C8.53932 3.38453 8.5889 3.48478 8.66998 3.55573Z" />
+    <path d="M12.4549 7.21208C12.5431 7.13494 12.5937 7.0234 12.5938 6.90625C12.5938 6.90125 12.5937 6.89626 12.5935 6.89127C12.59 6.79808 12.5546 6.70891 12.4932 6.63873C12.4161 6.55057 12.3046 6.5 12.1875 6.5C12.1825 6.5 12.1775 6.50009 12.1725 6.50028C12.0793 6.50372 11.9902 6.53911 11.92 6.60052L8.66998 9.44427C8.58182 9.52141 8.53125 9.63285 8.53125 9.75C8.53125 9.755 8.53134 9.75999 8.53153 9.76498C8.53497 9.85817 8.57036 9.94734 8.63177 10.0175C8.70891 10.1057 8.82035 10.1562 8.9375 10.1562C8.9425 10.1562 8.94749 10.1562 8.95248 10.156C9.04567 10.1525 9.13484 10.1171 9.20502 10.0557L12.4549 7.21208Z" />
+    <path d="M3.79487 2.94436L0.544983 5.78802C0.45682 5.86516 0.40625 5.9766 0.40625 6.09375C0.40625 6.09875 0.406342 6.10374 0.406526 6.10873C0.409966 6.20192 0.44536 6.29109 0.506766 6.36127C0.583908 6.44943 0.695353 6.5 0.8125 6.5C0.817496 6.5 0.822492 6.49991 0.827484 6.49972C0.920672 6.49628 1.00984 6.46089 1.08002 6.39948L4.32991 3.55583C4.41807 3.47869 4.46875 3.36715 4.46875 3.25C4.46875 3.245 4.46866 3.24001 4.46847 3.23502C4.46503 3.14183 4.42964 3.05266 4.36823 2.98248C4.29109 2.89432 4.17965 2.84375 4.0625 2.84375C4.0575 2.84375 4.05251 2.84384 4.04752 2.84403C3.95433 2.84747 3.86505 2.88296 3.79487 2.94436Z" />
+    <path d="M4.33002 9.44427L1.08002 6.60052C1.00596 6.53572 0.910903 6.5 0.8125 6.5C0.803485 6.5 0.794472 6.5003 0.785477 6.5009C0.677971 6.50807 0.577716 6.55765 0.506766 6.63873C0.441967 6.71279 0.40625 6.80785 0.40625 6.90625C0.40625 6.91527 0.40655 6.92428 0.40715 6.93327C0.414317 7.04078 0.463897 7.14103 0.544983 7.21198L3.79498 10.0557C3.86904 10.1205 3.9641 10.1562 4.0625 10.1562C4.07152 10.1562 4.08053 10.156 4.08952 10.1554C4.19703 10.1482 4.29728 10.0986 4.36823 10.0175C4.43303 9.94346 4.46875 9.8484 4.46875 9.75C4.46875 9.74098 4.46845 9.73197 4.46785 9.72298C4.46068 9.61547 4.4111 9.51522 4.33002 9.44427Z" />
   </svg>
 ));