Skip to content

Commit

Permalink
feat!: move to uikit v5 (#74)
Browse files Browse the repository at this point in the history
* feat!: move to uikit v5 (#68)

* feat: new component actions toolbar (#71)

* feat: new component actions toolbar

* fix: styles and imports

* feat: add imports of actions toolbar (#72)

* feat: add imports of actions toolbar

* fix: import

* chore: bump uikit to stable version (#73)

* Revert "feat: add imports of actions toolbar (#72)"

This reverts commit 4923a99.

* Revert "feat: new component actions toolbar (#71)"

This reverts commit 5a3aeea.

* chore: lock fixes

---------

Co-authored-by: Anastasia <[email protected]>
  • Loading branch information
korvin89 and Estasie authored Jul 17, 2023
1 parent 47c32f5 commit 7df9c49
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 83 deletions.
74 changes: 5 additions & 69 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 @@ -41,7 +41,7 @@
"react-grid-layout": "^1.3.4"
},
"peerDependencies": {
"@gravity-ui/uikit": "^4.0.0",
"@gravity-ui/uikit": "^5.0.0",
"bem-cn-lite": "^4.0.0",
"react": "^16.8.0 || ^17 || ^18"
},
Expand All @@ -52,7 +52,7 @@
"@gravity-ui/prettier-config": "^1.0.1",
"@gravity-ui/stylelint-config": "^1.0.1",
"@gravity-ui/tsconfig": "^1.0.0",
"@gravity-ui/uikit": "^4.0.5",
"@gravity-ui/uikit": "^5.0.0",
"@storybook/addon-essentials": "^7.0.18",
"@storybook/addon-knobs": "^7.0.2",
"@storybook/cli": "^7.0.18",
Expand Down
4 changes: 2 additions & 2 deletions src/components/DashKit/__stories__/DashKit.stories.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
&__custom-plugin-text {
@include overflow-ellipsis();
@include text-body-3();
color: var(--yc-color-text-light-primary);
color: var(--g-color-text-light-primary);
padding: 5px;
background-color: var(--yc-color-base-info-heavy);
background-color: var(--g-color-base-info-light);
}
}
6 changes: 3 additions & 3 deletions src/components/DashKit/__stories__/Demo.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
&__title {
margin: 0 0 20px;
padding-bottom: 15px;
border-bottom: 1px solid var(--yc-color-line-generic);
border-bottom: 1px solid var(--g-color-line-generic);

font-family: 'YS Display', Helvetica, Arial, sans-serif;
font-weight: 500;
font-size: 26px;
line-height: 30px;

color: var(--yc-color-text-complementary);
color: var(--g-color-text-complementary);
}

&__row {
Expand All @@ -26,7 +26,7 @@
font-size: 15px;
line-height: 20px;

color: var(--yc-color-text-complementary);
color: var(--g-color-text-complementary);
}
}
}
6 changes: 3 additions & 3 deletions src/components/OverlayControls/OverlayControls.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ $position-padding: 7px;

&__default-controls {
display: flex;
background: var(--yc-color-base-generic-ultralight);
border-radius: var(--yc-border-radius-m);
background: var(--g-color-base-generic-ultralight);
border-radius: var(--g-border-radius-m);
}

&_position {
Expand All @@ -30,6 +30,6 @@ $position-padding: 7px;
}

&__item_danger {
color: var(--yc-color-text-danger);
color: var(--g-color-text-danger);
}
}
6 changes: 3 additions & 3 deletions src/plugins/Text/Text.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.dashkit-plugin-text {
--rc-loader-active-color: var(--yc-color-base-special);
--rc-loader-off-color: var(--yc-color-base-selection-hover);
--rc-loader-active-color: var(--g-color-base-brand);
--rc-loader-off-color: var(--g-color-base-selection-hover);

white-space: pre-wrap;
overflow: auto;
Expand All @@ -22,7 +22,7 @@
}

&__error {
color: var(--yc-color-text-danger);
color: var(--g-color-text-danger);
}

&__loader {
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/Title/Title.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
}

&_size_s {
font-size: var(--yc-text-body-3-font-size);
font-size: var(--g-text-body-3-font-size);
line-height: 24px;
}

Expand Down

0 comments on commit 7df9c49

Please sign in to comment.