Skip to content

Commit cdbc022

Browse files
feat: support button changes in uikit 6.11.0 (#227)
* feat: support button changes in uikit 6.11.0 * chore: apply lint rules
1 parent c60f72e commit cdbc022

File tree

5 files changed

+17
-39
lines changed

5 files changed

+17
-39
lines changed

package-lock.json

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
"@gravity-ui/prettier-config": "1.1.0",
185185
"@gravity-ui/stylelint-config": "4.0.1",
186186
"@gravity-ui/tsconfig": "1.0.0",
187-
"@gravity-ui/uikit": "6.1.1",
187+
"@gravity-ui/uikit": "6.11.0",
188188
"@storybook/addon-essentials": "^7.1.1",
189189
"@storybook/cli": "^7.1.1",
190190
"@storybook/preset-scss": "1.0.3",
@@ -246,7 +246,7 @@
246246
"@diplodoc/mermaid-extension": "^1.0.0",
247247
"@diplodoc/transform": "^4.5.0",
248248
"@gravity-ui/components": "^3.0.0",
249-
"@gravity-ui/uikit": "^6.0.0",
249+
"@gravity-ui/uikit": "^6.11.0",
250250
"highlight.js": "^11.8.0",
251251
"katex": "^0.16.9",
252252
"lodash": "^4.17.20",

src/bundle/YfmEditorView.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@
5757
background: var(--g-color-line-generic);
5858
}
5959

60-
// TODO: fixme
6160
.ye-toolbar-list-button_arrow {
61+
--g-button-icon-offset: 0px;
62+
--g-button-padding: 2px;
6263
width: 42px;
6364
}
6465

src/bundle/toolbar/ToolbarButtonWithPopupMenu.scss

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,10 @@
11
@import '~@gravity-ui/uikit/styles/mixins';
22

33
.ye-toolbar-button-with-popup-menu {
4-
// TODO: FIXME
5-
// button with 2 icons
6-
// 42px width
4+
--g-button-icon-offset: 0px;
5+
--g-button-padding: 2px;
76
width: 42px;
87

9-
.g-button__text.g-button__text.g-button__text {
10-
margin: 0px 21px;
11-
}
12-
13-
.g-button__icon_side_start {
14-
left: -1px;
15-
}
16-
17-
.g-button__icon_side_end {
18-
right: -1px;
19-
}
20-
218
&__menu-group {
229
.g-menu__group-label {
2310
color: var(--g-color-text-hint);

src/toolbar/ToolbarListButton.scss

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
.ye-toolbar-list-button {
22
&_arrow {
3+
--g-button-icon-offset: 0px;
4+
--g-button-padding: 2px;
35
width: 42px;
4-
5-
.g-button__text.g-button__text.g-button__text {
6-
margin: 0px 21px;
7-
}
8-
9-
.g-button__icon_side_start {
10-
left: -1px;
11-
}
12-
13-
.g-button__icon_side_end {
14-
right: -1px;
15-
}
166
}
177

188
&__item {

0 commit comments

Comments
 (0)