[WEB-5660] [WEB-5737] fix: cycle and module sidebar #8375
This commit is contained in:
parent
c56bb06957
commit
ad2291dfee
3 changed files with 10 additions and 8 deletions
|
|
@ -212,7 +212,7 @@ export const ImagePickerPopover = observer(function ImagePickerPopover(props: Pr
|
||||||
<Tab.Panel className="mt-4 h-full w-full space-y-4">
|
<Tab.Panel className="mt-4 h-full w-full space-y-4">
|
||||||
{(unsplashImages || !unsplashError) && (
|
{(unsplashImages || !unsplashError) && (
|
||||||
<>
|
<>
|
||||||
<div className="flex gap-x-2">
|
<div className="flex items-center gap-x-2">
|
||||||
<Controller
|
<Controller
|
||||||
control={control}
|
control={control}
|
||||||
name="search"
|
name="search"
|
||||||
|
|
@ -235,7 +235,7 @@ export const ImagePickerPopover = observer(function ImagePickerPopover(props: Pr
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
<Button variant="primary" onClick={() => setSearchParams(formData.search)}>
|
<Button variant="primary" size="xl" onClick={() => setSearchParams(formData.search)}>
|
||||||
Search
|
Search
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
import type { FC } from "react";
|
|
||||||
import { observer } from "mobx-react";
|
import { observer } from "mobx-react";
|
||||||
import { Tab } from "@headlessui/react";
|
import { Tab } from "@headlessui/react";
|
||||||
// plane imports
|
// plane imports
|
||||||
|
|
@ -122,7 +121,7 @@ export const CycleProgressStats = observer(function CycleProgressStats(props: TC
|
||||||
className={cn(
|
className={cn(
|
||||||
`flex w-full items-center justify-between gap-2 rounded-md p-1`,
|
`flex w-full items-center justify-between gap-2 rounded-md p-1`,
|
||||||
roundedTab ? `rounded-3xl` : `rounded-md`,
|
roundedTab ? `rounded-3xl` : `rounded-md`,
|
||||||
noBackground ? `` : `bg-surface-2`,
|
noBackground ? `` : `bg-layer-2`,
|
||||||
size === "xs" ? `text-11` : `text-13`
|
size === "xs" ? `text-11` : `text-13`
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
|
|
@ -131,7 +130,9 @@ export const CycleProgressStats = observer(function CycleProgressStats(props: TC
|
||||||
className={cn(
|
className={cn(
|
||||||
`p-1 w-full text-primary outline-none focus:outline-none cursor-pointer transition-all`,
|
`p-1 w-full text-primary outline-none focus:outline-none cursor-pointer transition-all`,
|
||||||
roundedTab ? `rounded-3xl border border-subtle` : `rounded-sm`,
|
roundedTab ? `rounded-3xl border border-subtle` : `rounded-sm`,
|
||||||
stat.key === currentTab ? "bg-surface-1 text-tertiary" : "text-placeholder hover:text-tertiary"
|
stat.key === currentTab
|
||||||
|
? "bg-layer-transparent-active text-secondary"
|
||||||
|
: "text-placeholder hover:text-secondary"
|
||||||
)}
|
)}
|
||||||
key={stat.key}
|
key={stat.key}
|
||||||
onClick={() => setCycleTab(stat.key)}
|
onClick={() => setCycleTab(stat.key)}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
import type { FC } from "react";
|
|
||||||
import { observer } from "mobx-react";
|
import { observer } from "mobx-react";
|
||||||
import { Tab } from "@headlessui/react";
|
import { Tab } from "@headlessui/react";
|
||||||
import { useTranslation } from "@plane/i18n";
|
import { useTranslation } from "@plane/i18n";
|
||||||
|
|
@ -120,7 +119,7 @@ export const ModuleProgressStats = observer(function ModuleProgressStats(props:
|
||||||
className={cn(
|
className={cn(
|
||||||
`flex w-full items-center justify-between gap-2 rounded-md p-1`,
|
`flex w-full items-center justify-between gap-2 rounded-md p-1`,
|
||||||
roundedTab ? `rounded-3xl` : `rounded-md`,
|
roundedTab ? `rounded-3xl` : `rounded-md`,
|
||||||
noBackground ? `` : `bg-surface-2`,
|
noBackground ? `` : `bg-layer-2`,
|
||||||
size === "xs" ? `text-11` : `text-13`
|
size === "xs" ? `text-11` : `text-13`
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
|
|
@ -129,7 +128,9 @@ export const ModuleProgressStats = observer(function ModuleProgressStats(props:
|
||||||
className={cn(
|
className={cn(
|
||||||
`p-1 w-full text-primary outline-none focus:outline-none cursor-pointer transition-all`,
|
`p-1 w-full text-primary outline-none focus:outline-none cursor-pointer transition-all`,
|
||||||
roundedTab ? `rounded-3xl border border-subtle` : `rounded-sm`,
|
roundedTab ? `rounded-3xl border border-subtle` : `rounded-sm`,
|
||||||
stat.key === currentTab ? "bg-surface-1 text-tertiary" : "text-placeholder hover:text-tertiary"
|
stat.key === currentTab
|
||||||
|
? "bg-layer-transparent-active text-secondary"
|
||||||
|
: "text-placeholder hover:text-secondary"
|
||||||
)}
|
)}
|
||||||
key={stat.key}
|
key={stat.key}
|
||||||
onClick={() => setModuleTab(stat.key)}
|
onClick={() => setModuleTab(stat.key)}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue