From 965cf7e0765d45ff340fd012dc5609d2a87cbd41 Mon Sep 17 00:00:00 2001 From: George Gevoian Date: Thu, 8 Sep 2022 14:30:46 -0700 Subject: [PATCH 1/2] Fix incorrect CSS fallback values --- app/client/ui2018/cssVars.ts | 6 +++--- app/common/themes/GristLight.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/client/ui2018/cssVars.ts b/app/client/ui2018/cssVars.ts index 217f11ca..ab6ffd24 100644 --- a/app/client/ui2018/cssVars.ts +++ b/app/client/ui2018/cssVars.ts @@ -559,11 +559,11 @@ export const theme = { widgetPickerPrimaryBg: new CustomProp('theme-widget-picker-primary-bg', undefined, 'white'), widgetPickerSecondaryBg: new CustomProp('theme-widget-picker-secondary-bg', undefined, colors.lightGrey), - widgetPickerItemFg: new CustomProp('theme-widget-picker-item-fg', undefined, colors.lightGrey), + widgetPickerItemFg: new CustomProp('theme-widget-picker-item-fg', undefined, 'unset'), widgetPickerItemSelectedBg: new CustomProp('theme-widget-picker-item-selected-bg', undefined, - colors.lightGrey), + colors.mediumGrey), widgetPickerItemDisabledBg: new CustomProp('theme-widget-picker-item-disabled-bg', undefined, - colors.lightGrey), + colors.mediumGrey), widgetPickerIcon: new CustomProp('theme-widget-picker-icon', undefined, colors.slate), widgetPickerPrimaryIcon: new CustomProp('theme-widget-picker-primary-icon', undefined, colors.lightGreen), diff --git a/app/common/themes/GristLight.ts b/app/common/themes/GristLight.ts index 8477bf01..7dbefb68 100644 --- a/app/common/themes/GristLight.ts +++ b/app/common/themes/GristLight.ts @@ -329,7 +329,7 @@ export const GristLight: ThemeColors = { /* Page Widget Picker */ 'widget-picker-primary-bg': 'white', 'widget-picker-secondary-bg': '#F7F7F7', - 'widget-picker-item-fg': 'black', + 'widget-picker-item-fg': 'unset', 'widget-picker-item-selected-bg': 'rgba(217,217,217,0.6)', 'widget-picker-item-disabled-bg': 'rgba(217,217,217,0.6)', 'widget-picker-icon': '#929299', From 4ee47e9c1d67f9269f276b9298f0f83308c4b91c Mon Sep 17 00:00:00 2001 From: George Gevoian Date: Thu, 8 Sep 2022 15:04:14 -0700 Subject: [PATCH 2/2] Fix a few more CSS values --- app/client/ui2018/cssVars.ts | 2 +- app/client/widgets/ConditionalStyle.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/client/ui2018/cssVars.ts b/app/client/ui2018/cssVars.ts index ab6ffd24..92f9fc56 100644 --- a/app/client/ui2018/cssVars.ts +++ b/app/client/ui2018/cssVars.ts @@ -499,7 +499,7 @@ export const theme = { menuShadow: new CustomProp('theme-menu-shadow', undefined, 'rgba(38, 38, 51, 0.6)'), /* Menu Items */ - menuItemFg: new CustomProp('theme-menu-item-fg', undefined, 'unset'), + menuItemFg: new CustomProp('theme-menu-item-fg', undefined, 'black'), menuItemSelectedFg: new CustomProp('theme-menu-item-selected-fg', undefined, colors.light), menuItemSelectedBg: new CustomProp('theme-menu-item-selected-bg', undefined, vars.primaryBg), menuItemDisabledFg: new CustomProp('theme-menu-item-disabled-fg', undefined, '#D9D9D9'), diff --git a/app/client/widgets/ConditionalStyle.ts b/app/client/widgets/ConditionalStyle.ts index 121cbc97..aea7ffaa 100644 --- a/app/client/widgets/ConditionalStyle.ts +++ b/app/client/widgets/ConditionalStyle.ts @@ -226,7 +226,7 @@ const cssRemoveButton = styled(cssIcon, ` cursor: pointer; --icon-color: ${theme.controlSecondaryFg}; &:hover { - --icon-color: ${theme.controlPrimaryFg}; + --icon-color: ${theme.controlFg}; } `);