Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WEB-762] chore: cycle, module modal improvement and cycle, module #4000

Merged
merged 3 commits into from
Mar 20, 2024
Merged

[WEB-762] chore: cycle, module modal improvement and cycle, module #4000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c24359
chore: cycle modal description improvement
anmolsinghbhatia Mar 20, 2024
f20d37c
Merge branch 'develop' of gurusainath:makeplane/plane into chore/cycl…
gurusainath Mar 20, 2024
faf94c9
chore: updated the description ui in cycles and modules
gurusainath Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web/components/cycles/form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export const CycleForm: React.FC<Props> = (props) => {
id="cycle_description"
name="description"
placeholder="Description..."
className="!h-24 w-full resize-none text-sm"
className="w-full text-sm resize-none min-h-24"
hasError={Boolean(errors?.description)}
value={value}
onChange={onChange}
Expand Down
14 changes: 8 additions & 6 deletions web/components/cycles/sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { Disclosure, Transition } from "@headlessui/react";
// icons
import { ICycle } from "@plane/types";
// ui
import { Avatar, CustomMenu, Loader, LayersIcon, TOAST_TYPE, setToast } from "@plane/ui";
import { Avatar, CustomMenu, Loader, LayersIcon, TOAST_TYPE, setToast, TextArea } from "@plane/ui";
// components
import { SidebarProgressStats } from "@/components/core";
import ProgressChart from "@/components/core/sidebar/progress-chart";
Expand Down Expand Up @@ -219,8 +219,8 @@ export const CycleDetailsSidebar: React.FC<Props> = observer((props) => {
? "0 Issue"
: `${cycleDetails.progress_snapshot.completed_issues}/${cycleDetails.progress_snapshot.total_issues}`
: cycleDetails.total_issues === 0
? "0 Issue"
: `${cycleDetails.completed_issues}/${cycleDetails.total_issues}`;
? "0 Issue"
: `${cycleDetails.completed_issues}/${cycleDetails.total_issues}`;

const daysLeft = findHowManyDaysLeft(cycleDetails.end_date);

Expand Down Expand Up @@ -290,9 +290,11 @@ export const CycleDetailsSidebar: React.FC<Props> = observer((props) => {
</div>

{cycleDetails.description && (
<span className="w-full whitespace-normal break-words py-2.5 text-sm leading-5 text-custom-text-200">
{cycleDetails.description}
</span>
<TextArea
className="outline-none ring-none w-full max-h-max bg-transparent !p-0 !m-0 !border-0 resize-none text-sm leading-5 text-custom-text-200"
value={cycleDetails.description}
disabled
/>
)}

<div className="flex flex-col gap-5 pb-6 pt-2.5">
Expand Down
2 changes: 1 addition & 1 deletion web/components/modules/form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ export const ModuleForm: React.FC<Props> = (props) => {
value={value}
onChange={onChange}
placeholder="Description..."
className="h-24 w-full resize-none text-sm"
className="w-full text-sm resize-none min-h-24"
hasError={Boolean(errors?.description)}
tabIndex={2}
/>
Expand Down
9 changes: 6 additions & 3 deletions web/components/modules/sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import {
UserGroupIcon,
TOAST_TYPE,
setToast,
TextArea,
} from "@plane/ui";
// components
import { LinkModal, LinksList, SidebarProgressStats } from "@/components/core";
Expand Down Expand Up @@ -337,9 +338,11 @@ export const ModuleDetailsSidebar: React.FC<Props> = observer((props) => {
</div>

{moduleDetails.description && (
<span className="w-full whitespace-normal break-words py-2.5 text-sm leading-5 text-custom-text-200">
{moduleDetails.description}
</span>
<TextArea
className="outline-none ring-none w-full max-h-max bg-transparent !p-0 !m-0 !border-0 resize-none text-sm leading-5 text-custom-text-200"
value={moduleDetails.description}
disabled
/>
)}

<div className="flex items-center justify-start gap-1">
Expand Down
Loading