admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix issues post merge

Browse Source
This commit is contained in:
Charles Bochet
2023-11-17 22:59:10 +01:00
parent a8b6edd4a8
commit e72917c69c
5 changed files with 27 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
front/src/modules/ui/input/components/Toggle.tsx
View File

@ -23,12 +23,12 @@ const StyledContainer = styled.div<ContainerProps>`
`;
const StyledCircle = styled(motion.div)<{
toggleSize: ToggleSize;
size: ToggleSize;
}>`
background-color: ${({ theme }) => theme.background.primary};
border-radius: 50%;
height: ${({ toggleSize }) => (toggleSize === 'small' ? 12 : 16)}px;
width: ${({ toggleSize }) => (toggleSize === 'small' ? 12 : 16)}px;
height: ${({ size }) => (size === 'small' ? 12 : 16)}px;
width: ${({ size }) => (size === 'small' ? 12 : 16)}px;
`;
export type ToggleProps = {
@ -76,7 +76,7 @@ export const Toggle = ({
<StyledCircle
animate={isOn ? 'on' : 'off'}
variants={circleVariants}
toggleSize={toggleSize}
size={toggleSize}
/>
</StyledContainer>
);

2
front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx
View File

@ -65,7 +65,7 @@ export const SettingsObjectNewFieldStep2 = () => {
},
});
if (!activeObjectMetadataItem || !objectViews.length) return null;
if (!activeObjectMetadataItem) return null;
const canSave = !!formValues.label;