Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2024-10-27 20:44:07 +00:00
Code Issues Projects Releases Wiki Activity

(core) updates from grist-core

Browse Source
This commit is contained in:
Paul Fitzpatrick 2022-09-09 14:42:01 -04:00
commit c9a81ea7ea
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/client/ui2018/cssVars.ts
View File

@ -499,7 +499,7 @@ export const theme = {
menuShadow: new CustomProp('theme-menu-shadow', undefined, 'rgba(38, 38, 51, 0.6)'), menuShadow: new CustomProp('theme-menu-shadow', undefined, 'rgba(38, 38, 51, 0.6)'),
/* Menu Items */ /* 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), menuItemSelectedFg: new CustomProp('theme-menu-item-selected-fg', undefined, colors.light),
menuItemSelectedBg: new CustomProp('theme-menu-item-selected-bg', undefined, vars.primaryBg), menuItemSelectedBg: new CustomProp('theme-menu-item-selected-bg', undefined, vars.primaryBg),
menuItemDisabledFg: new CustomProp('theme-menu-item-disabled-fg', undefined, '#D9D9D9'), menuItemDisabledFg: new CustomProp('theme-menu-item-disabled-fg', undefined, '#D9D9D9'),
@ -559,11 +559,11 @@ export const theme = {
widgetPickerPrimaryBg: new CustomProp('theme-widget-picker-primary-bg', undefined, 'white'), widgetPickerPrimaryBg: new CustomProp('theme-widget-picker-primary-bg', undefined, 'white'),
widgetPickerSecondaryBg: new CustomProp('theme-widget-picker-secondary-bg', undefined, widgetPickerSecondaryBg: new CustomProp('theme-widget-picker-secondary-bg', undefined,
colors.lightGrey), 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, widgetPickerItemSelectedBg: new CustomProp('theme-widget-picker-item-selected-bg', undefined,
colors.lightGrey), colors.mediumGrey),
widgetPickerItemDisabledBg: new CustomProp('theme-widget-picker-item-disabled-bg', undefined, widgetPickerItemDisabledBg: new CustomProp('theme-widget-picker-item-disabled-bg', undefined,
colors.lightGrey), colors.mediumGrey),
widgetPickerIcon: new CustomProp('theme-widget-picker-icon', undefined, colors.slate), widgetPickerIcon: new CustomProp('theme-widget-picker-icon', undefined, colors.slate),
widgetPickerPrimaryIcon: new CustomProp('theme-widget-picker-primary-icon', undefined, widgetPickerPrimaryIcon: new CustomProp('theme-widget-picker-primary-icon', undefined,
colors.lightGreen), colors.lightGreen),

2
app/client/widgets/ConditionalStyle.ts
View File

@ -226,7 +226,7 @@ const cssRemoveButton = styled(cssIcon, `
cursor: pointer; cursor: pointer;
--icon-color: ${theme.controlSecondaryFg}; --icon-color: ${theme.controlSecondaryFg};
&:hover { &:hover {
--icon-color: ${theme.controlPrimaryFg}; --icon-color: ${theme.controlFg};
} }
`); `);

2
app/common/themes/GristLight.ts
View File

@ -329,7 +329,7 @@ export const GristLight: ThemeColors = {
/* Page Widget Picker */ /* Page Widget Picker */
'widget-picker-primary-bg': 'white', 'widget-picker-primary-bg': 'white',
'widget-picker-secondary-bg': '#F7F7F7', '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-selected-bg': 'rgba(217,217,217,0.6)',
'widget-picker-item-disabled-bg': 'rgba(217,217,217,0.6)', 'widget-picker-item-disabled-bg': 'rgba(217,217,217,0.6)',
'widget-picker-icon': '#929299', 'widget-picker-icon': '#929299',