Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(ui/settings): update styles and improve structure #10201

Merged
merged 5 commits into from
Feb 14, 2025
+6 −8
Merged

refactor(ui/settings): update styles and improve structure #10201

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
63f915c
refactor(ui/settings): update styles and improve structure
AMoreaux Feb 13, 2025
99a33cb
Update packages/twenty-ui/src/display/text/components/HorizontalSepar…
AMoreaux Feb 13, 2025
c700b33
Merge branch 'main' into fix/sso-form-ui
AMoreaux Feb 13, 2025
77acfe4
fix: remove unnecessary parentheses in HorizontalSeparator
AMoreaux Feb 13, 2025
91fade6
Merge branch 'main' into fix/sso-form-ui
AMoreaux Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/twenty-front/src/modules/settings/components/SettingsRadioCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const StyledRadioCardContent = styled(CardContent)`
display: flex;
align-items: center;
padding: ${({ theme }) => theme.spacing(2)};
border: 1px solid ${({ theme }) => theme.border.color.light};
border: 1px solid ${({ theme }) => theme.border.color.medium};
border-radius: ${({ theme }) => theme.border.radius.sm};
flex-grow: 1;
gap: ${({ theme }) => theme.spacing(2)};
Expand Down
5 changes: 1 addition & 4 deletions ...nty-front/src/modules/settings/security/components/SettingsSSOIdentitiesProvidersForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@ const StyledInputsContainer = styled.div`
display: grid;
gap: ${({ theme }) => theme.spacing(2, 4)};
grid-template-columns: 1fr 1fr;
grid-template-areas:
'input-1 input-1'
'input-2 input-3'
'input-4 input-5';
grid-template-areas: 'input-1 input-1';

& :first-of-type {
grid-area: input-1;
Expand Down
9 changes: 6 additions & 3 deletions packages/twenty-ui/src/display/text/components/HorizontalSeparator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import styled from '@emotion/styled';
import { JSX } from 'react';
import { Label } from '@ui/display';

type HorizontalSeparatorProps = {
visible?: boolean;
Expand Down Expand Up @@ -31,9 +32,7 @@ const StyledLine = styled.div<HorizontalSeparatorProps>`
`;

const StyledText = styled.span`
color: ${({ theme }) => theme.font.color.light};
margin: 0 ${({ theme }) => theme.spacing(2)};
white-space: nowrap;
`;

export const HorizontalSeparator = ({
Expand All @@ -46,7 +45,11 @@ export const HorizontalSeparator = ({
{text ? (
<StyledSeparatorContainer noMargin={noMargin}>
<StyledLine visible={visible} />
{text && <StyledText>{text}</StyledText>}
{text && (
AMoreaux marked this conversation as resolved.
Show resolved Hide resolved
<Label>
<StyledText>{text}</StyledText>
</Label>
)}
<StyledLine visible={visible} />
</StyledSeparatorContainer>
) : (
Expand Down
Loading