Skip to content

Commit

Permalink
Merge branch 'master' into chore/bump-antd-tools
Browse files Browse the repository at this point in the history
  • Loading branch information
MadCcc committed Nov 27, 2023
2 parents 9311b85 + 8f566a0 commit 3626c88
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/visual-regression-persist-start.yml
Expand Up @@ -15,6 +15,7 @@ jobs:
setup:
name: prepare node_modules
runs-on: ubuntu-latest
container: ghcr.io/puppeteer/puppeteer:21.5.2
steps:
- name: checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -67,7 +68,9 @@ jobs:

- name: generate image snapshots
id: site
run: npm run test-image
run: |
npm run version
npm run test-image
env:
SITE_ENV: development
NODE_OPTIONS: "--max_old_space_size=4096"
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -61,7 +61,7 @@ components/version/token-meta.json
__diff_output__/
__image_snapshots__/
/jest-stare
/imageSnapshots
/imageSnapshots*
/imageDiffSnapshots

.devcontainer*
Expand Down
2 changes: 1 addition & 1 deletion components/input/style/index.ts
Expand Up @@ -121,7 +121,7 @@ export const genDisabledStyle = (token: InputToken): CSSObject => ({
cursor: 'not-allowed',
opacity: 1,

'&:hover': {
'&:hover:not([disabled])': {
...genHoverStyle(
mergeToken<InputToken>(token, {
hoverBorderColor: token.colorBorder,
Expand Down

0 comments on commit 3626c88

Please sign in to comment.