diff --git a/frontend/src/components/DataGrid.layout.test.tsx b/frontend/src/components/DataGrid.layout.test.tsx index 53b4050a..d43a4fb1 100644 --- a/frontend/src/components/DataGrid.layout.test.tsx +++ b/frontend/src/components/DataGrid.layout.test.tsx @@ -2237,9 +2237,28 @@ describe('DataGrid layout', () => { css.indexOf('body[data-ui-version="v2"] .gn-v2-data-grid .gn-v2-data-grid-toolbar-action {'), css.indexOf('body[data-ui-version="v2"] .gn-v2-data-grid-toolbar-title {'), ); + const commitBaseCss = css.slice( + css.indexOf('body[data-ui-version="v2"] .gn-v2-data-grid .gn-v2-commit-button {'), + css.indexOf('body[data-ui-version="v2"] .gn-v2-data-grid .gn-v2-commit-button:hover,'), + ); + const commitInteractiveCss = css.slice( + css.indexOf('body[data-ui-version="v2"] .gn-v2-data-grid .gn-v2-commit-button:hover,'), + css.indexOf('body[data-ui-version="v2"] .gn-v2-data-grid .gn-v2-commit-button:disabled {'), + ); + const commitDisabledCss = css.slice( + css.indexOf('body[data-ui-version="v2"] .gn-v2-data-grid .gn-v2-commit-button:disabled {'), + css.indexOf('body[data-ui-version="v2"] .gn-v2-data-grid .gn-v2-commit-button .gn-v2-toolbar-kbd {'), + ); expect(iconActionCss).toContain('width: 28px !important;'); expect(iconActionCss).toContain('min-width: 28px !important;'); expect(iconActionCss).toContain('padding-inline: 0 !important;'); + expect(commitBaseCss).toContain('background: var(--gn-accent) !important;'); + expect(commitBaseCss).toContain('color: var(--gn-on-accent, #fff) !important;'); + expect(commitInteractiveCss).toContain('background: var(--gn-accent-2) !important;'); + expect(commitInteractiveCss).toContain('box-shadow:'); + expect(commitDisabledCss).toContain('background: var(--gn-bg-active) !important;'); + expect(commitDisabledCss).toContain('color: var(--gn-fg-5) !important;'); + expect(commitDisabledCss).not.toContain('var(--gn-accent-soft)'); expect(css).toContain( 'body[data-ui-version="v2"] .gn-v2-data-grid-statusbar .gn-v2-data-grid-toolbar-action.ant-btn {', ); diff --git a/frontend/src/v2-theme.css b/frontend/src/v2-theme.css index 392a4af3..d2688041 100644 --- a/frontend/src/v2-theme.css +++ b/frontend/src/v2-theme.css @@ -4051,16 +4051,28 @@ body[data-ui-version="v2"] .gn-v2-toolbar-kbd { } body[data-ui-version="v2"] .gn-v2-data-grid .gn-v2-commit-button { - border-color: transparent !important; - background: var(--gn-accent-soft) !important; - color: var(--gn-accent-2) !important; + border-color: var(--gn-accent-2) !important; + background: var(--gn-accent) !important; + color: var(--gn-on-accent, #fff) !important; font-weight: 750 !important; } +body[data-ui-version="v2"] .gn-v2-data-grid .gn-v2-commit-button:hover, +body[data-ui-version="v2"] .gn-v2-data-grid .gn-v2-commit-button:focus, +body[data-ui-version="v2"] .gn-v2-data-grid .gn-v2-commit-button:focus-visible, +body[data-ui-version="v2"] .gn-v2-data-grid .gn-v2-commit-button:active { + border-color: var(--gn-accent-2) !important; + background: var(--gn-accent-2) !important; + color: var(--gn-on-accent, #fff) !important; + box-shadow: var(--gn-shadow-sm), inset 0 0.5px 0 rgba(255, 255, 255, 0.15) !important; +} + body[data-ui-version="v2"] .gn-v2-data-grid .gn-v2-commit-button:disabled { opacity: 1; - background: var(--gn-accent-soft) !important; - color: var(--gn-accent-2) !important; + border-color: var(--gn-br-2) !important; + background: var(--gn-bg-active) !important; + color: var(--gn-fg-5) !important; + box-shadow: none !important; } body[data-ui-version="v2"] .gn-v2-data-grid .gn-v2-commit-button .gn-v2-toolbar-kbd {