From 81e87d8d3b583c08331ec7135f42c73aca60550d Mon Sep 17 00:00:00 2001 From: cbolton97 Date: Sat, 10 Nov 2018 13:31:10 -0500 Subject: [PATCH 1/2] sets flex-end justification for TopBar content --- UNRELEASED.md | 1 + src/components/TopBar/TopBar.scss | 1 + 2 files changed, 2 insertions(+) diff --git a/UNRELEASED.md b/UNRELEASED.md index d4c308a36e0..e8123bf2a33 100644 --- a/UNRELEASED.md +++ b/UNRELEASED.md @@ -9,6 +9,7 @@ Use [the changelog guidelines](https://git.io/polaris-changelog-guidelines) to f ### Bug fixes - Fixed `Autocomplete` empty state example Markdown not parsing correctly ([#592](https://github.com/Shopify/polaris-react/pull/592)) +- Fixed `TopBar`'s `UserMenu` from being left-aligned when `TopBar` isn't passed a `searchField` prop. ([#597](https://github.com/Shopify/polaris-react/pull/597)) ### Documentation diff --git a/src/components/TopBar/TopBar.scss b/src/components/TopBar/TopBar.scss index 84237a5e54e..06e7637fbe7 100644 --- a/src/components/TopBar/TopBar.scss +++ b/src/components/TopBar/TopBar.scss @@ -68,5 +68,6 @@ $icon-size: rem(20px); display: flex; flex: 1 1 auto; align-items: center; + justify-content: flex-end; height: 100%; } From d02c9fa7411949bec84413e32a531506dd729592 Mon Sep 17 00:00:00 2001 From: Ben Scott <227292+BPScott@users.noreply.github.com> Date: Tue, 13 Nov 2018 17:22:17 -0500 Subject: [PATCH 2/2] Update UNRELEASED.md Co-Authored-By: cbolton97 --- UNRELEASED.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UNRELEASED.md b/UNRELEASED.md index e8123bf2a33..d589f201ffe 100644 --- a/UNRELEASED.md +++ b/UNRELEASED.md @@ -9,7 +9,7 @@ Use [the changelog guidelines](https://git.io/polaris-changelog-guidelines) to f ### Bug fixes - Fixed `Autocomplete` empty state example Markdown not parsing correctly ([#592](https://github.com/Shopify/polaris-react/pull/592)) -- Fixed `TopBar`'s `UserMenu` from being left-aligned when `TopBar` isn't passed a `searchField` prop. ([#597](https://github.com/Shopify/polaris-react/pull/597)) +- `TopBar`'s `UserMenu` is now right-aligned when `TopBar` isn't passed a `searchField` prop. ([#597](https://github.com/Shopify/polaris-react/pull/597)) ### Documentation