Skip to content

Commit

Permalink
feat(MultipleTooltip): use uikit background color instead of private (#…
Browse files Browse the repository at this point in the history
…235)

* feat(MultipleTooltip): use uikit background color instead of private

* fix: peerDependencies update
  • Loading branch information
kendoow authored May 13, 2024
1 parent 34af19c commit 5bbb3ca
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 17 deletions.
10 changes: 5 additions & 5 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"@gravity-ui/prettier-config": "^1.0.0",
"@gravity-ui/stylelint-config": "^4.0.1",
"@gravity-ui/tsconfig": "^1.0.0",
"@gravity-ui/uikit": "^6.13.0",
"@gravity-ui/uikit": "^6.15.0",
"@rollup/plugin-commonjs": "^22.0.0",
"@rollup/plugin-node-resolve": "^13.3.0",
"@rollup/plugin-typescript": "^8.3.3",
Expand Down Expand Up @@ -98,7 +98,7 @@
"@bem-react/classname": "^1.6.0",
"@gravity-ui/components": "^3.0.0",
"@gravity-ui/icons": "^2.2.0",
"@gravity-ui/uikit": "^6.13.0",
"@gravity-ui/uikit": "^6.15.0",
"react": "^16.0.0 || ^17.0.0 || ^18.0.0",
"react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0"
},
Expand Down
11 changes: 1 addition & 10 deletions src/components/CompositeBar/MultipleTooltip/MultipleTooltip.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ $block: '.#{variables.$ns}multiple-tooltip';

.g-root_theme_dark #{$block},
.g-root_theme_dark-hc #{$block} {
// TODO: Replace private color variable with special one which should appear in next uikit major version
--multiple-tooltip-item-bg-color: var(--g-color-private-white-100-solid);
--multiple-tooltip-item-active-bg-color: var(--g-color-base-float-heavy);
--multiple-tooltip-backdrop-background: linear-gradient(
90deg,
Expand All @@ -15,15 +13,8 @@ $block: '.#{variables.$ns}multiple-tooltip';
--multiple-tooltip-backdrop-filter: blur(16px);
}

.g-root_theme_dark-hc #{$block} {
// TODO: Replace private color variable with special one which should appear in next uikit major version
--multiple-tooltip-item-bg-color: var(--g-color-private-white-150-solid);
}

.g-root_theme_light #{$block},
.g-root_theme_light-hc #{$block} {
// TODO: Replace private color variable with special one which should appear in next uikit major version
--multiple-tooltip-item-bg-color: var(--g-color-private-black-550-solid);
--multiple-tooltip-item-active-bg-color: var(--g-color-base-float-heavy);
--multiple-tooltip-backdrop-background: linear-gradient(
90deg,
Expand Down Expand Up @@ -63,7 +54,7 @@ $block: '.#{variables.$ns}multiple-tooltip';
box-sizing: border-box;
height: 30px;
padding: 8px 12px;
background-color: var(--multiple-tooltip-item-bg-color);
background-color: var(--g-color-base-float-medium);
position: relative;
border-radius: 5px;
align-items: center;
Expand Down

0 comments on commit 5bbb3ca

Please sign in to comment.