fix(): several ui improvements (#10556)

Close #10531

---------

Co-authored-by: Lucas Bordeau <bordeau.lucas@gmail.com>
Co-authored-by: Etienne <45695613+etiennejouan@users.noreply.github.com>
Co-authored-by: Raphaël Bosi <71827178+bosiraphael@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: github-actions <github-actions@twenty.com>
This commit is contained in:
Antoine Moreaux
2025-03-03 17:06:16 +01:00
committed by GitHub
parent a5d60919a7
commit e8b6b1b941
15 changed files with 88 additions and 101 deletions

View File

@ -19,6 +19,7 @@ export type CurrentWorkspace = Pick<
| 'isMicrosoftAuthEnabled'
| 'isPasswordAuthEnabled'
| 'hasValidEnterpriseKey'
| 'isCustomDomainEnabled'
| 'subdomain'
| 'customDomain'
| 'workspaceUrls'

View File

@ -28,6 +28,8 @@ const Wrapper = getJestMetadataAndApolloMocksAndActionMenuWrapper({
isGoogleAuthEnabled: true,
isMicrosoftAuthEnabled: false,
isPasswordAuthEnabled: true,
customDomain: 'my-custom-domain.com',
isCustomDomainEnabled: true,
workspaceUrls: {
subdomainUrl: 'https://twenty.twenty.com',
customUrl: 'https://my-custom-domain.com',

View File

@ -24,10 +24,6 @@ const StyledCard = styled(Card)<{
cursor: ${({ disabled, onClick }) =>
disabled ? 'not-allowed' : onClick ? 'pointer' : 'default'};
width: 100%;
& :hover {
background-color: ${({ theme }) => theme.background.quaternary};
cursor: pointer;
}
`;
const StyledCardContent = styled(CardContent)<object>`
@ -35,6 +31,11 @@ const StyledCardContent = styled(CardContent)<object>`
flex-direction: column;
gap: ${({ theme }) => theme.spacing(2)};
padding: ${({ theme }) => theme.spacing(2, 2)};
&:hover {
background-color: ${({ theme }) => theme.background.quaternary};
cursor: pointer;
}
`;
const StyledHeader = styled.div`

View File

@ -23,6 +23,7 @@ const StyledSettingsPageContainer = styled.div<{
return OBJECT_SETTINGS_WIDTH + 'px';
}};
padding-bottom: ${({ theme }) => theme.spacing(20)};
height: 100%;
`;
export const SettingsPageContainer = ({

View File

@ -11,13 +11,7 @@ import {
useRef,
useState,
} from 'react';
import {
AutogrowWrapper,
IconComponent,
IconEye,
IconEyeOff,
Loader,
} from 'twenty-ui';
import { AutogrowWrapper, IconComponent, IconEye, IconEyeOff } from 'twenty-ui';
import { useCombinedRefs } from '~/hooks/useCombinedRefs';
import { turnIntoEmptyStringIfWhitespacesOnly } from '~/utils/string/turnIntoEmptyStringIfWhitespacesOnly';
@ -202,7 +196,6 @@ export type TextInputV2ComponentProps = Omit<
dataTestId?: string;
sizeVariant?: TextInputV2Size;
inheritFontStyles?: boolean;
loading?: boolean;
rightAdornment?: string;
leftAdornment?: string;
};
@ -240,7 +233,6 @@ const TextInputV2Component = forwardRef<
inheritFontStyles = false,
dataTestId,
autoGrow = false,
loading = false,
rightAdornment,
leftAdornment,
},
@ -349,12 +341,6 @@ const TextInputV2Component = forwardRef<
<RightIcon size={theme.icon.size.md} />
</StyledTrailingIcon>
)}
{!error && type !== INPUT_TYPE_PASSWORD && !!loading && (
<StyledTrailingIcon>
<Loader color={'gray'} />
</StyledTrailingIcon>
)}
</StyledTrailingIconContainer>
</StyledInputContainer>
{!noErrorHelper && error && (

View File

@ -45,6 +45,7 @@ export const USER_QUERY_FRAGMENT = gql`
subdomain
hasValidEnterpriseKey
customDomain
isCustomDomainEnabled
workspaceUrls {
subdomainUrl
customUrl