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

11809 fix size for text and icon in binding datamodell #11818

Merged
merged 7 commits into from
Dec 12, 2023
Merged

11809 fix size for text and icon in binding datamodell #11818

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aa5004d
Fixed size for text and icon in binding datamodel
JamalAlabdullah Dec 7, 2023
30c133a
Merge remote-tracking branch 'origin/master' into 11809-fix-size-for-…
JamalAlabdullah Dec 7, 2023
4cbd744
removed unused Paragraph
JamalAlabdullah Dec 7, 2023
c3dde45
change zise for text in EditdataModelBindings
JamalAlabdullah Dec 8, 2023
4bc2812
Merge remote-tracking branch 'origin/master' into 11809-fix-size-for-…
JamalAlabdullah Dec 8, 2023
b034e91
updated css in Editdatamodelbindings
JamalAlabdullah Dec 11, 2023
4a8ab31
Merge remote-tracking branch 'origin/master' into 11809-fix-size-for-…
JamalAlabdullah Dec 11, 2023
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
5 changes: 5 additions & 0 deletions frontend/packages/ux-editor/src/components/config/editModal/EditDataModelBindings.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@
padding-block: 0.75rem;
}

.linkedDatamodelIcon {
font-size: 1rem;
JamalAlabdullah marked this conversation as resolved.
Show resolved Hide resolved
}

.selectedOption {
gap: var(--fds-spacing-1);
word-break: break-word;
font-size: small;
}
12 changes: 8 additions & 4 deletions frontend/packages/ux-editor/src/components/config/editModal/EditDataModelBindings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { SelectDataModelComponent } from '../SelectDataModelComponent';
import { useDatamodelMetadataQuery } from '../../../hooks/queries/useDatamodelMetadataQuery';
import { useStudioUrlParams } from 'app-shared/hooks/useStudioUrlParams';
import { LinkIcon } from '@studio/icons';
import { Button, Paragraph } from '@digdir/design-system-react';
import { Button } from '@digdir/design-system-react';
import classes from './EditDataModelBindings.module.css';
import { InputActionWrapper } from 'app-shared/components/InputActionWrapper';

Expand Down Expand Up @@ -104,7 +104,11 @@ export const EditDataModelBindings = ({
helpText={helpText}
/>
) : (
selectedOption && <SelectedOption selectedOption={selectedOption} />
selectedOption && (
<span className={classes.selectedOption}>
<SelectedOption selectedOption={selectedOption} />
</span>
)
)}
</div>
</InputActionWrapper>
Expand All @@ -116,8 +120,8 @@ export const EditDataModelBindings = ({
const SelectedOption = ({ selectedOption }: { selectedOption: string }) => {
return (
<div className={classes.linkedDatamodelContainer}>
<LinkIcon />
<Paragraph className={classes.selectedOption}>{selectedOption}</Paragraph>
<LinkIcon className={classes.linkedDatamodelIcon} />
{selectedOption}
</div>
);
};
Loading