Skip to content

Commit a88817a

Browse files
authored
Merge pull request #346 from GTBitsOfGood/gia2/UI-inconsistencies
Gia2/UI inconsistencies
2 parents b7f9758 + cdef46f commit a88817a

8 files changed

Lines changed: 35 additions & 22 deletions

File tree

‎src/app/accountManagement/page.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,10 +449,12 @@ export default function AccountManagementPage() {
449449

450450
return (
451451
<>
452-
<h1 className="text-2xl font-semibold text-gray-primary">
452+
<h1 className="text-2xl font-semibold text-gray-primary m-0">
453453
Account Management
454454
</h1>
455455

456+
<div className="h-4"></div>
457+
456458
<AdvancedBaseTable
457459
ref={tableRef}
458460
columns={baseColumns}

‎src/components/dashboard/FloatingNotification.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export default function FloatingNotification() {
1616
const unreadCount = notifications.length;
1717

1818
return (
19-
<div className="fixed top-9 right-20 sm:right-9 w-12 h-12 flex justify-center items-center z-[50]">
19+
<div className="fixed top-7 right-20 sm:right-9 w-12 h-12 flex justify-center items-center z-[50]">
2020
<button
2121
onClick={() => setIsPanelOpen(true)}
2222
className="absolute top-0 right-0 text-gray-500 hover:text-gray-700 transition-all "

‎src/screens/AdminUnallocatedItemsScreen.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,9 @@ export default function AdminUnallocatedItemsScreen() {
121121

122122
return (
123123
<>
124-
<h1 className="text-2xl font-semibold">Unallocated Items</h1>
124+
<h1 className="text-2xl font-semibold m-0">Unallocated Items</h1>
125+
126+
<div className="h-4"></div>
125127

126128
{modifiedPagesCount > 0 && (
127129
<div className="mb-4 mt-2 p-4 bg-blue-50 border border-blue-200 rounded-lg">

‎src/screens/PartnerItemsScreen.tsx‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -535,13 +535,15 @@ export default function PartnerItemsScreen() {
535535
};
536536

537537
return (
538-
<div className="w-full px-4 py-6 font-[Open_Sans]">
538+
<div className="w-full px-4 pb-6 font-[Open_Sans]">
539539
<Tutorial tutorialSteps={tutorialSteps} type="items" onStepChange={handleTutorialStepChange} onTutorialEnd={handleTutorialEnd}/>
540-
<h1 className="text-2xl font-semibold text-gray-primary mb-6">
541-
542-
Available Items
543-
544-
</h1>
540+
<div className="flex items-start justify-between">
541+
<h1 className="text-2xl font-semibold text-gray-primary m-0">
542+
Available Items
543+
</h1>
544+
</div>
545+
546+
<div className="h-4"></div>
545547

546548
<AdvancedBaseTable
547549
ref={tableRef}

‎src/screens/PartnerRequestsScreen.tsx‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -486,17 +486,21 @@ export default function PartnerRequestsScreen() {
486486
];
487487

488488
return (
489-
<div className="w-full px-4 py-6 font-[Open_Sans]">
489+
<div className="w-full px-4 pb-6 font-[Open_Sans]">
490490
<Tutorial
491491
tutorialSteps={tutorialSteps}
492492
type="requests"
493493
onStepChange={handleTutorialStepChange}
494494
onTutorialEnd={handleTutorialEnd}
495495
/>
496496

497-
<h1 className="text-2xl font-semibold text-gray-primary mb-6">
498-
My Requests
499-
</h1>
497+
<div className="flex items-start justify-between">
498+
<h1 className="text-2xl font-semibold text-gray-primary m-0">
499+
My Requests
500+
</h1>
501+
</div>
502+
503+
<div className="h-4"></div>
500504

501505
<AdvancedBaseTable
502506
ref={tableRef}

‎src/screens/ProfileScreenPartner.tsx‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,10 +245,12 @@ export default function ProfileScreenPartner({
245245
}
246246

247247
return (
248-
<div className="max-w-6xl mx-auto py-8 px-6 font-[Open_Sans]">
249-
<h1 className="text-[32px] font-bold leading-[40px] text-[#22070B]">
250-
Profile
251-
</h1>
248+
<div className="max-w-6xl mx-auto pb-8 px-6 font-[Open_Sans]">
249+
<div className="flex items-start justify-between">
250+
<h1 className="text-2xl font-semibold text-gray-primary m-0">
251+
Profile
252+
</h1>
253+
</div>
252254

253255
<div className="mt-6">
254256
<div className="flex justify-between items-center">

‎src/screens/Wishlist/AdminWishlistScreen.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ export default function AdminWishlistScreen() {
4242

4343
return (
4444
<div className="pb-32">
45-
<h1 className="text-2xl font-bold text-gray-primary">Wishlists</h1>
46-
45+
<h1 className="text-2xl font-semibold text-gray-primary">Wishlists</h1>
4746
{totalItems !== null && totalItems >= 10 ? <WishlistSummary/> :
4847
<div className="flex justify-end -mb-10 mt-8 mr-28">
4948
<Question

‎src/screens/Wishlist/PartnerWishlistScreen.tsx‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ export default function PartnerWishlistScreen({
496496
) : null;
497497

498498
return (
499-
<div className="pb-32">
499+
<div className="w-full px-4 pb-32 font-[Open_Sans]">
500500
{!readOnly && !partnerId && (
501501
<Tutorial
502502
tutorialSteps={tutorialSteps}
@@ -506,9 +506,11 @@ export default function PartnerWishlistScreen({
506506
/>
507507
)}
508508

509+
<div className="h-4"></div>
510+
509511
<div className="flex items-start justify-between">
510-
<h1 className="text-2xl font-semibold text-gray-primary mb-2">
511-
Wishlist
512+
<h1 className="text-2xl font-semibold text-gray-primary m-0 -mt-3">
513+
My Wishlist
512514
</h1>
513515
</div>
514516

0 commit comments

Comments
 (0)