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

3961-Notes-Relation-Field #3965

Merged
merged 3 commits into from
Feb 25, 2024
Merged

3961-Notes-Relation-Field #3965

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1233b58
Label fix
Kanav-Arora Feb 14, 2024
aae548b
Remove semicolumn
charlesBochet Feb 25, 2024
502da99
Fix broken layout
charlesBochet Feb 25, 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 .../twenty-front/src/modules/activities/inline-cell/components/ActivityTargetsInlineCell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,14 @@ export const ActivityTargetsInlineCell = ({
scope: ActivityEditorHotkeyScope.ActivityTargets,
}}
IconLabel={IconArrowUpRight}
showLabel={true}
editModeContent={
<ActivityTargetInlineCellEditMode
activity={activity}
activityTargetObjectRecords={activityTargetObjectRecords}
/>
}
label="Relations"
label="Relations:"
charlesBochet marked this conversation as resolved.
Show resolved Hide resolved
displayModeContent={
<ActivityTargetChips
activityTargetObjectRecords={activityTargetObjectRecords}
Expand Down
6 changes: 3 additions & 3 deletions ...ont/src/modules/object-record/record-inline-cell/components/RecordInlineCellContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const StyledClickableContainer = styled.div`
const StyledInlineCellBaseContainer = styled.div`
align-items: center;
box-sizing: border-box;

width: 100%;
charlesBochet marked this conversation as resolved.
Show resolved Hide resolved
display: flex;

gap: ${({ theme }) => theme.spacing(1)};
Expand Down Expand Up @@ -141,7 +141,7 @@ export const RecordInlineCellContainer = ({
onMouseEnter={handleContainerMouseEnter}
onMouseLeave={handleContainerMouseLeave}
>
{(!!IconLabel || !!label) && (
{(IconLabel || label) && (
<StyledLabelAndIconContainer id={labelId}>
{IconLabel && (
<StyledIconContainer>
Expand All @@ -160,7 +160,7 @@ export const RecordInlineCellContainer = ({
content={label}
clickable
noArrow
place="left"
place="bottom"
charlesBochet marked this conversation as resolved.
Show resolved Hide resolved
positionStrategy="fixed"
/>
)}
Expand Down
Loading