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

Remove Right-Edge Gap in Table Cell Display #5992

Merged
merged 4 commits into from
Jun 24, 2024
Merged

Remove Right-Edge Gap in Table Cell Display #5992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6fe0ff3
Remove Right-Edge Gap in Table Cell Display
rksingh2001 Jun 23, 2024
de3d847
removed redundant padding
rksingh2001 Jun 23, 2024
264a11e
Fixed soft focus + padding on td + incorrect cell total height
lucasbordeau Jun 24, 2024
4929c9a
Fixed padding-left
lucasbordeau Jun 24, 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
2 changes: 2 additions & 0 deletions packages/twenty-front/src/modules/object-record/record-table/components/RecordTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ const StyledTable = styled.table<{
color: ${({ theme }) => theme.font.color.primary};
border-right: 1px solid ${({ theme }) => theme.border.color.light};

padding: 0;

text-align: left;

:last-child {
Expand Down
2 changes: 1 addition & 1 deletion ...ject-record/record-table/record-table-cell/components/RecordTableCellContainer.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
.cell-base-container-soft-focus {
background: var(--twentycrm-background-transparent-secondary);
border-radius: var(--twentycrm-border-radius-sm);
outline: 1px solid var(--twentycrm-font-color-extra-light);
border: 1px solid var(--twentycrm-font-color-extra-light);
}

9 changes: 3 additions & 6 deletions ...cord/record-table/record-table-cell/components/RecordTableCellDisplayContainer.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,12 @@
display: flex;
height: 100%;
overflow: hidden;
padding-left: 8px;
padding-right: 4px;
padding-left: 6px;
width: 100%;
}

.cell-display-outer-container-soft-focus {
background: var(--twentycrm-background-transparent-secondary);
border-radius: var(--twentycrm-border-radius-sm);
outline: 1px solid var(--twentycrm-font-color-extra-light);
.cell-display-with-soft-focus {
margin: -1px;
}

.cell-display-inner-container {
Expand Down
2 changes: 1 addition & 1 deletion ...ject-record/record-table/record-table-cell/components/RecordTableCellDisplayContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const RecordTableCellDisplayContainer = ({
onClick={onClick}
className={clsx({
[styles.cellDisplayOuterContainer]: true,
[styles.cellDisplayOuterContainerSoftFocus]: softFocus,
[styles.cellDisplayWithSoftFocus]: softFocus,
})}
ref={scrollRef}
>
Expand Down
5 changes: 3 additions & 2 deletions ...es/object-record/record-table/record-table-cell/components/RecordTableCellDisplayMode.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@ import { RecordTableCellDisplayContainer } from './RecordTableCellDisplayContain

export const RecordTableCellDisplayMode = ({
children,
}: React.PropsWithChildren<unknown>) => {
softFocus,
}: React.PropsWithChildren<{ softFocus?: boolean }>) => {
const isEmpty = useIsFieldEmpty();

if (isEmpty) {
return <></>;
}

return (
<RecordTableCellDisplayContainer>
<RecordTableCellDisplayContainer softFocus={softFocus}>
{children}
</RecordTableCellDisplayContainer>
);
Expand Down
1 change: 1 addition & 0 deletions .../object-record/record-table/record-table-cell/components/RecordTableCellSoftFocusMode.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ export const RecordTableCellSoftFocusMode = ({
<RecordTableCellDisplayContainer
onClick={handleClick}
scrollRef={scrollRef}
softFocus
>
{editModeContentOnly ? editModeContent : nonEditModeContent}
</RecordTableCellDisplayContainer>
Expand Down
2 changes: 1 addition & 1 deletion ...ages/twenty-front/src/modules/settings/data-model/constants/SettingsFieldCurrencyCodes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,5 +88,5 @@ export const SETTINGS_FIELD_CURRENCY_CODES: Record<
BRL: {
label: 'Brazilian real',
Icon: IconCurrencyReal,
}
},
};
Loading