Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(): update cross clickarea in sidepage and modal #3573

Open
wants to merge 19 commits into
base: theme-version
Choose a base branch
from

Conversation

SchwJ
Copy link
Member

@SchwJ SchwJ commented Dec 23, 2024

Проблема

В макетах были обновлены размеры clickarea у крестика в Modal и SidePage.
Также выяснилось, что мобильные стили у SidePage не были подключены.

Решение

Обновила размеры click area у крестика в Modal и SidePage.

Согласно макетам, такие отступы должны быть в браузерной версии:
image

В браузерной версии при залипании:
У SidePage при залипании шапка уменьшается и отступы (clickarea) сверху и снизу крестика уменьшаются до 14.
image
! У Modal крестик залипает без изменения отступов.

В мобильной версии
Крестик имеет clickarea 22px со всех сторон
image

Ссылки

IF-1877 -- Modal, SidePage: привести кнопку закрытия в соответствие макетам (тема 2022)
Figma
Гайд сайдпейдж
Гайд модалка

Чек-лист перед запросом ревью

  1. Добавлены тесты на все изменения
    ⬜ unit-тесты для логики
    ✅ скриншоты для верстки и кросс-браузерности
    ⬜ нерелевантно

  2. Добавлена (обновлена) документация
    ⬜ styleguidist для пропов и примеров использования компонентов
    ⬜ jsdoc для утилит и хелперов
    ⬜ комментарии для неочевидных мест в коде
    ⬜ прочие инструкции (README.md, contributing.md и др.)
    ✅ нерелевантно

  3. Изменения корректно типизированы
    ✅ без использования any (см. PR 2856)
    ⬜ нерелевантно

  4. Прочее
    ✅ все тесты и линтеры на CI проходят
    ✅ в коде нет лишних изменений
    ✅ заголовок PR кратко и доступно отражает суть изменений (он попадет в changelog)

@sashachabin sashachabin self-requested a review December 24, 2024 08:45
@sashachabin

This comment was marked as resolved.

public static sidePageCloseButtonClickArea = '6px';
public static mobileSidePageCloseButtonClickArea = '16px';
public static get sidePageCloseButtonClickAreaTop() {
return this.modalCloseButtonClickAreaTop;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

а точно ли нужны все эти переменные?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Обсудили, решили пока оставить

@mshatikhin
Copy link
Member

перед влитием нужно будет не забыть сделать тему с обратной совместимостью

@zhzz zhzz mentioned this pull request Feb 12, 2025
sashachabin and others added 6 commits February 24, 2025 12:37
# Conflicts:
#	packages/react-ui-validations/.creevey/images/ModalWithSingleInput/Example 1/chromeDefault.png
#	packages/react-ui-validations/.creevey/images/ModalWithSingleInput/Example 2/chromeDefault.png
#	packages/react-ui/.creevey/images/ComboBoxView/in flex modal/chrome2022.png
#	packages/react-ui/.creevey/images/ComboBoxView/in flex modal/chrome2022Dark.png
#	packages/react-ui/.creevey/images/ComboBoxView/in flex modal/firefox2022.png
#	packages/react-ui/.creevey/images/ComboBoxView/in flex modal/firefox2022Dark.png
#	packages/react-ui/.creevey/images/Modal/Mobile modal/top/chromeMobile/top.png
#	packages/react-ui/.creevey/images/Modal/Modal With Children From Other Component/bottom/chrome2022/bottom.png
#	packages/react-ui/.creevey/images/Modal/Modal With Children From Other Component/bottom/chrome2022Dark/bottom.png
#	packages/react-ui/.creevey/images/Modal/Modal With Children From Other Component/bottom/firefox2022/bottom.png
#	packages/react-ui/.creevey/images/Modal/Modal With Children From Other Component/bottom/firefox2022Dark/bottom.png
#	packages/react-ui/.creevey/images/Modal/Modal With Children From Other Component/middle/chrome2022/middle.png
#	packages/react-ui/.creevey/images/Modal/Modal With Children From Other Component/middle/chrome2022Dark/middle.png
#	packages/react-ui/.creevey/images/Modal/Modal With Children From Other Component/middle/firefox2022/middle.png
#	packages/react-ui/.creevey/images/Modal/Modal With Children From Other Component/middle/firefox2022Dark/middle.png
#	packages/react-ui/.creevey/images/Modal/Modal With Children From Other Component/top/chrome2022/top.png
#	packages/react-ui/.creevey/images/Modal/Modal With Children From Other Component/top/chrome2022Dark/top.png
#	packages/react-ui/.creevey/images/Modal/Modal With Children From Other Component/top/firefox2022/top.png
#	packages/react-ui/.creevey/images/Modal/Modal With Children From Other Component/top/firefox2022Dark/top.png
#	packages/react-ui/.creevey/images/Modal/Modal mobile view/idle/chromeMobile/idle.png
#	packages/react-ui/.creevey/images/Modal/Modal over another modal/open first modal/chrome2022/open first modal.png
#	packages/react-ui/.creevey/images/Modal/Modal over another modal/open first modal/chrome2022Dark/open first modal.png
#	packages/react-ui/.creevey/images/Modal/Modal over another modal/open first modal/firefox2022/open first modal.png
#	packages/react-ui/.creevey/images/Modal/Modal over another modal/open first modal/firefox2022Dark/open first modal.png
#	packages/react-ui/.creevey/images/Modal/Modal over another modal/open second modal/chrome2022/open second modal.png
#	packages/react-ui/.creevey/images/Modal/Modal over another modal/open second modal/chrome2022Dark/open second modal.png
#	packages/react-ui/.creevey/images/Modal/Modal over another modal/open second modal/firefox2022/open second modal.png
#	packages/react-ui/.creevey/images/Modal/Modal over another modal/open second modal/firefox2022Dark/open second modal.png
#	packages/react-ui/.creevey/images/Modal/Modal with footer panel/open modal/chrome2022/open modal.png
#	packages/react-ui/.creevey/images/Modal/Modal with footer panel/open modal/chrome2022Dark/open modal.png
#	packages/react-ui/.creevey/images/Modal/Modal with footer panel/open modal/firefox2022/open modal.png
#	packages/react-ui/.creevey/images/Modal/Modal with footer panel/open modal/firefox2022Dark/open modal.png
#	packages/react-ui/.creevey/images/Modal/Modal with no-padding/chrome2022.png
#	packages/react-ui/.creevey/images/Modal/Modal with no-padding/chrome2022Dark.png
#	packages/react-ui/.creevey/images/Modal/Modal with no-padding/firefox2022.png
#	packages/react-ui/.creevey/images/Modal/Modal with no-padding/firefox2022Dark.png
#	packages/react-ui/.creevey/images/Modal/Modal with variable height of content/open modal/chrome2022/open modal.png
#	packages/react-ui/.creevey/images/Modal/Modal with variable height of content/open modal/chrome2022Dark/open modal.png
#	packages/react-ui/.creevey/images/Modal/Modal with variable height of content/open modal/firefox2022/open modal.png
#	packages/react-ui/.creevey/images/Modal/Modal with variable height of content/open modal/firefox2022Dark/open modal.png
#	packages/react-ui/.creevey/images/Modal/Modal with variable height of content/toggle content height/chrome2022/toggle content height.png
#	packages/react-ui/.creevey/images/Modal/Modal with variable height of content/toggle content height/chrome2022Dark/toggle content height.png
#	packages/react-ui/.creevey/images/Modal/Modal with variable height of content/toggle content height/firefox2022/toggle content height.png
#	packages/react-ui/.creevey/images/Modal/Modal with variable height of content/toggle content height/firefox2022Dark/toggle content height.png
#	packages/react-ui/.creevey/images/Modal/Modal with veryLongHeaderWithoutSpaces/chrome2022.png
#	packages/react-ui/.creevey/images/Modal/Modal with veryLongHeaderWithoutSpaces/chrome2022Dark.png
#	packages/react-ui/.creevey/images/Modal/Modal with veryLongHeaderWithoutSpaces/firefox2022.png
#	packages/react-ui/.creevey/images/Modal/Modal with veryLongHeaderWithoutSpaces/firefox2022Dark.png
#	packages/react-ui/.creevey/images/Modal/Modal without footer panel/open modal/chrome2022/open modal.png
#	packages/react-ui/.creevey/images/Modal/Modal without footer panel/open modal/chrome2022Dark/open modal.png
#	packages/react-ui/.creevey/images/Modal/Modal without footer panel/open modal/firefox2022/open modal.png
#	packages/react-ui/.creevey/images/Modal/Modal without footer panel/open modal/firefox2022Dark/open modal.png
#	packages/react-ui/.creevey/images/Modal/Modal without footer/open modal/chrome2022/open modal.png
#	packages/react-ui/.creevey/images/Modal/Modal without footer/open modal/chrome2022Dark/open modal.png
#	packages/react-ui/.creevey/images/Modal/Modal without footer/open modal/firefox2022/open modal.png
#	packages/react-ui/.creevey/images/Modal/Modal without footer/open modal/firefox2022Dark/open modal.png
#	packages/react-ui/.creevey/images/Modal/Modal without header/chrome2022.png
#	packages/react-ui/.creevey/images/Modal/Modal without header/chrome2022Dark.png
#	packages/react-ui/.creevey/images/Modal/Modal without header/firefox2022.png
#	packages/react-ui/.creevey/images/Modal/Modal without header/firefox2022Dark.png
#	packages/react-ui/.creevey/images/Modal/Modal without sticky elements/top/chrome2022/top.png
#	packages/react-ui/.creevey/images/Modal/Modal without sticky elements/top/chrome2022Dark/top.png
#	packages/react-ui/.creevey/images/Modal/Modal without sticky elements/top/firefox2022/top.png
#	packages/react-ui/.creevey/images/Modal/Modal without sticky elements/top/firefox2022Dark/top.png
#	packages/react-ui/.creevey/images/Modal/Small modal on the Top/doesn't close by click on the content/chrome2022/doesn't close by click on the content.png
#	packages/react-ui/.creevey/images/Modal/Small modal on the Top/doesn't close by click on the content/chrome2022Dark/doesn't close by click on the content.png
#	packages/react-ui/.creevey/images/Modal/Small modal on the Top/doesn't close by click on the content/firefox2022/doesn't close by click on the content.png
#	packages/react-ui/.creevey/images/Modal/Small modal on the Top/doesn't close by click on the content/firefox2022Dark/doesn't close by click on the content.png
#	packages/react-ui/.creevey/images/Modal/Small modal on the Top/open modal/chrome2022/open modal.png
#	packages/react-ui/.creevey/images/Modal/Small modal on the Top/open modal/chrome2022Dark/open modal.png
#	packages/react-ui/.creevey/images/Modal/Small modal on the Top/open modal/firefox2022/open modal.png
#	packages/react-ui/.creevey/images/Modal/Small modal on the Top/open modal/firefox2022Dark/open modal.png
#	packages/react-ui/.creevey/images/Modal/With Icon Input/open modal/chrome2022/open modal.png
#	packages/react-ui/.creevey/images/Modal/With Icon Input/open modal/chrome2022Dark/open modal.png
#	packages/react-ui/.creevey/images/Modal/With Icon Input/open modal/firefox2022/open modal.png
#	packages/react-ui/.creevey/images/Modal/With Icon Input/open modal/firefox2022Dark/open modal.png
#	packages/react-ui/.creevey/images/Modal/With alignTop/chrome2022.png
#	packages/react-ui/.creevey/images/Modal/With alignTop/chrome2022Dark.png
#	packages/react-ui/.creevey/images/Modal/With alignTop/firefox2022.png
#	packages/react-ui/.creevey/images/Modal/With alignTop/firefox2022Dark.png
#	packages/react-ui/.creevey/images/SidePage/Body without Footer/scroll to bottom/chrome2022/scroll to bottom.png
#	packages/react-ui/.creevey/images/SidePage/Body without Footer/scroll to bottom/chrome2022Dark/scroll to bottom.png
#	packages/react-ui/.creevey/images/SidePage/Body without Footer/scroll to bottom/firefox2022/scroll to bottom.png
#	packages/react-ui/.creevey/images/SidePage/Body without Footer/scroll to bottom/firefox2022Dark/scroll to bottom.png
#	packages/react-ui/.creevey/images/SidePage/Left SidePage With Right SidePage/chrome2022.png
#	packages/react-ui/.creevey/images/SidePage/Left SidePage With Right SidePage/chrome2022Dark.png
#	packages/react-ui/.creevey/images/SidePage/Left SidePage With Right SidePage/firefox2022.png
#	packages/react-ui/.creevey/images/SidePage/Left SidePage With Right SidePage/firefox2022Dark.png
#	packages/react-ui/.creevey/images/SidePage/Mobile Simple/open side-page/chromeMobile/open side-page.png
#	packages/react-ui/.creevey/images/SidePage/SidePage over another SidePage/close internal side-page/chrome2022/close internal side-page.png
#	packages/react-ui/.creevey/images/SidePage/SidePage over another SidePage/close internal side-page/chrome2022Dark/close internal side-page.png
#	packages/react-ui/.creevey/images/SidePage/SidePage over another SidePage/close internal side-page/firefox2022/close internal side-page.png
#	packages/react-ui/.creevey/images/SidePage/SidePage over another SidePage/close internal side-page/firefox2022Dark/close internal side-page.png
#	packages/react-ui/.creevey/images/SidePage/SidePage over another SidePage/open internal side-page/chrome2022/open internal side-page.png
#	packages/react-ui/.creevey/images/SidePage/SidePage over another SidePage/open internal side-page/chrome2022Dark/open internal side-page.png
#	packages/react-ui/.creevey/images/SidePage/SidePage over another SidePage/open internal side-page/firefox2022/open internal side-page.png
#	packages/react-ui/.creevey/images/SidePage/SidePage over another SidePage/open internal side-page/firefox2022Dark/open internal side-page.png
#	packages/react-ui/.creevey/images/SidePage/SidePage with Custom Children/scroll to bottom with header, footer/chrome2022/scroll to bottom with header, footer.png
#	packages/react-ui/.creevey/images/SidePage/SidePage with Custom Children/scroll to bottom with header, footer/chrome2022Dark/scroll to bottom with header, footer.png
#	packages/react-ui/.creevey/images/SidePage/SidePage with Custom Children/scroll to bottom with header, footer/firefox2022/scroll to bottom with header, footer.png
#	packages/react-ui/.creevey/images/SidePage/SidePage with Custom Children/scroll to bottom with header, footer/firefox2022Dark/scroll to bottom with header, footer.png
#	packages/react-ui/.creevey/images/SidePage/SidePage with Custom Children/with header, footer/chrome2022/with header, footer.png
#	packages/react-ui/.creevey/images/SidePage/SidePage with Custom Children/with header, footer/chrome2022Dark/with header, footer.png
#	packages/react-ui/.creevey/images/SidePage/SidePage with Custom Children/with header, footer/firefox2022/with header, footer.png
#	packages/react-ui/.creevey/images/SidePage/SidePage with Custom Children/with header, footer/firefox2022Dark/with header, footer.png
#	packages/react-ui/.creevey/images/SidePage/SidePage with FocusLock when background blocked/open side-page/chrome2022/firstTimeTabPress.png
#	packages/react-ui/.creevey/images/SidePage/SidePage with FocusLock when background blocked/open side-page/chrome2022/fourthTimeTabPress.png
#	packages/react-ui/.creevey/images/SidePage/SidePage with FocusLock when background blocked/open side-page/chrome2022/secondTimeTabPress.png
#	packages/react-ui/.creevey/images/SidePage/SidePage with FocusLock when background blocked/open side-page/chrome2022/thirdTimeTabPress.png
#	packages/react-ui/.creevey/images/SidePage/SidePage with block background/open side-page/chrome2022.png
#	packages/react-ui/.creevey/images/SidePage/SidePage with left position/chrome2022.png
#	packages/react-ui/.creevey/images/SidePage/SidePage with left position/chrome2022Dark.png
#	packages/react-ui/.creevey/images/SidePage/SidePage with left position/firefox2022.png
#	packages/react-ui/.creevey/images/SidePage/SidePage with left position/firefox2022Dark.png
#	packages/react-ui/.creevey/images/SidePage/Simple/open side-page/chrome2022/open side-page.png
#	packages/react-ui/.creevey/images/SidePage/Simple/open side-page/chrome2022Dark/open side-page.png
#	packages/react-ui/.creevey/images/SidePage/Simple/open side-page/firefox2022/open side-page.png
#	packages/react-ui/.creevey/images/SidePage/Simple/open side-page/firefox2022Dark/open side-page.png
#	packages/react-ui/.creevey/images/SidePage/Sticky SidePageHeader when another SidePage/sticky header, open and close internal side-page/chrome2022/sticky header, open and close internal side-page.png
#	packages/react-ui/.creevey/images/SidePage/Sticky SidePageHeader when another SidePage/sticky header, open and close internal side-page/chrome2022Dark/sticky header, open and close internal side-page.png
#	packages/react-ui/.creevey/images/SidePage/Sticky SidePageHeader when another SidePage/sticky header, open and close internal side-page/firefox2022/sticky header, open and close internal side-page.png
#	packages/react-ui/.creevey/images/SidePage/Sticky SidePageHeader when another SidePage/sticky header, open and close internal side-page/firefox2022Dark/sticky header, open and close internal side-page.png
#	packages/react-ui/.creevey/images/SidePage/With long title/fixed close element/chrome2022/fixed close element.png
#	packages/react-ui/.creevey/images/SidePage/With long title/fixed close element/chrome2022Dark/fixed close element.png
#	packages/react-ui/.creevey/images/SidePage/With long title/fixed close element/firefox2022/fixed close element.png
#	packages/react-ui/.creevey/images/SidePage/With long title/fixed close element/firefox2022Dark/fixed close element.png
#	packages/react-ui/.creevey/images/SidePage/With long title/fixed header/chrome2022/fixed header.png
#	packages/react-ui/.creevey/images/SidePage/With long title/fixed header/chrome2022Dark/fixed header.png
#	packages/react-ui/.creevey/images/SidePage/With long title/fixed header/firefox2022/fixed header.png
#	packages/react-ui/.creevey/images/SidePage/With long title/fixed header/firefox2022Dark/fixed header.png
#	packages/react-ui/.creevey/images/SidePage/With long title/not fixed/chrome2022/not fixed.png
#	packages/react-ui/.creevey/images/SidePage/With long title/not fixed/chrome2022Dark/not fixed.png
#	packages/react-ui/.creevey/images/SidePage/With long title/not fixed/firefox2022/not fixed.png
#	packages/react-ui/.creevey/images/SidePage/With long title/not fixed/firefox2022Dark/not fixed.png
#	packages/react-ui/.creevey/images/SidePage/test updateLayout method/Body content has been changed/chrome2022/Body content has been changed.png
#	packages/react-ui/.creevey/images/SidePage/test updateLayout method/Body content has been changed/chrome2022Dark/Body content has been changed.png
#	packages/react-ui/.creevey/images/SidePage/test updateLayout method/Body content has been changed/firefox2022/Body content has been changed.png
#	packages/react-ui/.creevey/images/SidePage/test updateLayout method/Body content has been changed/firefox2022Dark/Body content has been changed.png
#	packages/react-ui/.creevey/images/SidePage/test updateLayout method/child component content has been changed/chrome2022/child component content has been changed.png
#	packages/react-ui/.creevey/images/SidePage/test updateLayout method/child component content has been changed/chrome2022Dark/child component content has been changed.png
#	packages/react-ui/.creevey/images/SidePage/test updateLayout method/child component content has been changed/firefox2022/child component content has been changed.png
#	packages/react-ui/.creevey/images/SidePage/test updateLayout method/child component content has been changed/firefox2022Dark/child component content has been changed.png
#	packages/react-ui/.creevey/images/SidePage/test updateLayout method/idle/chrome2022/idle.png
#	packages/react-ui/.creevey/images/SidePage/test updateLayout method/idle/chrome2022Dark/idle.png
#	packages/react-ui/.creevey/images/SidePage/test updateLayout method/idle/firefox2022/idle.png
#	packages/react-ui/.creevey/images/SidePage/test updateLayout method/idle/firefox2022Dark/idle.png
#	packages/react-ui/.creevey/images/SidePage/test updateLayout method/update layout/chrome2022/update layout.png
#	packages/react-ui/.creevey/images/SidePage/test updateLayout method/update layout/chrome2022Dark/update layout.png
#	packages/react-ui/.creevey/images/SidePage/test updateLayout method/update layout/firefox2022/update layout.png
#	packages/react-ui/.creevey/images/SidePage/test updateLayout method/update layout/firefox2022Dark/update layout.png
#	packages/react-ui/.creevey/images/ZIndex/Big modal with Loader/Header covers Loader/chrome2022/Header covers Loader.png
#	packages/react-ui/.creevey/images/ZIndex/Big modal with Loader/Header covers Loader/chrome2022Dark/Header covers Loader.png
#	packages/react-ui/.creevey/images/ZIndex/Big modal with Loader/Header covers Loader/firefox2022/Header covers Loader.png
#	packages/react-ui/.creevey/images/ZIndex/Big modal with Loader/Header covers Loader/firefox2022Dark/Header covers Loader.png
#	packages/react-ui/.creevey/images/ZIndex/Elements in Loader in Modal/Hide Hint on active Loader/chrome2022/Hide Hint on active Loader.png
#	packages/react-ui/.creevey/images/ZIndex/Elements in Loader in Modal/Hide Hint on active Loader/firefox2022/Hide Hint on active Loader.png
#	packages/react-ui/.creevey/images/ZIndex/Elements in Loader in Modal/Hide Hint on active Loader/firefox2022Dark/Hide Hint on active Loader.png
#	packages/react-ui/.creevey/images/ZIndex/Elements in Loader in Modal/Open Dropdown while Loader is inactive/chrome2022/Open Dropdown while Loader is inactive.png
#	packages/react-ui/.creevey/images/ZIndex/Elements in Loader in Modal/Open Dropdown while Loader is inactive/chrome2022Dark/Open Dropdown while Loader is inactive.png
#	packages/react-ui/.creevey/images/ZIndex/Elements in Loader in Modal/Open Dropdown while Loader is inactive/firefox2022/Open Dropdown while Loader is inactive.png
#	packages/react-ui/.creevey/images/ZIndex/Elements in Loader in Modal/Open Dropdown while Loader is inactive/firefox2022Dark/Open Dropdown while Loader is inactive.png
#	packages/react-ui/.creevey/images/ZIndex/Hint and modal/Modal covers hint/chrome2022/Modal covers hint.png
#	packages/react-ui/.creevey/images/ZIndex/Hint and modal/Modal covers hint/chrome2022Dark/Modal covers hint.png
#	packages/react-ui/.creevey/images/ZIndex/Hint and modal/Modal covers hint/firefox2022/Modal covers hint.png
#	packages/react-ui/.creevey/images/ZIndex/Hint and modal/Modal covers hint/firefox2022Dark/Modal covers hint.png
#	packages/react-ui/.creevey/images/ZIndex/Loader and SidePage/SidePage shadow cover Loader/chrome2022/SidePage shadow cover Loader.png
#	packages/react-ui/.creevey/images/ZIndex/Loader and SidePage/SidePage shadow cover Loader/chrome2022Dark/SidePage shadow cover Loader.png
#	packages/react-ui/.creevey/images/ZIndex/Loader and SidePage/SidePage shadow cover Loader/firefox2022/SidePage shadow cover Loader.png
#	packages/react-ui/.creevey/images/ZIndex/Loader and SidePage/SidePage shadow cover Loader/firefox2022Dark/SidePage shadow cover Loader.png
#	packages/react-ui/.creevey/images/ZIndex/Loader in SidePage.Body/is covered by Header and Footer/chrome2022/is covered by Header and Footer.png
#	packages/react-ui/.creevey/images/ZIndex/Loader in SidePage.Body/is covered by Header and Footer/chrome2022Dark/is covered by Header and Footer.png
#	packages/react-ui/.creevey/images/ZIndex/Loader in SidePage.Body/is covered by Header and Footer/firefox2022/is covered by Header and Footer.png
#	packages/react-ui/.creevey/images/ZIndex/Loader in SidePage.Body/is covered by Header and Footer/firefox2022Dark/is covered by Header and Footer.png
#	packages/react-ui/.creevey/images/ZIndex/Modal And Toast/toastShown/chrome2022.png
#	packages/react-ui/.creevey/images/ZIndex/Modal And Toast/toastShown/chrome2022Dark.png
#	packages/react-ui/.creevey/images/ZIndex/Modal And Toast/toastShown/firefox2022.png
#	packages/react-ui/.creevey/images/ZIndex/Modal And Toast/toastShown/firefox2022Dark.png
#	packages/react-ui/.creevey/images/ZIndex/Modal With Dropdown/dropdown lays under fixed footer/chrome2022.png
#	packages/react-ui/.creevey/images/ZIndex/Modal With Dropdown/dropdown lays under fixed footer/firefox2022.png
#	packages/react-ui/.creevey/images/ZIndex/Modal With Dropdown/dropdown lays under fixed header/chrome2022.png
#	packages/react-ui/.creevey/images/ZIndex/Modal With Dropdown/dropdown lays under fixed header/firefox2022.png
#	packages/react-ui/.creevey/images/ZIndex/Modal With Dropdown/dropdown overlaps static footer/chrome2022.png
#	packages/react-ui/.creevey/images/ZIndex/Modal With Dropdown/dropdown overlaps static footer/firefox2022.png
#	packages/react-ui/.creevey/images/ZIndex/Modal With Dropdown/dropdown overlaps static header/chrome2022.png
#	packages/react-ui/.creevey/images/ZIndex/Modal With Dropdown/dropdown overlaps static header/firefox2022.png
#	packages/react-ui/.creevey/images/ZIndex/Modal With Tooltip In Loader/chrome2022.png
#	packages/react-ui/.creevey/images/ZIndex/Modal With Tooltip In Loader/firefox2022.png
#	packages/react-ui/.creevey/images/ZIndex/Modal in Loader and Modal/chrome2022.png
#	packages/react-ui/.creevey/images/ZIndex/Modal in Loader and Modal/chrome2022Dark.png
#	packages/react-ui/.creevey/images/ZIndex/Modal in Loader and Modal/firefox2022.png
#	packages/react-ui/.creevey/images/ZIndex/Modal in Loader and Modal/firefox2022Dark.png
#	packages/react-ui/.creevey/images/ZIndex/Nested elements in loader/chrome2022.png
#	packages/react-ui/.creevey/images/ZIndex/Nested elements in loader/chrome2022Dark.png
#	packages/react-ui/.creevey/images/ZIndex/Nested elements in loader/firefox2022.png
#	packages/react-ui/.creevey/images/ZIndex/Nested elements in loader/firefox2022Dark.png
#	packages/react-ui/.creevey/images/ZIndex/Sidepage and Select/SidePage covers Select and Tooltip/chrome2022/SidePage covers Select and Tooltip.png
#	packages/react-ui/.creevey/images/ZIndex/Sidepage and Select/SidePage covers Select and Tooltip/chrome2022Dark/SidePage covers Select and Tooltip.png
#	packages/react-ui/.creevey/images/ZIndex/Sidepage and Select/SidePage covers Select and Tooltip/firefox2022/SidePage covers Select and Tooltip.png
#	packages/react-ui/.creevey/images/ZIndex/Sidepage and Select/SidePage covers Select and Tooltip/firefox2022Dark/SidePage covers Select and Tooltip.png
#	packages/react-ui/.creevey/images/ZIndex/Toast Over Everything/refToast/chrome2022.png
#	packages/react-ui/.creevey/images/ZIndex/Toast Over Everything/refToast/chrome2022Dark.png
#	packages/react-ui/.creevey/images/ZIndex/Toast Over Everything/refToast/firefox2022.png
#	packages/react-ui/.creevey/images/ZIndex/Toast Over Everything/refToast/firefox2022Dark.png
#	packages/react-ui/.creevey/images/ZIndex/Toast Over Everything/staticToast/firefox2022.png
#	packages/react-ui/.creevey/images/ZIndex/Toast Over Everything/staticToast/firefox2022Dark.png
…ble-area-in-modal-and-sidepage

# Conflicts:
#	packages/react-ui/internal/themes/BasicLightTheme.ts
@SchwJ SchwJ changed the base branch from next to theme-version February 26, 2025 06:32
@SchwJ
Copy link
Member Author

SchwJ commented Feb 26, 2025

Перенаправила PR в ветку с новым механизмом версионирования тем.
Но так как я была на более актуальном next'е, у меня есть изменения, которых еще нет в theme-version

…d-sidepage' into cross-clickable-area-in-modal-and-sidepage
…ble-area-in-modal-and-sidepage

# Conflicts:
#	packages/react-ui/internal/themes/DarkTheme5_1.ts
#	packages/react-ui/internal/themes/LightTheme5_1.ts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants