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

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

View File

@ -24,7 +24,7 @@ export const CopyField: React.FC<Props> = (props) => {
return (
<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
variant="neutral-primary"
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>
<Copy size={18} color="#B9B9B9" />
</Button>
<div className="text-xs text-custom-text-400">{description}</div>
<div className="text-xs text-custom-text-300">{description}</div>
</div>
);
};

View File

@ -73,9 +73,9 @@ export const CreateLabelModal: React.FC<Props> = observer((props) => {
})
.catch((error) => {
setToast({
title: "Oops!",
title: "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);
});

View File

@ -63,9 +63,9 @@ export const CreateUpdateLabelInline = observer(
})
.catch((error) => {
setToast({
title: "Oops!",
title: "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);
});

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>
{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 && (
<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>
<hr className="w-full border-onboarding-border-100" />

View File

@ -188,9 +188,9 @@ export const CreateWorkspaceForm: FC<Props> = observer((props) => {
)}
/>
</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 && (
<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 className="space-y-1 text-sm">