Skip to content

Commit

Permalink
Merge branch 'master' into SHRUI-987
Browse files Browse the repository at this point in the history
  • Loading branch information
oti authored Jun 13, 2024
2 parents 3cb4633 + 71053ed commit aef9614
Show file tree
Hide file tree
Showing 4 changed files with 128 additions and 124 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
"@commitlint/cli": "^19.3.0",
"@commitlint/config-conventional": "^19.2.2",
"eslint": "^8.57.0",
"eslint-config-smarthr": "^6.30.2",
"eslint-config-smarthr": "^6.32.0",
"eslint-plugin-storybook": "^0.8.0",
"husky": "^9.0.11",
"lint-staged": "^15.2.5",
"prettier": "^3.3.1",
"prettier-config-smarthr": "^1.0.0",
"prettier-plugin-tailwindcss": "^0.6.2",
"prettier-plugin-tailwindcss": "^0.6.4",
"stylelint": "^16.6.1",
"stylelint-config-prettier": "^9.0.5",
"stylelint-config-smarthr": "^3.0.1",
Expand All @@ -27,7 +27,7 @@
"commitmsg": "commitlint -e $GIT_PARAMS",
"prepare": "husky"
},
"packageManager": "pnpm@9.2.0",
"packageManager": "pnpm@9.3.0",
"pnpm": {
"overrides": {
"@babel/helper-compilation-targets": "^7.24.7",
Expand Down
4 changes: 1 addition & 3 deletions packages/smarthr-ui/src/components/Tooltip/Tooltip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,7 @@ type ElementProps = Omit<ComponentProps<'span'>, keyof Props | 'aria-describedby
const tooltip = tv({
base: [
'smarthr-ui-Tooltip',
'shr-inline-block shr-max-w-full shr-overflow-y-hidden',
/* inline-block に overflow: visible 以外を指定すると、vertical-align が bottom margin edge に揃ってしまう
* https://ja.stackoverflow.com/questions/2603/ */
'shr-inline-block shr-max-w-full',
'shr-align-bottom',
'focus-visible:shr-focus-indicator',
],
Expand Down
Loading

0 comments on commit aef9614

Please sign in to comment.