Skip to content

The open alternative to Salesforce, designed for AI.

Tune squircle corners to K 2.2 and preserve round shapes (#24974)

Thomas des Francs520c2740fd72
diff --git a/packages/twenty-front/src/modules/activities/components/SkeletonLoader.tsx b/packages/twenty-front/src/modules/activities/components/SkeletonLoader.tsx
index 1d98bcac36a..2a73dad9b75 100644
--- a/packages/twenty-front/src/modules/activities/components/SkeletonLoader.tsx
+++ b/packages/twenty-front/src/modules/activities/components/SkeletonLoader.tsx
@@ -26,6 +26,10 @@ const StyledSkeletonSubSectionContent = styled.div`
justify-content: center;
`;
+const StyledSkeletonColumn = styled(Skeleton)`
+ corner-shape: round;
+`;
+
export const SKELETON_LOADER_HEIGHT_SIZES = {
standard: {
xs: 13,
@@ -49,7 +53,7 @@ const SkeletonColumnLoader = ({ height }: { height: number }) => {
highlightColor={theme.background.transparent.lighter}
borderRadius={80}
>
- <Skeleton width={24} height={height} />
+ <StyledSkeletonColumn width={24} height={height} />
</SkeletonTheme>
);
};
diff --git a/packages/twenty-front/src/modules/activities/emails/recipients/components/EmailRecipientsFieldChipCell.tsx b/packages/twenty-front/src/modules/activities/emails/recipients/components/EmailRecipientsFieldChipCell.tsx
index 1308b355b23..239929fe190 100644
--- a/packages/twenty-front/src/modules/activities/emails/recipients/components/EmailRecipientsFieldChipCell.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/recipients/components/EmailRecipientsFieldChipCell.tsx
@@ -24,9 +24,10 @@ const StyledChipDropZone = styled.div`
&::before,
&::after {
background-color: ${themeCssVariables.color.blue};
- border-radius: ${themeCssVariables.border.radius.sm};
+ border-radius: ${themeCssVariables.border.radius.pill};
bottom: 0;
content: '';
+ corner-shape: round;
opacity: 0;
position: absolute;
top: 0;
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/AdvancedTextEditorInsertRail.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/AdvancedTextEditorInsertRail.tsx
index 3d4ff7aa9af..3071de8a7bc 100644
--- a/packages/twenty-front/src/modules/advanced-text-editor/components/AdvancedTextEditorInsertRail.tsx
+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/AdvancedTextEditorInsertRail.tsx
@@ -33,6 +33,7 @@ const StyledRail = styled.div`
box-shadow:
0px 2px 4px 0px ${themeCssVariables.background.transparent.light},
0px 0px 4px 0px ${themeCssVariables.background.transparent.medium};
+ corner-shape: round;
display: flex;
flex-direction: column;
gap: ${themeCssVariables.spacing[2]};
diff --git a/packages/twenty-front/src/modules/file/components/AttachmentChip.tsx b/packages/twenty-front/src/modules/file/components/AttachmentChip.tsx
index d3918b874cd..dfc9264ec8d 100644
--- a/packages/twenty-front/src/modules/file/components/AttachmentChip.tsx
+++ b/packages/twenty-front/src/modules/file/components/AttachmentChip.tsx
@@ -18,8 +18,9 @@ const StyledChip = styled.div<{ deletable: boolean }>`
align-items: center;
background-color: ${themeCssVariables.background.transparent.light};
border: 1px solid ${themeCssVariables.border.color.medium};
- border-radius: ${themeCssVariables.border.radius.sm};
+ border-radius: ${themeCssVariables.border.radius.smRound};
column-gap: ${themeCssVariables.spacing[1]};
+ corner-shape: round;
display: inline-flex;
flex-direction: row;
flex-shrink: 0;
@@ -39,9 +40,10 @@ const StyledDelete = styled.button`
align-items: center;
background: none;
border: none;
- border-bottom-right-radius: ${themeCssVariables.border.radius.sm};
- border-top-right-radius: ${themeCssVariables.border.radius.sm};
+ border-bottom-right-radius: ${themeCssVariables.border.radius.smRound};
+ border-top-right-radius: ${themeCssVariables.border.radius.smRound};
color: ${themeCssVariables.font.color.tertiary};
+ corner-shape: round;
cursor: pointer;
display: flex;
flex-shrink: 0;
diff --git a/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerTabsRow.tsx b/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerTabsRow.tsx
index 578f7990f69..67bebf506bb 100644
--- a/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerTabsRow.tsx
+++ b/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerTabsRow.tsx
@@ -115,6 +115,7 @@ const StyledNewChatButton = styled.div`
align-items: center;
border-radius: inherit;
color: ${themeCssVariables.font.color.secondary};
+ corner-shape: round;
cursor: pointer;
display: flex;
font-size: ${themeCssVariables.font.size.sm};
diff --git a/packages/twenty-front/src/modules/onboarding/components/OnboardingHeader.tsx b/packages/twenty-front/src/modules/onboarding/components/OnboardingHeader.tsx
index 68b8ae4c4a0..44a8791956c 100644
--- a/packages/twenty-front/src/modules/onboarding/components/OnboardingHeader.tsx
+++ b/packages/twenty-front/src/modules/onboarding/components/OnboardingHeader.tsx
@@ -80,6 +80,7 @@ const StyledCreditsTag = styled.div`
border-top: 1px solid ${themeCssVariables.border.color.light};
border-top-left-radius: ${themeCssVariables.border.radius.pill};
box-sizing: border-box;
+ corner-shape: round;
display: flex;
gap: ${themeCssVariables.spacing[1]};
height: ${themeCssVariables.spacing[6]};
@@ -103,6 +104,7 @@ const StyledInfoTag = styled.div`
border-bottom-right-radius: ${themeCssVariables.border.radius.rounded};
border-top-right-radius: ${themeCssVariables.border.radius.rounded};
box-sizing: border-box;
+ corner-shape: round;
display: flex;
height: ${themeCssVariables.spacing[6]};
justify-content: center;
diff --git a/packages/twenty-front/src/modules/page-layout/components/PageLayoutGridResizeHandle.tsx b/packages/twenty-front/src/modules/page-layout/components/PageLayoutGridResizeHandle.tsx
index b963f85b672..189906b0ef6 100644
--- a/packages/twenty-front/src/modules/page-layout/components/PageLayoutGridResizeHandle.tsx
+++ b/packages/twenty-front/src/modules/page-layout/components/PageLayoutGridResizeHandle.tsx
@@ -60,7 +60,8 @@ const StyledCornerIconWrapper = styled.div<{
`;
const StyledVerticalHandle = styled.div`
- border-radius: ${themeCssVariables.border.radius.sm};
+ border-radius: ${themeCssVariables.border.radius.pill};
+ corner-shape: round;
height: ${themeCssVariables.spacing[5]};
width: calc(${themeCssVariables.icon.stroke.lg} * 1px);
`;
@@ -82,7 +83,8 @@ const StyledVerticalHandleWrapper = styled.div<{
`;
const StyledHorizontalHandle = styled.div`
- border-radius: ${themeCssVariables.border.radius.sm};
+ border-radius: ${themeCssVariables.border.radius.pill};
+ corner-shape: round;
height: calc(${themeCssVariables.icon.stroke.lg} * 1px);
width: ${themeCssVariables.spacing[5]};
`;
diff --git a/packages/twenty-front/src/modules/views/components/SortOrFilterChip.tsx b/packages/twenty-front/src/modules/views/components/SortOrFilterChip.tsx
index 895a52287c5..c003b6ac7bd 100644
--- a/packages/twenty-front/src/modules/views/components/SortOrFilterChip.tsx
+++ b/packages/twenty-front/src/modules/views/components/SortOrFilterChip.tsx
@@ -62,6 +62,7 @@ const StyledDelete = styled.button<{ variant: SortOrFilterChipVariant }>`
border: none;
box-sizing: border-box;
color: inherit;
+ corner-shape: round;
cursor: pointer;
display: flex;
font-size: ${themeCssVariables.font.size.sm};
@@ -82,7 +83,7 @@ const StyledDelete = styled.button<{ variant: SortOrFilterChipVariant }>`
return themeCssVariables.accent.secondary;
}
}};
- border-radius: ${themeCssVariables.border.radius.sm};
+ border-radius: ${themeCssVariables.border.radius.smRound};
}
`;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramHandleSource.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramHandleSource.tsx
index 22dcd972cc3..3137ed10b8e 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramHandleSource.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramHandleSource.tsx
@@ -13,6 +13,7 @@ const StyledHandleContainer = styled.div`
& .react-flow__handle {
background: var(--handle-bg);
border-color: var(--handle-border-color);
+ corner-shape: round;
height: ${NODE_HANDLE_HEIGHT_PX}px;
opacity: var(--handle-opacity, 1);
transform: var(--handle-transform);
diff --git a/packages/twenty-ui/dist/theme-dark.css b/packages/twenty-ui/dist/theme-dark.css
index 312deb241a5..bfb62fe8f80 100644
--- a/packages/twenty-ui/dist/theme-dark.css
+++ b/packages/twenty-ui/dist/theme-dark.css
@@ -1039,6 +1039,6 @@
*,
*::before,
*::after {
- corner-shape: var(--t-corner-shape, squircle);
+ corner-shape: var(--t-corner-shape, superellipse(2.2));
}
}
diff --git a/packages/twenty-ui/dist/theme-light.css b/packages/twenty-ui/dist/theme-light.css
index 572b23fd38c..6c8feac823c 100644
--- a/packages/twenty-ui/dist/theme-light.css
+++ b/packages/twenty-ui/dist/theme-light.css
@@ -1043,6 +1043,6 @@
*,
*::before,
*::after {
- corner-shape: var(--t-corner-shape, squircle);
+ corner-shape: var(--t-corner-shape, superellipse(2.2));
}
}
diff --git a/packages/twenty-ui/src/theme-constants/__tests__/cornerShapeThemeParity.test.ts b/packages/twenty-ui/src/theme-constants/__tests__/cornerShapeThemeParity.test.ts
index c46f81268b0..8799e3922c0 100644
--- a/packages/twenty-ui/src/theme-constants/__tests__/cornerShapeThemeParity.test.ts
+++ b/packages/twenty-ui/src/theme-constants/__tests__/cornerShapeThemeParity.test.ts
@@ -89,9 +89,9 @@ describe.each(['theme-light.css', 'theme-dark.css'])(
},
);
- it('applies corner-shape universally with the --t-corner-shape opt-out', () => {
+ it('uses K 2.2 universally while preserving the --t-corner-shape opt-out', () => {
expect(squircleBlock).toContain(
- 'corner-shape: var(--t-corner-shape, squircle);',
+ 'corner-shape: var(--t-corner-shape, superellipse(2.2));',
);
});
diff --git a/packages/twenty-ui/src/theme-constants/theme-dark.css b/packages/twenty-ui/src/theme-constants/theme-dark.css
index 312deb241a5..bfb62fe8f80 100644
--- a/packages/twenty-ui/src/theme-constants/theme-dark.css
+++ b/packages/twenty-ui/src/theme-constants/theme-dark.css
@@ -1039,6 +1039,6 @@
*,
*::before,
*::after {
- corner-shape: var(--t-corner-shape, squircle);
+ corner-shape: var(--t-corner-shape, superellipse(2.2));
}
}
diff --git a/packages/twenty-ui/src/theme-constants/theme-light.css b/packages/twenty-ui/src/theme-constants/theme-light.css
index 572b23fd38c..6c8feac823c 100644
--- a/packages/twenty-ui/src/theme-constants/theme-light.css
+++ b/packages/twenty-ui/src/theme-constants/theme-light.css
@@ -1043,6 +1043,6 @@
*,
*::before,
*::after {
- corner-shape: var(--t-corner-shape, squircle);
+ corner-shape: var(--t-corner-shape, superellipse(2.2));
}
}