Skip to content

Commit

Permalink
Merge pull request #2002 from ever-co/develop
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
evereq authored Dec 13, 2023
2 parents ede5353 + bc0e49a commit 2ef11da
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions apps/web/lib/components/Kanban.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ function InnerItemList({items, title}: {
isGroupedOver={Boolean(dragSnapshot.combineTargetFor)}
provided={dragProvided}
style={title === TaskStatus.INPROGRESS && {
borderWidth: '1px',
borderWidth: '2px',
borderColor: '#6FCF97',
borderStyle: 'solid'
}}
Expand Down Expand Up @@ -278,7 +278,7 @@ const KanbanDraggableHeader = ({title, items, snapshot, provided, backgroundColo
return (
<>
<header
className={"flex flex-row justify-between items-center rounded-lg px-4 py-2"}
className={"flex flex-row justify-between items-center rounded-lg px-[15px] py-[7px]"}
style={headerStyleChanger(snapshot, backgroundColor)}
data-isDragging={snapshot.isDragging}
>
Expand Down
9 changes: 5 additions & 4 deletions apps/web/lib/components/kanban-card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function TagCard({title, backgroundColor, color}: {
return (
<>
<div
className="flex flex-row gap-2 items-center py-1 px-2.5 rounded-xl"
className="flex flex-row gap-2 items-center py-1 px-2.5 rounded-[10px]"
style={{
backgroundColor: `${backgroundColor}`
}}
Expand Down Expand Up @@ -178,7 +178,7 @@ export default function Item(props: any) {
aria-label={`${item.status.name} ${item.content}`}
>
<div className="flex gap-1.5 border-b border-b-gray-200 pb-4">
<div className="flex flex-col gap-5 grow">
<div className="flex flex-col justify- gap-5 grow">
{item.tags && (
<TagList tags={item.tags}/>
)}
Expand All @@ -187,6 +187,7 @@ export default function Item(props: any) {
<TaskIssueStatus showIssueLabels={false} task={item} className={`${
item.issueType === 'Bug' ? '!px-[0.3312rem] py-[0.2875rem]' : '!px-[0.375rem] py-[0.375rem]'
} rounded-sm mr-1`}/>

<span className="text-grey text-normal mr-1">#{item.number}</span>
<span className="text-black dark:text-white text-normal capitalize mr-2">{item.title}</span>
<Priority level={1}/>
Expand All @@ -198,7 +199,7 @@ export default function Item(props: any) {
<CircularProgress percentage={10}/>
</div>
</div>
<div className="flex flex-row justify-between items-center pt-4">
<div className="flex flex-row justify-between items-center pt-5 pb-2 h-fit">

{item.status === TaskStatus.INPROGRESS ? (
<div className="flex flex-row items-center gap-2">
Expand All @@ -212,7 +213,7 @@ export default function Item(props: any) {
</div>
)}

<div className="relative">
<div className="relative ">
<div className="w-10 flex h-fit flex-row justify-end items-center relative bg-primary">
{item.members.map((option: any, index: number)=> {
return (
Expand Down

0 comments on commit 2ef11da

Please sign in to comment.