Conversation
# Conflicts: # packages/components/src/styles/mixins/menuItem.scss # packages/remote-react-components/src/tests/visual/__screenshots__/Tabs.browser.test.tsx/Tabs-edge-cases-firefox-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/Tabs.browser.test.tsx/Tabs-edge-cases-webkit-darwin.png
# Conflicts: # packages/components/src/components/Badge/Badge.module.scss # packages/components/src/components/Badge/Badge.tsx # packages/components/src/components/Badge/stories/Default.stories.tsx # packages/components/src/components/Breadcrumb/Breadcrumb.module.scss # packages/components/src/components/Breadcrumb/Breadcrumb.tsx # packages/components/src/components/Breadcrumb/stories/Default.stories.tsx # packages/components/src/components/Button/Button.module.scss # packages/components/src/components/Button/stories/Default.stories.tsx # packages/components/src/components/HeaderNavigation/HeaderNavigation.module.scss # packages/components/src/components/HeaderNavigation/HeaderNavigation.tsx # packages/components/src/components/HeaderNavigation/stories/Default.stories.tsx # packages/components/src/components/Heading/Heading.module.scss # packages/components/src/components/Heading/Heading.tsx # packages/components/src/components/Heading/stories/Default.stories.tsx # packages/components/src/components/IllustratedMessage/IllustratedMessage.module.scss # packages/components/src/components/IllustratedMessage/IllustratedMessage.tsx # packages/components/src/components/IllustratedMessage/stories/Default.stories.tsx # packages/components/src/components/InlineCode/InlineCode.module.scss # packages/components/src/components/InlineCode/stories/Default.stories.tsx # packages/components/src/components/Link/Link.module.scss # packages/components/src/components/Link/Link.tsx # packages/components/src/components/Link/stories/Default.stories.tsx # packages/components/src/components/LoadingSpinner/LoadingSpinner.module.scss # packages/components/src/components/LoadingSpinner/LoadingSpinner.tsx # packages/components/src/components/LoadingSpinner/stories/Default.stories.tsx # packages/components/src/components/Markdown/Markdown.tsx # packages/components/src/components/Markdown/stories/Default.stories.tsx # packages/components/src/components/Text/Text.module.scss # packages/components/src/components/Text/stories/Default.stories.tsx # packages/components/src/lib/dev/StoryBackground.tsx # packages/components/src/lib/types/props.ts # packages/design-tokens/src/actions/button.yml # packages/design-tokens/src/color-aliases.yml # packages/design-tokens/src/content/heading.yml # packages/design-tokens/src/content/inline-code.yml # packages/design-tokens/src/content/text.yml # packages/design-tokens/src/navigation/breadcrumb.yml # packages/design-tokens/src/navigation/header-navigation.yml # packages/design-tokens/src/navigation/link.yml # packages/design-tokens/src/status/badge.yml # packages/design-tokens/src/status/loading-spinner.yml
# Conflicts: # packages/components/src/components/Badge/Badge.tsx # packages/components/src/components/Badge/locales/de-DE.locale.json # packages/components/src/components/Badge/locales/en-US.locale.json # packages/components/src/components/Badge/stories/Default.stories.tsx # packages/components/src/components/Breadcrumb/Breadcrumb.module.scss # packages/components/src/components/Breadcrumb/Breadcrumb.tsx # packages/components/src/components/Breadcrumb/stories/Default.stories.tsx # packages/components/src/components/Button/Button.module.scss # packages/components/src/components/Button/stories/Default.stories.tsx # packages/components/src/components/HeaderNavigation/HeaderNavigation.module.scss # packages/components/src/components/HeaderNavigation/HeaderNavigation.tsx # packages/components/src/components/HeaderNavigation/stories/Default.stories.tsx # packages/components/src/components/Heading/Heading.tsx # packages/components/src/components/Heading/stories/Default.stories.tsx # packages/components/src/components/IllustratedMessage/IllustratedMessage.module.scss # packages/components/src/components/IllustratedMessage/IllustratedMessage.tsx # packages/components/src/components/IllustratedMessage/stories/Default.stories.tsx # packages/components/src/components/InlineCode/InlineCode.module.scss # packages/components/src/components/InlineCode/stories/Default.stories.tsx # packages/components/src/components/Link/Link.module.scss # packages/components/src/components/Link/Link.tsx # packages/components/src/components/Link/stories/Default.stories.tsx # packages/components/src/components/LoadingSpinner/LoadingSpinner.tsx # packages/components/src/components/LoadingSpinner/stories/Default.stories.tsx # packages/components/src/components/Markdown/Markdown.tsx # packages/components/src/components/Markdown/stories/Default.stories.tsx # packages/components/src/components/Separator/Separator.module.scss # packages/components/src/components/Separator/stories/Default.stories.tsx # packages/components/src/components/Text/stories/Default.stories.tsx # packages/components/src/lib/dev/StoryBackground.tsx # packages/design-tokens/src/actions/button.yml # packages/design-tokens/src/color-aliases.yml # packages/design-tokens/src/content/heading.yml # packages/design-tokens/src/content/inline-code.yml # packages/design-tokens/src/navigation/breadcrumb.yml # packages/design-tokens/src/navigation/header-navigation.yml # packages/design-tokens/src/status/badge.yml # packages/design-tokens/src/status/loading-spinner.yml # packages/remote-elements/src/auto-generated/RemoteFieldErrorElement.ts # packages/remote-elements/src/auto-generated/RemoteItemsListBoxElement.ts # packages/remote-elements/src/auto-generated/RemoteSeparatorElement.ts # packages/remote-react-components/src/tests/visual/__screenshots__/ActionGroup.browser.test.tsx/ActionGroup-firefox-linux.png # packages/remote-react-components/src/tests/visual/__screenshots__/ActionGroup.browser.test.tsx/ActionGroup-webkit-linux.png # packages/remote-react-components/src/tests/visual/__screenshots__/ContextMenu.browser.test.tsx/ContextMenu-opened-firefox-linux.png # packages/remote-react-components/src/tests/visual/__screenshots__/ContextMenu.browser.test.tsx/ContextMenu-opened-webkit-linux.png # packages/remote-react-components/src/tests/visual/__screenshots__/MessageThread.browser.test.tsx/MessageThread-firefox-linux.png # packages/remote-react-components/src/tests/visual/__screenshots__/MessageThread.browser.test.tsx/MessageThread-webkit-linux.png # packages/remote-react-components/src/tests/visual/__screenshots__/Separator.browser.test.tsx/Separator-firefox-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/Separator.browser.test.tsx/Separator-firefox-linux.png # packages/remote-react-components/src/tests/visual/__screenshots__/Separator.browser.test.tsx/Separator-webkit-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/Separator.browser.test.tsx/Separator-webkit-linux.png
# Conflicts: # packages/components/src/components/List/stories/Default.stories.tsx # packages/remote-react-components/src/tests/visual/__screenshots__/FileCardList.browser.test.tsx/FileCardList-firefox-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/FileCardList.browser.test.tsx/FileCardList-webkit-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/List.browser.test.tsx/List-edge-cases-list-view-firefox-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/List.browser.test.tsx/List-edge-cases-list-view-webkit-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/List.browser.test.tsx/List-edge-cases-tile-view-firefox-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/List.browser.test.tsx/List-edge-cases-tile-view-webkit-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/List.browser.test.tsx/List-items-Bottom-content-text-selected-firefox-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/List.browser.test.tsx/List-items-Bottom-content-text-selected-webkit-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/List.browser.test.tsx/List-items-ContextMenu-opened-firefox-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/List.browser.test.tsx/List-items-ContextMenu-opened-webkit-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/List.browser.test.tsx/List-items-all-filters-opened-firefox-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/List.browser.test.tsx/List-items-all-filters-opened-webkit-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/List.browser.test.tsx/List-items-default-firefox-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/List.browser.test.tsx/List-items-default-webkit-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/List.browser.test.tsx/List-items-filtered-firefox-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/List.browser.test.tsx/List-items-filtered-webkit-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/List.browser.test.tsx/List-items-searched-firefox-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/List.browser.test.tsx/List-items-searched-webkit-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/List.browser.test.tsx/List-items-sorted-firefox-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/List.browser.test.tsx/List-items-sorted-webkit-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/List.browser.test.tsx/List-table-firefox-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/List.browser.test.tsx/List-table-webkit-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/List.browser.test.tsx/List-tiles-firefox-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/List.browser.test.tsx/List-tiles-webkit-darwin.png
# Conflicts: # packages/components/package.json # packages/components/src/components/Slider/Slider.tsx # packages/components/src/components/Slider/stories/Default.stories.tsx # packages/remote-react-components/src/tests/visual/__screenshots__/Slider.browser.test.tsx/Slider-interaction-decremented-firefox-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/Slider.browser.test.tsx/Slider-interaction-decremented-firefox-linux.png # packages/remote-react-components/src/tests/visual/__screenshots__/Slider.browser.test.tsx/Slider-interaction-decremented-webkit-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/Slider.browser.test.tsx/Slider-interaction-decremented-webkit-linux.png # packages/remote-react-components/src/tests/visual/__screenshots__/Slider.browser.test.tsx/Slider-interaction-default-firefox-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/Slider.browser.test.tsx/Slider-interaction-default-firefox-linux.png # packages/remote-react-components/src/tests/visual/__screenshots__/Slider.browser.test.tsx/Slider-interaction-default-webkit-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/Slider.browser.test.tsx/Slider-interaction-default-webkit-linux.png # packages/remote-react-components/src/tests/visual/__screenshots__/Slider.browser.test.tsx/Slider-interaction-incremented-firefox-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/Slider.browser.test.tsx/Slider-interaction-incremented-firefox-linux.png # packages/remote-react-components/src/tests/visual/__screenshots__/Slider.browser.test.tsx/Slider-interaction-incremented-webkit-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/Slider.browser.test.tsx/Slider-interaction-incremented-webkit-linux.png # packages/remote-react-components/src/tests/visual/__screenshots__/Slider.browser.test.tsx/Slider-states-firefox-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/Slider.browser.test.tsx/Slider-states-firefox-linux.png # packages/remote-react-components/src/tests/visual/__screenshots__/Slider.browser.test.tsx/Slider-states-webkit-darwin.png # packages/remote-react-components/src/tests/visual/__screenshots__/Slider.browser.test.tsx/Slider-states-webkit-linux.png
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.