The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(twenty-front): new layout fast-follows (#21360)
Félix Malfait02aa086866ca
diff --git a/packages/twenty-front/src/loading/components/LeftPanelSkeletonLoader.tsx b/packages/twenty-front/src/loading/components/LeftPanelSkeletonLoader.tsxindex 86cb23461f9..badd24e1d74 100644--- a/packages/twenty-front/src/loading/components/LeftPanelSkeletonLoader.tsx+++ b/packages/twenty-front/src/loading/components/LeftPanelSkeletonLoader.tsx@@ -66,7 +66,7 @@ export const LeftPanelSkeletonLoader = () => {<StyledItemsContainer><StyledSkeletonTitleContainer><SkeletonTheme- baseColor={theme.background.tertiary}+ baseColor={theme.background.quaternary}highlightColor={theme.background.transparent.lighter}borderRadius={4}>diff --git a/packages/twenty-front/src/loading/components/PageContentSkeletonLoader.tsx b/packages/twenty-front/src/loading/components/PageContentSkeletonLoader.tsxindex 1389d4604d1..46d6751b031 100644--- a/packages/twenty-front/src/loading/components/PageContentSkeletonLoader.tsx+++ b/packages/twenty-front/src/loading/components/PageContentSkeletonLoader.tsx@@ -1,20 +1,9 @@import { SKELETON_LOADER_HEIGHT_SIZES } from '@/activities/components/SkeletonLoader';import { PageCardHeader } from '@/ui/layout/page/components/PageCardHeader';import { PageCardLayout } from '@/ui/layout/page/components/PageCardLayout';-import { styled } from '@linaria/react';import { type ReactNode, useContext } from 'react';import Skeleton, { SkeletonTheme } from 'react-loading-skeleton';-import {- ThemeContext,- themeCssVariables,-} from 'twenty-ui-deprecated/theme-constants';--const StyledBody = styled.div`- display: flex;- flex-direction: column;- gap: ${themeCssVariables.spacing[2]};- padding: ${themeCssVariables.spacing[3]};-`;+import { ThemeContext } from 'twenty-ui-deprecated/theme-constants';type PageContentSkeletonLoaderProps = {secondaryBar?: ReactNode;@@ -41,17 +30,18 @@ export const PageContentSkeletonLoader = ({height={SKELETON_LOADER_HEIGHT_SIZES.standard.s}/>}+ actionButton={+ <Skeleton+ width={80}+ height={SKELETON_LOADER_HEIGHT_SIZES.standard.s}+ />+ }/>}secondaryBar={secondaryBar}showInformationBanner={false}>- <StyledBody>- <Skeleton- count={8}- height={SKELETON_LOADER_HEIGHT_SIZES.standard.l}- />- </StyledBody>+ {null}</PageCardLayout></SkeletonTheme>);diff --git a/packages/twenty-front/src/loading/components/UserOrMetadataLoader.tsx b/packages/twenty-front/src/loading/components/UserOrMetadataLoader.tsxindex 57e67406c84..e6963ba872a 100644--- a/packages/twenty-front/src/loading/components/UserOrMetadataLoader.tsx+++ b/packages/twenty-front/src/loading/components/UserOrMetadataLoader.tsx@@ -12,7 +12,7 @@ import { LeftPanelSkeletonLoader } from '~/loading/components/LeftPanelSkeletonLimport { PageContentSkeletonLoader } from '~/loading/components/PageContentSkeletonLoader';const StyledContainer = styled.div`- background: ${themeCssVariables.background.noisy};+ background: ${themeCssVariables.background.tertiary};box-sizing: border-box;display: flex;flex-direction: row;diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelToggleButton.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelToggleButton.tsxindex 603219ddbe2..a2e3b19d5ac 100644--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelToggleButton.tsx+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelToggleButton.tsx@@ -152,6 +152,7 @@ export const SidePanelToggleButton = () => {dataClickOutsideId={PAGE_HEADER_SIDE_PANEL_BUTTON_CLICK_OUTSIDE_ID}dataTestId="page-header-side-panel-button"size={isMobile ? 'medium' : 'small'}+ squarevariant="secondary"accent="default"ariaLabel={ariaLabel}diff --git a/packages/twenty-front/src/modules/side-panel/constants/SidePanelTopBarHeight.ts b/packages/twenty-front/src/modules/side-panel/constants/SidePanelTopBarHeight.tsindex 574749a328d..b07ac85c0b1 100644--- a/packages/twenty-front/src/modules/side-panel/constants/SidePanelTopBarHeight.ts+++ b/packages/twenty-front/src/modules/side-panel/constants/SidePanelTopBarHeight.ts@@ -1 +1 @@-export const SIDE_PANEL_TOP_BAR_HEIGHT = 40;+export const SIDE_PANEL_TOP_BAR_HEIGHT = 48;diff --git a/packages/twenty-front/src/modules/ui/layout/page/components/DefaultLayout.tsx b/packages/twenty-front/src/modules/ui/layout/page/components/DefaultLayout.tsxindex aa1efd4c8e5..20c09c5fc1a 100644--- a/packages/twenty-front/src/modules/ui/layout/page/components/DefaultLayout.tsx+++ b/packages/twenty-front/src/modules/ui/layout/page/components/DefaultLayout.tsx@@ -25,7 +25,7 @@ import { AnimatePresence, LayoutGroup } from 'framer-motion';import { Outlet } from 'react-router-dom';import { themeCssVariables } from 'twenty-ui-deprecated/theme-constants';const StyledLayout = styled.div`- background: ${themeCssVariables.background.noisy};+ background: ${themeCssVariables.background.tertiary};display: flex;flex-direction: column;height: 100dvh;diff --git a/packages/twenty-front/src/modules/ui/layout/page/components/PageCardLayout.tsx b/packages/twenty-front/src/modules/ui/layout/page/components/PageCardLayout.tsxindex 27bb0c14602..dcc58e01625 100644--- a/packages/twenty-front/src/modules/ui/layout/page/components/PageCardLayout.tsx+++ b/packages/twenty-front/src/modules/ui/layout/page/components/PageCardLayout.tsx@@ -28,6 +28,7 @@ const StyledMainCardWrapper = styled.div`const StyledCard = styled.div`background: ${themeCssVariables.background.primary};border-left: 1px solid ${themeCssVariables.border.color.medium};+ border-radius: 12px 0 0 12px;border-right: 1px solid ${themeCssVariables.border.color.medium};box-sizing: border-box;display: flex;diff --git a/packages/twenty-ui-deprecated/src/input/button/components/AnimatedButton.tsx b/packages/twenty-ui-deprecated/src/input/button/components/AnimatedButton.tsxindex b49596203d4..d439d99d03f 100644--- a/packages/twenty-ui-deprecated/src/input/button/components/AnimatedButton.tsx+++ b/packages/twenty-ui-deprecated/src/input/button/components/AnimatedButton.tsx@@ -20,6 +20,8 @@ export type AnimatedButtonProps = ButtonProps &Pick<MotionProps, 'animate' | 'transition'> & {animatedSvg: React.ReactNode;soonLabel?: string;+ // Renders a square icon-only button (width matches the size-based height).+ square?: boolean;};type AnimatedButtonDynamicStyles = {@@ -315,7 +317,7 @@ const StyledButton = styled.button<| 'target'| 'dataClickOutsideId'| 'dataGloballyPreventClickOutside'- >+ > & { square?: boolean }>`align-items: center;background: var(--abtn-bg);@@ -354,14 +356,23 @@ const StyledButton = styled.button<font-size: ${themeCssVariables.font.size.md};gap: ${themeCssVariables.spacing[1]};height: ${({ size }) => (size === 'small' ? '24px' : '32px')};- justify-content: ${({ justify }) => justify ?? ''};- padding: 0 ${themeCssVariables.spacing[2]};+ justify-content: ${({ justify, square }) =>+ square ? 'center' : (justify ?? '')};+ padding: ${({ square }) =>+ square ? '0' : `0 ${themeCssVariables.spacing[2]}`};transition: background 0.1s ease;white-space: nowrap;- width: ${({ fullWidth }) => (fullWidth ? '100%' : 'auto')};+ width: ${({ fullWidth, square, size }) =>+ square+ ? size === 'small'+ ? '24px'+ : '32px'+ : fullWidth+ ? '100%'+ : 'auto'};&:focus {outline: none;@@ -428,6 +439,7 @@ export const AnimatedButton = ({inverted = false,size = 'medium',accent = 'default',+ square = false,position = 'standalone',soon = false,disabled = false,@@ -476,6 +488,7 @@ export const AnimatedButton = ({as={ButtonComponent}fullWidth={fullWidth}size={size}+ square={square}position={position}disabled={isDisabled}justify={justify}diff --git a/packages/twenty-ui-deprecated/src/input/components/Checkbox.tsx b/packages/twenty-ui-deprecated/src/input/components/Checkbox.tsxindex dee424ddc9b..80d84010e0e 100644--- a/packages/twenty-ui-deprecated/src/input/components/Checkbox.tsx+++ b/packages/twenty-ui-deprecated/src/input/components/Checkbox.tsx@@ -159,6 +159,8 @@ const StyledCheckboxContainer = styled.div<InputProps>`border-radius: var(--checkbox-border-radius);border-style: solid;border-width: var(--checkbox-border-width);+ // The border sits outside the declared label size, so size against the content box.+ box-sizing: content-box;content: '';cursor: var(--checkbox-cursor);display: inline-block;