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

Fix control-border CSS regression (#388)

Browse Source
This commit is contained in:
George Gevoian 2023-01-03 10:16:23 -05:00 committed by GitHub
parent cabac3d9d8
commit 77e85c132c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/client/ui2018/buttons.ts
View File

@ -33,9 +33,8 @@ export const cssButton = styled('button', `
color: ${theme.controlFg}; color: ${theme.controlFg};
--icon-color: ${theme.controlFg}; --icon-color: ${theme.controlFg};
border: ${vars.controlBorder}; border: ${theme.controlBorder};
border-radius: ${vars.controlBorderRadius}; border-radius: ${vars.controlBorderRadius};
border-color: ${theme.controlBorder};
cursor: pointer; cursor: pointer;

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

@ -359,7 +359,7 @@ export const theme = {
controlDisabledBg: new CustomProp('theme-control-disabled-bg', undefined, colors.slate), controlDisabledBg: new CustomProp('theme-control-disabled-bg', undefined, colors.slate),
controlPrimaryDisabled: new CustomProp('theme-control-primary-disabled', undefined, controlPrimaryDisabled: new CustomProp('theme-control-primary-disabled', undefined,
colors.inactiveCursor), colors.inactiveCursor),
controlBorder: new CustomProp('theme-control-border', undefined, '#11B683'), controlBorder: new CustomProp('theme-control-border', undefined, vars.controlBorder),
/* Checkboxes */ /* Checkboxes */
checkboxBg: new CustomProp('theme-checkbox-bg', undefined, colors.light), checkboxBg: new CustomProp('theme-checkbox-bg', undefined, colors.light),

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

@ -175,7 +175,7 @@ export const GristDark: ThemeColors = {
'control-disabled-fg': '#A4A4A4', 'control-disabled-fg': '#A4A4A4',
'control-disabled-bg': '#69697D', 'control-disabled-bg': '#69697D',
'control-primary-disabled': '#5F8C7B', 'control-primary-disabled': '#5F8C7B',
'control-border': '#11B683', 'control-border': '1px solid #1DA270',
/* Checkboxes */ /* Checkboxes */
'checkbox-bg': '#32323F', 'checkbox-bg': '#32323F',

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

@ -175,7 +175,7 @@ export const GristLight: ThemeColors = {
'control-disabled-fg': '#FFFFFF', 'control-disabled-fg': '#FFFFFF',
'control-disabled-bg': '#929299', 'control-disabled-bg': '#929299',
'control-primary-disabled': '#A2E1C9', 'control-primary-disabled': '#A2E1C9',
'control-border': '#11B683', 'control-border': '1px solid #11B683',
/* Checkboxes */ /* Checkboxes */
'checkbox-bg': '#FFFFFF', 'checkbox-bg': '#FFFFFF',