Skip to content

Commit

Permalink
fix merge error in resources main
Browse files Browse the repository at this point in the history
  • Loading branch information
r-southworth committed Oct 21, 2024
1 parent ad2515d commit c4b7362
Showing 1 changed file with 7 additions and 25 deletions.
32 changes: 7 additions & 25 deletions src/components/services/ResourcesMain.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -372,30 +372,12 @@ export const ResourcesView: Component = () => {
clearPriceFilter={clearPriceFilter}
/>


<Show when={screenSize() === "sm"}>
<div class="mb-2 rounded-lg bg-btn1 py-2 dark:bg-btn1-DM">
<h1 class="text-lg text-btn1Text dark:text-ptext1">
{t("hElementText.services")}
</h1>
</div>
</Show>

<div class="flex w-full flex-col items-center md:h-full md:w-auto md:flex-row md:items-start">
<Show when={screenSize() !== "sm"}>
<FiltersMobile
clearSubjects={clearSubjects}
clearGrade={clearGrade}
clearAllFilters={clearAllFilters}
clearFilters={clearFilters()}
filterPostsByGrade={filterPostsByGrade}
filterPostsBySubject={setCategoryFilter}
secularFilter={filterPostsBySecular}
clearSecular={clearSecular}
clearResourceTypes={clearResourceTypes}
filterPostsByResourceTypes={filterPostsByResourceTypes}
/>

<Show when={screenSize() === "sm"}>
<div class="mb-2 rounded-lg bg-btn1 py-2 dark:bg-btn1-DM">
<h1 class="text-lg text-btn1Text dark:text-ptext1">
{t("hElementText.services")}
</h1>
</div>
</Show>

<div class="w-11/12 items-center md:w-8/12 md:flex-1">
Expand All @@ -410,7 +392,7 @@ export const ResourcesView: Component = () => {
<Show when={screenSize() !== "sm"}>
<div class="mb-2 flex w-full items-center justify-center rounded-lg bg-btn1 opacity-80 dark:bg-btn1-DM md:h-24">
<h1 class="text-center text-lg text-ptext1-DM dark:text-ptext1 md:text-3xl">
{t("hElementText.services")}
{t("pageTitles.services")}
</h1>
</div>
</Show>
Expand Down

0 comments on commit c4b7362

Please sign in to comment.