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

Small fixes date input #548

Merged
merged 6 commits into from
Dec 9, 2024
Merged

Small fixes date input #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8ebfd47
default text on dateinput
MariaBonde Dec 9, 2024
14ffa27
default text value on input date
MariaBonde Dec 9, 2024
9c65a49
inEditIndex switched other agreements open when one was deleted
MariaBonde Dec 9, 2024
7362def
overflow hidden not having effect
MariaBonde Dec 9, 2024
2b872c6
changed spacing
MariaBonde Dec 9, 2024
60011eb
Merge branch 'main' into smallFixesDateInput
trulshj Dec 9, 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
3 changes: 2 additions & 1 deletion frontend/src/components/Agreement/AgreementEdit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ export function AgreementEdit({
/>
</div>

<div className="flex flex-row flex-wrap justify-start items-start gap-16">
<div className="flex flex-row flex-wrap justify-start items-start gap-8">
{agreement.agreementId !== -1 && (
<input
type="hidden"
Expand Down Expand Up @@ -348,6 +348,7 @@ export function AgreementEdit({
agreementsCopy.splice(i, 1);
setAgreements(agreementsCopy);
await deleteAgreementWithFiles(agreement, organisation);
setInEditIndex(null);
}
}}
className="border-holiday_darker border-2 bg-white f text-holiday_darker shadow-md "
Expand Down
6 changes: 4 additions & 2 deletions frontend/src/components/Agreement/components/EditDateInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,11 @@ export function EditDateInput({
</label>
<p
onClick={(e) => onInputClick(e)}
className="mt-1 bg-primary/5 shadow-sm border border-primary/5 pr-10 p-2 rounded-md hover:bg-primary_darker/10"
className={`mt-1 bg-primary/5 shadow-sm border border-primary/5 pr-10 p-2 rounded-md hover:bg-primary_darker/10 ${
value ? "" : "text-text_light_black/50 italic"
}`}
>
{value?.toLocaleDateString("nb-NO")}
{value?.toLocaleDateString("nb-NO") ?? "Ikke satt"}
</p>
</>
)}
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/Agreement/components/EditInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export function EditInput({
onClick?: (e?: any) => any;
}) {
return (
<div className="mb-5 pr-4 mt-2">
<div className="mb-3 pr-4 mt-2 h-16">
{inEdit ? (
<>
<label
Expand All @@ -36,7 +36,7 @@ export function EditInput({
) : (
<>
<h2
className="block text-sm font-bold pl-2 text-gray-700 hover:cursor-pointer"
className="mr-10 pr-10 p-2 mt-1 block text-sm font-bold pl-2 text-gray-700 hover:cursor-pointer"
onClick={onClick}
>
{value}
Expand Down
Loading