diff --git a/apps/space/styles/globals.css b/apps/space/styles/globals.css index 90b68e1db828..a527f3711dab 100644 --- a/apps/space/styles/globals.css +++ b/apps/space/styles/globals.css @@ -5,10 +5,12 @@ /* stickies and editor colors * Text colors and the themed light/dark background ramps come from * @plane/editor/styles (imported above), which is their single source of truth. - * Only the un-themed :root fallback below is kept: the editor package declares + * Only the un-themed fallback below is kept: the editor package declares * background colors solely under [data-theme*="light"] / [data-theme*="dark"], - * so without this they are undefined until a theme lands on the element. */ -:root { + * so without this they are undefined until a theme lands on the element. + * :where() gives it zero specificity so the themed rules always win; a plain + * :root ties them at (0,1,0) and, coming later, would pin the light ramp. */ +:where(:root) { --editor-colors-gray-background: #d6d6d8; --editor-colors-peach-background: #ffd5d7; --editor-colors-pink-background: #fdd4e3; diff --git a/apps/web/components/editor/sticky-editor/color-palette.tsx b/apps/web/components/editor/sticky-editor/color-palette.tsx index 1bdbaa40e692..3d5963f75268 100644 --- a/apps/web/components/editor/sticky-editor/color-palette.tsx +++ b/apps/web/components/editor/sticky-editor/color-palette.tsx @@ -4,6 +4,8 @@ * See the LICENSE file for details. */ +import { DeactivatedOutline } from "@makeplane/propel/icons"; +import { COLORS_LIST } from "@plane/editor"; import type { TSticky } from "@plane/types"; export const STICKY_COLORS_LIST: { @@ -55,18 +57,46 @@ export const STICKY_COLORS_LIST: { type TProps = { handleUpdate: (data: Partial) => Promise; + handleTextColorSelect: (color: string | undefined) => void; }; export function ColorPalette(props: TProps) { - const { handleUpdate } = props; + const { handleUpdate, handleTextColorSelect } = props; return (
+
Text colors
+
+ {COLORS_LIST.map((color) => ( + +
Background colors
{STICKY_COLORS_LIST.map((color) => ( diff --git a/apps/web/styles/globals.css b/apps/web/styles/globals.css index aa573543acf9..bb8ca36cf6e7 100644 --- a/apps/web/styles/globals.css +++ b/apps/web/styles/globals.css @@ -7,10 +7,12 @@ /* stickies and editor colors * Text colors and the themed light/dark background ramps come from * @plane/editor/styles (imported above), which is their single source of truth. - * Only the un-themed :root fallback below is kept: the editor package declares + * Only the un-themed fallback below is kept: the editor package declares * background colors solely under [data-theme*="light"] / [data-theme*="dark"], - * so without this they are undefined until a theme lands on the element. */ -:root { + * so without this they are undefined until a theme lands on the element. + * :where() gives it zero specificity so the themed rules always win; a plain + * :root ties them at (0,1,0) and, coming later, would pin the light ramp. */ +:where(:root) { --editor-colors-gray-background: #d6d6d8; --editor-colors-peach-background: #ffd5d7; --editor-colors-pink-background: #fdd4e3;