Skip to content

TopBar Search should align with the page #3610

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Nov 11, 2020
Merged

TopBar Search should align with the page #3610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2607a01
Remove 10px padding on details page
Nov 9, 2020
785d0b3
Fix search alignment with page
Nov 9, 2020
f6d1b35
Update UNRELEASED.md
Nov 9, 2020
c37a86f
Apply fullwidth layout to Playground pages
Nov 10, 2020
e00be4c
Merge branch 'remove-stupid-10px' into search-alignment
Nov 10, 2020
f41ae45
Merge branch 'master' into search-alignment
Nov 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions UNRELEASED.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Use [the changelog guidelines](https://git.io/polaris-changelog-guidelines) to f

### Bug fixes

- Fixed alignment of `Page` and `TopBar` so the search aligns to the page. ([#3610](https://github.com/Shopify/polaris-react/pull/3610))
- Removed extra bottom border on the `DataTable` and added curved edges to footers ([#3571](https://github.com/Shopify/polaris-react/pull/3571))
- **`Button`:** `loading` no longer sets the invalid `role="alert"` ([#3590](https://github.com/Shopify/polaris-react/pull/3590))
- Removed `tabIndex=-1` from `Popover` when `preventAutoFocus` is true ([#3595](https://github.com/Shopify/polaris-react/pull/3595))
Expand Down
9 changes: 1 addition & 8 deletions src/components/TopBar/TopBar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
@import './variables';

$icon-size: rem(20px);
$page-left-alignment-breakpoint-max: 1268px;
$context-control-extra-spacing: rem(40px);
$page-left-alignment-breakpoint-max: 1238px;
Copy link
Member Author

@alex-page alex-page Nov 9, 2020

Choose a reason for hiding this comment

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

Magic number continues ✨

$context-control-expand-after: 1400px;

.TopBar {
Expand Down Expand Up @@ -118,12 +117,6 @@ $context-control-expand-after: 1400px;
max-width: none;
margin-left: calc((100% - #{$page-max-width}) / 2);

@include breakpoint-after($context-control-expand-after) {
margin-left: calc(
(100% - #{$page-max-width + $context-control-extra-spacing}) / 2
);
}

@media (max-width: $page-left-alignment-breakpoint-max) {
margin-left: 0;
margin-right: spacing(extra-tight);
Expand Down