From 3171771966eec9ebeef7a18beab215d6e5a48ee1 Mon Sep 17 00:00:00 2001 From: Matthew-Baird <148975913+Matthew-Baird@users.noreply.github.com> Date: Thu, 25 Apr 2024 08:28:47 +0200 Subject: [PATCH] Opp Carousel Touchups & Goodies (#753) * Organisation admin view tab mobile styling * Opportunity carousel styling * Nprogress loader styling * Update status text * Cancel submission modal overflow fix * Custom bounce ease to tailwind config * Carousel scroll bug fix --- .../src/components/Carousel/ArrowButtons.tsx | 14 ++- .../Carousel/SelectedSnapDisplay.tsx | 2 +- .../Opportunity/OpportunitiesCarousel.tsx | 117 +++++++++++++----- .../Opportunity/OpportunityPublicSmall.tsx | 14 ++- .../opportunities/[[...query]]/index.tsx | 8 +- .../opportunities/[opportunityId]/index.tsx | 21 ++-- .../organisations/[[...query]]/index.tsx | 88 ++++++++++--- src/web/src/styles/globals.scss | 18 +-- src/web/tailwind.config.ts | 3 + 9 files changed, 202 insertions(+), 83 deletions(-) diff --git a/src/web/src/components/Carousel/ArrowButtons.tsx b/src/web/src/components/Carousel/ArrowButtons.tsx index a7f8defb8..f8086547c 100644 --- a/src/web/src/components/Carousel/ArrowButtons.tsx +++ b/src/web/src/components/Carousel/ArrowButtons.tsx @@ -65,11 +65,14 @@ export const PrevButton: React.FC = (props) => { return ( + {/* TABS */}
-
    -
  • +
      +
    • All {(totalCountAll ?? 0) > 0 && ( -
      +
      {totalCountAll}
      )}
    • -
    • +
    • Active {(totalCountActive ?? 0) > 0 && ( -
      +
      {totalCountActive}
      )}
    • -
    • +
    • Pending {(totalCountInactive ?? 0) > 0 && ( -
      +
      {totalCountInactive}
      )}
    • -
    • +
    • Declined {(totalCountDeclined ?? 0) > 0 && ( -
      +
      {totalCountDeclined}
      )}
    • -
    • +
    • Deleted {(totalCountDeleted ?? 0) > 0 && ( -
      +
      {totalCountDeleted}
      )} @@ -464,6 +491,33 @@ const Organisations: NextPageWithLayout<{
+ {/* RIGHT BUTTON MOBILE */} +
+ +
@@ -484,7 +538,7 @@ const Organisations: NextPageWithLayout<{ -
+
{/* NO RESULTS */} {searchResults && searchResults.totalCount === 0 && (
diff --git a/src/web/src/styles/globals.scss b/src/web/src/styles/globals.scss index 68eee50f4..ac826d757 100644 --- a/src/web/src/styles/globals.scss +++ b/src/web/src/styles/globals.scss @@ -110,19 +110,11 @@ body { // NProgress #nprogress .bar { - height: 4px !important; + height: 5.5px !important; + background: theme("colors.white") !important; + opacity: 0.3 !important; } -// override the NProgress styles based on the theme -[data-theme="purple"] #nprogress .bar { - @apply bg-blue; -} -[data-theme="green"] #nprogress .bar { - @apply bg-blue; -} -[data-theme="blue"] #nprogress .bar { - @apply bg-white; -} -[data-theme="orange"] #nprogress .bar { - @apply bg-blue; +#nprogress .peg { + display: none !important; } diff --git a/src/web/tailwind.config.ts b/src/web/tailwind.config.ts index eb1e5fd0a..6658e784d 100644 --- a/src/web/tailwind.config.ts +++ b/src/web/tailwind.config.ts @@ -42,6 +42,9 @@ export default { custom: "0 2px 15px -3px rgba(0, 0, 0, 0.07), 0 10px 20px -2px rgba(0, 0, 0, 0.04)", }, + transitionTimingFunction: { + bounce: "cubic-bezier(0.175, 1.485, 0.320, 1.275)", + }, }, }, darkMode: "class",