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

Modal Background & box shadow fixes #8506

Merged
merged 4 commits into from
Nov 15, 2024
Merged

Modal Background & box shadow fixes #8506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d4568ec
Lighten Background Dark
Bonapara Nov 14, 2024
e6ce910
Update BackgroundLight.ts
Bonapara Nov 14, 2024
9b28cbc
Added box shadow variant for modals
Bonapara Nov 14, 2024
50840b1
Removed unwanted box-shadow
Bonapara Nov 15, 2024
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
6 changes: 6 additions & 0 deletions packages/twenty-front/src/modules/ui/layout/modal/components/Modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,14 @@ const StyledModalDiv = styled(motion.div)<{
size?: ModalSize;
padding?: ModalPadding;
isMobile: boolean;
modalVariant: ModalVariants;
}>`
display: flex;
flex-direction: column;
box-shadow: ${({ theme, modalVariant }) =>
modalVariant === 'primary'
? theme.boxShadow.superHeavy
: theme.boxShadow.strong};
background: ${({ theme }) => theme.background.primary};
color: ${({ theme }) => theme.font.color.primary};
border-radius: ${({ theme, isMobile }) => {
Expand Down Expand Up @@ -231,6 +236,7 @@ export const Modal = ({
animate="visible"
exit="exit"
layout
modalVariant={modalVariant}
variants={modalAnimation}
className={className}
isMobile={isMobile}
Expand Down
2 changes: 1 addition & 1 deletion packages/twenty-ui/src/display/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ export * from './icon/types/IconComponent';
export * from './info/components/Info';
export * from './status/components/Status';
export * from './tag/components/Tag';
export * from './text/components/SeparatorLineText';
export * from './text/components/HorizontalSeparator';
export * from './text/components/SeparatorLineText';
export * from './tooltip/AppTooltip';
export * from './tooltip/OverflowingTextWithTooltip';
export * from './typography/components/H1Title';
Expand Down
6 changes: 3 additions & 3 deletions packages/twenty-ui/src/theme/constants/BackgroundDark.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ export const BACKGROUND_DARK = {
lighter: RGBA(GRAY_SCALE.gray0, 0.03),
danger: RGBA(COLOR.red, 0.08),
},
overlayPrimary: RGBA(GRAY_SCALE.gray90, 0.8),
overlaySecondary: RGBA(GRAY_SCALE.gray90, 0.4),
overlayTertiary: RGBA(GRAY_SCALE.gray90, 0.4),
overlayPrimary: RGBA(GRAY_SCALE.gray80, 0.8),
overlaySecondary: RGBA(GRAY_SCALE.gray80, 0.4),
overlayTertiary: RGBA(GRAY_SCALE.gray80, 0.4),
Comment on lines +27 to +28
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style: overlaySecondary and overlayTertiary use identical values - consider using a single constant if they're meant to be the same

radialGradient: `radial-gradient(50% 62.62% at 50% 0%, #505050 0%, ${GRAY_SCALE.gray60} 100%)`,
radialGradientHover: `radial-gradient(76.32% 95.59% at 50% 0%, #505050 0%, ${GRAY_SCALE.gray60} 100%)`,
primaryInverted: GRAY_SCALE.gray20,
Expand Down
6 changes: 3 additions & 3 deletions packages/twenty-ui/src/theme/constants/BackgroundLight.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ export const BACKGROUND_LIGHT = {
lighter: RGBA(GRAY_SCALE.gray100, 0.02),
danger: RGBA(COLOR.red, 0.08),
},
overlayPrimary: RGBA(GRAY_SCALE.gray90, 0.8),
overlaySecondary: RGBA(GRAY_SCALE.gray90, 0.4),
overlayTertiary: RGBA(GRAY_SCALE.gray90, 0.08),
overlayPrimary: RGBA(GRAY_SCALE.gray80, 0.8),
overlaySecondary: RGBA(GRAY_SCALE.gray80, 0.4),
overlayTertiary: RGBA(GRAY_SCALE.gray80, 0.08),
radialGradient: `radial-gradient(50% 62.62% at 50% 0%, #505050 0%, ${GRAY_SCALE.gray60} 100%)`,
radialGradientHover: `radial-gradient(76.32% 95.59% at 50% 0%, #505050 0%, ${GRAY_SCALE.gray60} 100%)`,
primaryInverted: GRAY_SCALE.gray60,
Expand Down
Loading