github/plane
0
0
Fork 1
mirror of https://github.com/makeplane/plane synced 2024-06-14 14:31:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'preview' of gurusainath:makeplane/plane into revamp-estimates

Browse Source
This commit is contained in:
guru_sainath 2024-05-24 14:06:15 +05:30
commit bc1702647c
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/components/common/copy-field.tsx
View File

@ -24,7 +24,7 @@ export const CopyField: React.FC<Props> = (props) => {
return ( return (
<div className="flex flex-col gap-1"> <div className="flex flex-col gap-1">
<h4 className="text-sm text-custom-text-300">{label}</h4> <h4 className="text-sm text-custom-text-200">{label}</h4>
<Button <Button
variant="neutral-primary" variant="neutral-primary"
className="flex items-center justify-between py-2" className="flex items-center justify-between py-2"
@ -40,7 +40,7 @@ export const CopyField: React.FC<Props> = (props) => {
<p className="text-sm font-medium">{url}</p> <p className="text-sm font-medium">{url}</p>
<Copy size={18} color="#B9B9B9" /> <Copy size={18} color="#B9B9B9" />
</Button> </Button>
<div className="text-xs text-custom-text-400">{description}</div> <div className="text-xs text-custom-text-300">{description}</div>
</div> </div>
); );
}; };

4
web/components/labels/create-label-modal.tsx
View File

@ -73,9 +73,9 @@ export const CreateLabelModal: React.FC<Props> = observer((props) => {
}) })
.catch((error) => { .catch((error) => {
setToast({ setToast({
title: "Oops!", title: "Error!",
type: TOAST_TYPE.ERROR, type: TOAST_TYPE.ERROR,
message: error?.error ?? "Error while adding the label", message: error?.detail ?? "Something went wrong. Please try again later.",
}); });
reset(formData); reset(formData);
}); });

4
web/components/labels/create-update-label-inline.tsx
View File

@ -63,9 +63,9 @@ export const CreateUpdateLabelInline = observer(
}) })
.catch((error) => { .catch((error) => {
setToast({ setToast({
title: "Oops!", title: "Error!",
type: TOAST_TYPE.ERROR, type: TOAST_TYPE.ERROR,
message: error?.error ?? "Error while adding the label", message: error?.detail ?? "Something went wrong. Please try again later.",
}); });
reset(formData); reset(formData);
}); });

4
web/components/onboarding/create-workspace.tsx
View File

@ -224,9 +224,9 @@ export const CreateWorkspace: React.FC<Props> = (props) => {
)} )}
/> />
<p className="text-sm text-onboarding-text-300">You can only edit the slug of the URL</p> <p className="text-sm text-onboarding-text-300">You can only edit the slug of the URL</p>
{slugError && <span className="-mt-3 text-sm text-red-500">Workspace URL is already taken!</span>} {slugError && <p className="-mt-3 text-sm text-red-500">Workspace URL is already taken!</p>}
{invalidSlug && ( {invalidSlug && (
<span className="text-sm text-red-500">{`URL can only contain ( - ), ( _ ) & alphanumeric characters.`}</span> <p className="text-sm text-red-500">{`URL can only contain ( - ), ( _ ) & alphanumeric characters.`}</p>
)} )}
</div> </div>
<hr className="w-full border-onboarding-border-100" /> <hr className="w-full border-onboarding-border-100" />

4
web/components/workspace/create-workspace-form.tsx
View File

@ -188,9 +188,9 @@ export const CreateWorkspaceForm: FC<Props> = observer((props) => {
)} )}
/> />
</div> </div>
{slugError && <span className="-mt-3 text-sm text-red-500">Workspace URL is already taken!</span>} {slugError && <p className="-mt-3 text-sm text-red-500">Workspace URL is already taken!</p>}
{invalidSlug && ( {invalidSlug && (
<span className="text-sm text-red-500">{`URL can only contain ( - ), ( _ ) & alphanumeric characters.`}</span> <p className="text-sm text-red-500">{`URL can only contain ( - ), ( _ ) & alphanumeric characters.`}</p>
)} )}
</div> </div>
<div className="space-y-1 text-sm"> <div className="space-y-1 text-sm">