diff --git a/packages/twenty-front/src/modules/activities/components/ActivityRow.tsx b/packages/twenty-front/src/modules/activities/components/ActivityRow.tsx index 20494b5234..3040417a3c 100644 --- a/packages/twenty-front/src/modules/activities/components/ActivityRow.tsx +++ b/packages/twenty-front/src/modules/activities/components/ActivityRow.tsx @@ -4,13 +4,17 @@ import { CardContent } from 'twenty-ui/layout'; import { themeCssVariables } from 'twenty-ui/theme-constants'; const StyledRowContentContainer = styled.div` - align-items: center; - display: flex; - gap: ${themeCssVariables.spacing[2]}; - height: ${themeCssVariables.spacing[12]}; - padding: ${themeCssVariables.spacing[0]} ${themeCssVariables.spacing[4]}; + > div { + align-items: center; + box-sizing: border-box; + display: flex; + gap: ${themeCssVariables.spacing[2]}; + height: ${themeCssVariables.spacing[12]}; + overflow: hidden; + padding: ${themeCssVariables.spacing[0]} ${themeCssVariables.spacing[4]}; + } - > *[data-clickable='false'] { + > div[data-clickable='false'] { cursor: default; } `; diff --git a/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabList.tsx b/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabList.tsx index 6e94866c2a..39221330d4 100644 --- a/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabList.tsx +++ b/packages/twenty-front/src/modules/page-layout/components/PageLayoutTabList.tsx @@ -68,6 +68,11 @@ const StyledContainer = styled.div` } `; +const StyledDropdownContainer = styled.div` + align-items: center; + display: flex; +`; + const StyledAddButton = styled.div` display: flex; align-items: center; @@ -366,18 +371,20 @@ export const PageLayoutTabList = ({ /> {shouldRenderReorderableDropdown && ( - + + + )} {onAddTab && ( @@ -405,16 +412,18 @@ export const PageLayoutTabList = ({ canReorder={canReorderTabs} /> {shouldRenderStaticDropdown && ( - + + + )} {onAddTab && ( diff --git a/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabList.tsx b/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabList.tsx index 9c74c3cb20..a846b9df2a 100644 --- a/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabList.tsx +++ b/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabList.tsx @@ -34,6 +34,11 @@ const StyledContainer = styled.div` } `; +const StyledDropdownContainer = styled.div` + align-items: center; + display: flex; +`; + const StyledTabContainer = styled.div` display: flex; gap: ${TAB_LIST_GAP}px; @@ -156,20 +161,22 @@ export const TabList = ({ {hasHiddenTabs && ( - { - closeDropdown(dropdownId); - }} - overflow={{ - hiddenTabsCount, - isActiveTabHidden, - }} - hiddenTabs={hiddenTabs} - activeTabId={activeTabId || ''} - onTabSelect={handleTabSelectFromDropdown} - loading={loading} - /> + + { + closeDropdown(dropdownId); + }} + overflow={{ + hiddenTabsCount, + isActiveTabHidden, + }} + hiddenTabs={hiddenTabs} + activeTabId={activeTabId || ''} + onTabSelect={handleTabSelectFromDropdown} + loading={loading} + /> + )} diff --git a/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabMoreButton.tsx b/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabMoreButton.tsx index e91e6e172f..53eb39792a 100644 --- a/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabMoreButton.tsx +++ b/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabMoreButton.tsx @@ -1,14 +1,6 @@ -import { styled } from '@linaria/react'; import { t } from '@lingui/core/macro'; import { IconChevronDown } from 'twenty-ui/display'; import { TabButton } from 'twenty-ui/input'; -import { themeCssVariables } from 'twenty-ui/theme-constants'; - -const StyledTabMoreButtonContainer = styled.div` - > * { - height: ${themeCssVariables.spacing[10]}; - } -`; export const TabMoreButton = ({ hiddenTabsCount, @@ -20,14 +12,12 @@ export const TabMoreButton = ({ className?: string; }) => { return ( - - - + ); };