From 7ff31d0854536724483b0408f1383082b34661c1 Mon Sep 17 00:00:00 2001 From: devanshu052000 Date: Mon, 5 May 2025 22:09:56 +0530 Subject: [PATCH 1/7] Improved UI for color options panel in custom themes modal --- frontend/ee | 2 +- frontend/src/_ui/Icon/solidIcons/Moon.jsx | 23 +++++++++++++++++++ frontend/src/_ui/Icon/solidIcons/index.js | 3 +++ .../ui/Input/EditableTitleInput/Index.jsx | 13 ++++++++--- frontend/src/components/ui/Input/Input.jsx | 2 +- 5 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 frontend/src/_ui/Icon/solidIcons/Moon.jsx diff --git a/frontend/ee b/frontend/ee index 518f3334b1..f0b779a68e 160000 --- a/frontend/ee +++ b/frontend/ee @@ -1 +1 @@ -Subproject commit 518f3334b12a83785fd37dd53b0245d72848211a +Subproject commit f0b779a68ec8a5d40ba78c342df4b98eb507a858 diff --git a/frontend/src/_ui/Icon/solidIcons/Moon.jsx b/frontend/src/_ui/Icon/solidIcons/Moon.jsx new file mode 100644 index 0000000000..913a345c56 --- /dev/null +++ b/frontend/src/_ui/Icon/solidIcons/Moon.jsx @@ -0,0 +1,23 @@ +import React from 'react'; + +const Moon = ({ fill = '#6A727C', width = '24', className = '', viewBox = '0 0 24 24' }) => { + return ( + + + + ); +}; + +export default Moon; diff --git a/frontend/src/_ui/Icon/solidIcons/index.js b/frontend/src/_ui/Icon/solidIcons/index.js index 5daa4b7c91..2a7b801570 100644 --- a/frontend/src/_ui/Icon/solidIcons/index.js +++ b/frontend/src/_ui/Icon/solidIcons/index.js @@ -234,6 +234,7 @@ import NewTabSmall from './NewTabSmall.jsx'; import Code from './Code.jsx'; import WorkflowV3 from './WorkflowV3.jsx'; import WorkspaceV3 from './WorkspaceV3.jsx'; +import Moon from './Moon.jsx'; const Icon = (props) => { switch (props.name) { @@ -707,6 +708,8 @@ const Icon = (props) => { return ; case 'play01': return ; + case 'moon': + return ; default: return ; } diff --git a/frontend/src/components/ui/Input/EditableTitleInput/Index.jsx b/frontend/src/components/ui/Input/EditableTitleInput/Index.jsx index 62ae962970..0ca218e305 100644 --- a/frontend/src/components/ui/Input/EditableTitleInput/Index.jsx +++ b/frontend/src/components/ui/Input/EditableTitleInput/Index.jsx @@ -4,7 +4,7 @@ import { Input } from '../Input'; import { HelperMessage, ValidationMessage } from '../InputUtils/InputUtils'; import Tooltip from '../../Tooltip/Tooltip'; -const EditableTitleInput = ({ size, disabled, helperText, onChange, ...restProps }) => { +const EditableTitleInput = ({ size, disabled, helperText, onChange: change, readOnly, placeholder, ...restProps }) => { const inputRef = useRef(null); const [tooltipWidth, setTooltipWidth] = useState('auto'); const [isValid, setIsValid] = useState(null); @@ -17,7 +17,7 @@ const EditableTitleInput = ({ size, disabled, helperText, onChange, ...restProps setIsValid(validateObj.valid); setMessage(validateObj.message); } - onChange(e, validateObj); + change(e, validateObj); }; const inputStyle = `tw-border-transparent hover:tw-border-border-default tw-font-medium tw-pl-[12px] tw-pr-[12px] ${ @@ -35,7 +35,14 @@ const EditableTitleInput = ({ size, disabled, helperText, onChange, ...restProps return (
- + { type={isPasswordField && isPasswordVisible ? 'text' : type} className={cn( inputVariants({ size }), - `tw-relative tw-peer tw-flex tw-text-[12px]/[18px] tw-w-full tw-rounded-[8px] tw-border-[1px] tw-border-solid tw-bg-background-surface-layer-01 tw-py-[7px] tw-text-text-default focus-visible:tw-ring-[1px] focus-visible:tw-ring-offset-[1px] focus-visible:tw-ring-border-accent-strong focus-visible:tw-ring-offset-border-accent-strong focus-visible:tw-border-transparent disabled:tw-cursor-not-allowed ${props.styles}`, + `tw-peer tw-flex tw-text-[12px]/[18px] tw-w-full tw-rounded-[8px] tw-border-[1px] tw-border-solid tw-bg-background-surface-layer-01 tw-py-[7px] tw-text-text-default focus-visible:tw-ring-[1px] focus-visible:tw-ring-offset-[1px] focus-visible:tw-ring-border-accent-strong focus-visible:tw-ring-offset-border-accent-strong focus-visible:tw-border-transparent disabled:tw-cursor-not-allowed ${props.styles}`, className )} ref={ref} From 31b428747e89cceb01411d8507be0a7516e30099 Mon Sep 17 00:00:00 2001 From: devanshu052000 Date: Tue, 6 May 2025 12:08:02 +0530 Subject: [PATCH 2/7] Improved UI for preview panel --- frontend/ee | 2 +- frontend/src/_styles/theme.scss | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/frontend/ee b/frontend/ee index f0b779a68e..5c92d6a47e 160000 --- a/frontend/ee +++ b/frontend/ee @@ -1 +1 @@ -Subproject commit f0b779a68ec8a5d40ba78c342df4b98eb507a858 +Subproject commit 5c92d6a47ecbc2c7008dd9191c4c17d039ed8fa3 diff --git a/frontend/src/_styles/theme.scss b/frontend/src/_styles/theme.scss index e464a7b86f..4b4445811d 100644 --- a/frontend/src/_styles/theme.scss +++ b/frontend/src/_styles/theme.scss @@ -10781,6 +10781,10 @@ tbody { width: 660px; } +.org-users-page-animation-fade { + height: 100%; +} + .org-users-page { .nav-tabs .nav-link.active { background-color: transparent !important; @@ -10947,6 +10951,25 @@ tbody { } } +.default-group-wrap-small { + gap: 4px; + width: 121px; + height: 28px; + display: flex; + align-items: center; + justify-content: center; + background: var(--indigo3); + border-radius: 6px; + padding: 5px 10px; + + p { + font-weight: 500 !important; + line-height: 18px !important; + color: var(--indigo9); + font-family: 'IBM Plex Sans', sans-serif; + } +} + .sso-icon-wrapper { display: flex; flex-direction: row; From 2e3c346fb5115429b146148ca60f5cbe27f0a05e Mon Sep 17 00:00:00 2001 From: devanshu052000 Date: Tue, 6 May 2025 13:18:29 +0530 Subject: [PATCH 3/7] Added UI for more surface options --- frontend/ee | 2 +- .../modules/organization-themes/constants/index.ts | 12 ++++++++++++ server/src/modules/organization-themes/dto/index.ts | 12 ++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/frontend/ee b/frontend/ee index 5c92d6a47e..f435f12b1f 160000 --- a/frontend/ee +++ b/frontend/ee @@ -1 +1 @@ -Subproject commit 5c92d6a47ecbc2c7008dd9191c4c17d039ed8fa3 +Subproject commit f435f12b1f4dc92f95b070e41b4b307d71e39419 diff --git a/server/src/modules/organization-themes/constants/index.ts b/server/src/modules/organization-themes/constants/index.ts index 5f8041bc52..3b6a4687e5 100644 --- a/server/src/modules/organization-themes/constants/index.ts +++ b/server/src/modules/organization-themes/constants/index.ts @@ -84,6 +84,18 @@ export const TJDefaultTheme: Definition = { light: '#F6F6F6', dark: '#121518', }, + surface1: { + light: '#FFFFFF', + dark: '#1E2226', + }, + surface2: { + light: '#F6F8FA', + dark: '#2B3036', + }, + surface3: { + light: '#E4E7EB', + dark: '#3C434B', + }, }, }, }; diff --git a/server/src/modules/organization-themes/dto/index.ts b/server/src/modules/organization-themes/dto/index.ts index c87f7b1565..24a51106d5 100644 --- a/server/src/modules/organization-themes/dto/index.ts +++ b/server/src/modules/organization-themes/dto/index.ts @@ -121,6 +121,18 @@ class SurfaceColors { @ValidateNested() @Type(() => AppBackgroundColor) appBackground: AppBackgroundColor; + + @ValidateNested() + @Type(() => Color) + surface1: Color; + + @ValidateNested() + @Type(() => Color) + surface2: Color; + + @ValidateNested() + @Type(() => Color) + surface3: Color; } class Surface { From 65539ddbb1de724a023b74234a541ce638495284 Mon Sep 17 00:00:00 2001 From: devanshu052000 Date: Mon, 12 May 2025 14:12:17 +0530 Subject: [PATCH 4/7] Updated the color names --- frontend/ee | 2 +- .../organization-themes/constants/index.ts | 16 ++++++++-------- .../src/modules/organization-themes/dto/index.ts | 16 ++++++++-------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/frontend/ee b/frontend/ee index f435f12b1f..335435aa74 160000 --- a/frontend/ee +++ b/frontend/ee @@ -1 +1 @@ -Subproject commit f435f12b1f4dc92f95b070e41b4b307d71e39419 +Subproject commit 335435aa74f8d56997978d7e6343023ee2726f81 diff --git a/server/src/modules/organization-themes/constants/index.ts b/server/src/modules/organization-themes/constants/index.ts index 3b6a4687e5..581c2181c0 100644 --- a/server/src/modules/organization-themes/constants/index.ts +++ b/server/src/modules/organization-themes/constants/index.ts @@ -31,11 +31,11 @@ export const TJDefaultTheme: Definition = { light: '#1B1F24', dark: '#CFD3D8', }, - secondary: { + placeholder: { light: '#6A727C', dark: '#858C94', }, - tertiary: { + disabled: { light: '#ACB2B9', dark: '#545B64', }, @@ -48,15 +48,15 @@ export const TJDefaultTheme: Definition = { large: 0, }, colors: { - primary: { + default: { light: '#CCD1D5', dark: '#3C434B', }, - secondary: { + weak: { light: '#E4E7EB', dark: '#EEF0F1', }, - tertiary: { + disabled: { light: '#E4E7EB', dark: '#F6F8FA', }, @@ -64,15 +64,15 @@ export const TJDefaultTheme: Definition = { }, systemStatus: { colors: { - primary: { + success: { light: '#1E823B', dark: '#318344', }, - secondary: { + error: { light: '#D72D39', dark: '#D03F43', }, - tertiary: { + warning: { light: '#BF4F03', dark: '#BA5722', }, diff --git a/server/src/modules/organization-themes/dto/index.ts b/server/src/modules/organization-themes/dto/index.ts index 24a51106d5..eb7ac608cd 100644 --- a/server/src/modules/organization-themes/dto/index.ts +++ b/server/src/modules/organization-themes/dto/index.ts @@ -33,12 +33,12 @@ class TextColors { @IsOptional() @ValidateNested() @Type(() => Color) - secondary?: Color; + placeholder?: Color; @IsOptional() @ValidateNested() @Type(() => Color) - tertiary?: Color; + disabled?: Color; } class Text { @@ -64,17 +64,17 @@ class BorderRadius { class BorderColors { @ValidateNested() @Type(() => Color) - primary: Color; + default: Color; @IsOptional() @ValidateNested() @Type(() => Color) - secondary?: Color; + weak?: Color; @IsOptional() @ValidateNested() @Type(() => Color) - tertiary?: Color; + disabled?: Color; } class Border { @@ -90,17 +90,17 @@ class Border { class SystemStatusColors { @ValidateNested() @Type(() => Color) - primary: Color; + success: Color; @IsOptional() @ValidateNested() @Type(() => Color) - secondary?: Color; + error?: Color; @IsOptional() @ValidateNested() @Type(() => Color) - tertiary?: Color; + warning?: Color; } class SystemStatus { From 26c6c3b23259dfd02e10701b6290ed50866c93a2 Mon Sep 17 00:00:00 2001 From: devanshu052000 Date: Mon, 12 May 2025 21:20:15 +0530 Subject: [PATCH 5/7] Fixed UI after design review --- frontend/ee | 2 +- .../src/Editor/Components/RadioButtonV2/RadioButtonV2.jsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/ee b/frontend/ee index 335435aa74..4898ef723f 160000 --- a/frontend/ee +++ b/frontend/ee @@ -1 +1 @@ -Subproject commit 335435aa74f8d56997978d7e6343023ee2726f81 +Subproject commit 4898ef723fe9771a20c5490660103a098241bfdd diff --git a/frontend/src/Editor/Components/RadioButtonV2/RadioButtonV2.jsx b/frontend/src/Editor/Components/RadioButtonV2/RadioButtonV2.jsx index f1a5d171b4..866565252e 100644 --- a/frontend/src/Editor/Components/RadioButtonV2/RadioButtonV2.jsx +++ b/frontend/src/Editor/Components/RadioButtonV2/RadioButtonV2.jsx @@ -191,7 +191,7 @@ export const RadioButtonV2 = ({ data-cy={`label-${String(componentName).toLowerCase()} `} data-disabled={isDisabled} id={String(componentName)} - className={cx('radio-button,', 'd-flex', { + className={cx('radio-button', 'd-flex', { [alignment === 'top' && ((labelWidth != 0 && label?.length != 0) || (labelAutoWidth && labelWidth == 0 && label && label?.length != 0)) @@ -279,7 +279,7 @@ export const RadioButtonV2 = ({
Date: Tue, 13 May 2025 03:37:47 +0530 Subject: [PATCH 6/7] Integrated the theme colors in the preview panel --- frontend/ee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/ee b/frontend/ee index 4898ef723f..07d965e9bd 160000 --- a/frontend/ee +++ b/frontend/ee @@ -1 +1 @@ -Subproject commit 4898ef723fe9771a20c5490660103a098241bfdd +Subproject commit 07d965e9bd4056760a6f603c08abbd5992a660af From 6144a01108ab9a56b01dfda646773c6593e20518 Mon Sep 17 00:00:00 2001 From: devanshu052000 Date: Wed, 14 May 2025 11:12:55 +0530 Subject: [PATCH 7/7] Fix license banner position --- frontend/ee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/ee b/frontend/ee index 07d965e9bd..f2a12a626b 160000 --- a/frontend/ee +++ b/frontend/ee @@ -1 +1 @@ -Subproject commit 07d965e9bd4056760a6f603c08abbd5992a660af +Subproject commit f2a12a626bc56d38375714a90595de32d70220ea