Merge pull request #998 from aaronreed708/fix-colorpicker-oncolor

#946: fix color picker hex value text not con…
finos · Aug 13, 2024 · 75b8f58 · 75b8f58
2 parents c0909c7 + 65718db
commit 75b8f58
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/code/src/ui/src/components/ColorShade.css b/code/src/ui/src/components/ColorShade.css
@@ -1,4 +1,4 @@
-<<<<<<< Updated upstream ======= .color-block {
+.color-block {
     display: inline-block;
     font-size: 11px;
     width: 96px;
@@ -29,6 +29,6 @@ li .Hex {
     text-align: center !important;
 }
 
->>>>>>>Stashed changes .swatch-details.active {
+.swatch-details.active {
     display: block;
 }
diff --git a/code/src/ui/src/pages/atoms/ColorPaletteAtom.tsx b/code/src/ui/src/pages/atoms/ColorPaletteAtom.tsx
@@ -195,7 +195,7 @@ export const ColorPaletteAtom: React.FC<Props> = ({
                                 sx={{
                                     backgroundColor: `${_blockPickerColor}`,
                                     input: {
-                                        color: `${_blockPickerOnColor}`,
+                                        color: `${_blockPickerOnColor} !important`,
                                     },
                                 }}
                             />