Skip to content

Commit

Permalink
Merge branch 'master' into fix/lineclamp/unexpected-tooltip-shown@970
Browse files Browse the repository at this point in the history
  • Loading branch information
Qs-F authored Jun 11, 2024
2 parents abe5845 + 7abbf1a commit b5a1e3e
Show file tree
Hide file tree
Showing 6 changed files with 83 additions and 73 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"@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",
Expand Down
12 changes: 12 additions & 0 deletions packages/smarthr-ui/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [51.2.0](https://github.com/kufu/smarthr-ui/compare/v51.1.1...v51.2.0) (2024-06-11)


### Features

* PageCounterのレイアウトを変更 ([#4685](https://github.com/kufu/smarthr-ui/issues/4685)) ([e864580](https://github.com/kufu/smarthr-ui/commit/e864580b69047316dda14574886fd0dacd8e013d))


### Bug Fixes

* **Balloon:** Safariで影の表示が崩れるバグを修正 ([#4697](https://github.com/kufu/smarthr-ui/issues/4697)) ([ffd29a8](https://github.com/kufu/smarthr-ui/commit/ffd29a8aafdbcc5a13ce0abd668ac605ad7dc17b))

### [51.1.1](https://github.com/kufu/smarthr-ui/compare/v51.1.0...v51.1.1) (2024-06-05)


Expand Down
2 changes: 1 addition & 1 deletion packages/smarthr-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "smarthr-ui",
"description": "SmartHR ui components built with React.",
"version": "51.1.1",
"version": "51.2.0",
"author": "SmartHR-UI Team",
"dependencies": {
"@smarthr/wareki": "^1.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/smarthr-ui/public/exports/smarthr-ui-props.json

Large diffs are not rendered by default.

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
134 changes: 67 additions & 67 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b5a1e3e

Please sign in to comment.