diff --git a/front/src/generated/graphql.tsx b/front/src/generated/graphql.tsx index ad1149913..d190e0081 100644 --- a/front/src/generated/graphql.tsx +++ b/front/src/generated/graphql.tsx @@ -327,12 +327,25 @@ export type CommentThreadTargetOrderByRelationAggregateInput = { _count?: InputMaybe; }; +export type CommentThreadTargetScalarWhereInput = { + AND?: InputMaybe>; + NOT?: InputMaybe>; + OR?: InputMaybe>; + commentThreadId?: InputMaybe; + commentableId?: InputMaybe; + commentableType?: InputMaybe; + createdAt?: InputMaybe; + id?: InputMaybe; + updatedAt?: InputMaybe; +}; + export type CommentThreadTargetUpdateManyWithoutCommentThreadNestedInput = { connect?: InputMaybe>; connectOrCreate?: InputMaybe>; create?: InputMaybe>; createMany?: InputMaybe; delete?: InputMaybe>; + deleteMany?: InputMaybe>; disconnect?: InputMaybe>; set?: InputMaybe>; }; diff --git a/front/src/modules/ui/button/components/IconButton.tsx b/front/src/modules/ui/button/components/IconButton.tsx index e240d4fc0..fa1b5d3a8 100644 --- a/front/src/modules/ui/button/components/IconButton.tsx +++ b/front/src/modules/ui/button/components/IconButton.tsx @@ -5,13 +5,18 @@ export type IconButtonVariant = 'transparent' | 'border' | 'shadow' | 'white'; export type IconButtonSize = 'large' | 'medium' | 'small'; +export type IconButtonFontColor = 'primary' | 'secondary' | 'tertiary'; + export type ButtonProps = { icon?: React.ReactNode; variant?: IconButtonVariant; size?: IconButtonSize; + textColor?: IconButtonFontColor; } & React.ComponentProps<'button'>; -const StyledIconButton = styled.button>` +const StyledIconButton = styled.button< + Pick +>` align-items: center; background: ${({ theme, variant }) => { switch (variant) { @@ -61,12 +66,12 @@ const StyledIconButton = styled.button>` return 'none'; } }}; - color: ${({ theme, disabled }) => { + color: ${({ theme, disabled, textColor }) => { if (disabled) { return theme.font.color.extraLight; } - return theme.font.color.tertiary; + return theme.font.color[textColor ?? 'secondary']; }}; cursor: ${({ disabled }) => (disabled ? 'not-allowed' : 'pointer')}; display: flex; @@ -115,6 +120,7 @@ export function IconButton({ title, variant = 'transparent', size = 'medium', + textColor = 'tertiary', disabled = false, ...props }: ButtonProps) { @@ -123,6 +129,7 @@ export function IconButton({ variant={variant} size={size} disabled={disabled} + textColor={textColor} {...props} > {icon} diff --git a/front/src/modules/ui/color-scheme/components/ColorSchemeCard.tsx b/front/src/modules/ui/color-scheme/components/ColorSchemeCard.tsx index 9e0127476..76174d186 100644 --- a/front/src/modules/ui/color-scheme/components/ColorSchemeCard.tsx +++ b/front/src/modules/ui/color-scheme/components/ColorSchemeCard.tsx @@ -8,7 +8,7 @@ import { } from 'framer-motion'; import { Checkmark } from '@/ui/checkmark/components/Checkmark'; -import DarkNoise from '@/ui/themes/assets/dark-noise.png'; +import DarkNoise from '@/ui/themes/assets/dark-noise.jpg'; import LightNoise from '@/ui/themes/assets/light-noise.png'; import { grayScale } from '@/ui/themes/colors'; import { ColorScheme } from '~/generated/graphql'; diff --git a/front/src/modules/ui/layout/top-bar/components/TopBar.tsx b/front/src/modules/ui/layout/top-bar/components/TopBar.tsx index abcf31757..a5b2ae82b 100644 --- a/front/src/modules/ui/layout/top-bar/components/TopBar.tsx +++ b/front/src/modules/ui/layout/top-bar/components/TopBar.tsx @@ -78,6 +78,7 @@ export function TopBar({ icon={} size="large" data-testid="add-button" + textColor="secondary" onClick={onAddButtonClick} variant="border" /> diff --git a/front/src/modules/ui/themes/assets/dark-noise.jpg b/front/src/modules/ui/themes/assets/dark-noise.jpg new file mode 100644 index 000000000..6fc95715e Binary files /dev/null and b/front/src/modules/ui/themes/assets/dark-noise.jpg differ diff --git a/front/src/modules/ui/themes/assets/dark-noise.png b/front/src/modules/ui/themes/assets/dark-noise.png deleted file mode 100644 index cd99cbb2e..000000000 Binary files a/front/src/modules/ui/themes/assets/dark-noise.png and /dev/null differ diff --git a/front/src/modules/ui/themes/background.ts b/front/src/modules/ui/themes/background.ts index 10b7e5571..a78eeac31 100644 --- a/front/src/modules/ui/themes/background.ts +++ b/front/src/modules/ui/themes/background.ts @@ -1,4 +1,4 @@ -import DarkNoise from './assets/dark-noise.png'; +import DarkNoise from './assets/dark-noise.jpg'; import LightNoise from './assets/light-noise.png'; import { grayScale, rgba } from './colors'; @@ -16,22 +16,22 @@ export const backgroundLight = { light: rgba(grayScale.gray100, 0.04), lighter: rgba(grayScale.gray100, 0.02), }, - overlay: rgba(grayScale.gray85, 0.8), + overlay: rgba(grayScale.gray80, 0.8), }; export const backgroundDark = { noisy: `url(${DarkNoise.toString()});`, - primary: grayScale.gray90, - secondary: grayScale.gray85, - tertiary: grayScale.gray80, - quaternary: grayScale.gray75, + primary: grayScale.gray85, + secondary: grayScale.gray80, + tertiary: grayScale.gray75, + quaternary: grayScale.gray70, transparent: { - primary: rgba(grayScale.gray90, 0.8), - secondary: rgba(grayScale.gray85, 0.8), - strong: rgba(grayScale.gray0, 0.09), - medium: rgba(grayScale.gray0, 0.06), - light: rgba(grayScale.gray0, 0.03), - lighter: rgba(grayScale.gray0, 0.02), + primary: rgba(grayScale.gray85, 0.8), + secondary: rgba(grayScale.gray80, 0.8), + strong: rgba(grayScale.gray0, 0.14), + medium: rgba(grayScale.gray0, 0.1), + light: rgba(grayScale.gray0, 0.06), + lighter: rgba(grayScale.gray0, 0.03), }, - overlay: rgba(grayScale.gray85, 0.8), + overlay: rgba(grayScale.gray80, 0.8), }; diff --git a/front/src/modules/ui/themes/border.ts b/front/src/modules/ui/themes/border.ts index bb498a457..f43399192 100644 --- a/front/src/modules/ui/themes/border.ts +++ b/front/src/modules/ui/themes/border.ts @@ -22,11 +22,11 @@ export const borderLight = { export const borderDark = { color: { - strong: grayScale.gray65, - medium: grayScale.gray70, - light: grayScale.gray75, - secondaryInverted: grayScale.gray40, - inverted: grayScale.gray30, + strong: grayScale.gray55, + medium: grayScale.gray65, + light: grayScale.gray70, + secondaryInverted: grayScale.gray35, + inverted: grayScale.gray20, }, ...common, }; diff --git a/front/src/modules/ui/themes/colors.ts b/front/src/modules/ui/themes/colors.ts index 9a461e3ff..680e764f3 100644 --- a/front/src/modules/ui/themes/colors.ts +++ b/front/src/modules/ui/themes/colors.ts @@ -2,7 +2,6 @@ import hexRgb from 'hex-rgb'; export const grayScale = { gray100: '#000000', - gray95: '#0f0f0f', gray90: '#141414', gray85: '#171717', gray80: '#1b1b1b', @@ -18,7 +17,7 @@ export const grayScale = { gray30: '#cccccc', gray25: '#d6d6d6', gray20: '#ebebeb', - gray15: '#f5f5f5', + gray15: '#f1f1f1', gray10: '#fcfcfc', gray0: '#ffffff', }; diff --git a/front/src/modules/ui/themes/font.ts b/front/src/modules/ui/themes/font.ts index b5bc16a17..24199075d 100644 --- a/front/src/modules/ui/themes/font.ts +++ b/front/src/modules/ui/themes/font.ts @@ -32,11 +32,11 @@ export const fontLight = { export const fontDark = { color: { - primary: grayScale.gray30, - secondary: grayScale.gray40, - tertiary: grayScale.gray50, - light: grayScale.gray55, - extraLight: grayScale.gray60, + primary: grayScale.gray20, + secondary: grayScale.gray35, + tertiary: grayScale.gray45, + light: grayScale.gray50, + extraLight: grayScale.gray55, inverted: grayScale.gray100, }, ...common, diff --git a/server/src/database/schema.prisma b/server/src/database/schema.prisma index 7ebb1d338..5bf392f1c 100644 --- a/server/src/database/schema.prisma +++ b/server/src/database/schema.prisma @@ -28,7 +28,7 @@ generator nestgraphql { // CommentThread: Only Allow targets createOrConnect / createMany decorate_commentThreadTargets_type = "*CommentThreadTarget*Input" - decorate_commentThreadTargets_field = "*(update|upsert|updateMany|deleteMany)" + decorate_commentThreadTargets_field = "*(update|upsert|updateMany)" decorate_commentThreadTargets_name = "HideField" decorate_commentThreadTargets_from = "@nestjs/graphql" decorate_commentThreadTargets_arguments = "[]"