fix: wrong padding for single row mobile nav #1191
Merged
Conversation
This file contains 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
|
Deploy preview for docusaurus-preview ready! Built with commit 908cac2 |
marvinchin
force-pushed
the
handle-single-row-mobile-nav
branch
from
86a86e5
to
1b16063
Compare
yangshun
suggested changes
Jan 23, 2019
v1/lib/core/Site.js
Outdated
| const hasLanguageDropdown = | ||
| env.translation.enabled && env.translation.enabledLanguages().length > 1; | ||
| const ordinaryHeaderLinks = headerLinks.filter( | ||
| link => !link.languages && !link.search, |
There was a problem hiding this comment.
Can you change this to link.languages || link.search? It's easier to read.
v1/lib/core/Site.js
Outdated
| link => !link.languages && !link.search, | ||
| ); | ||
| const hasOrdinaryHeaderLinks = ordinaryHeaderLinks.length > 1; | ||
| return !hasLanguageDropdown && !hasOrdinaryHeaderLinks; |
v1/lib/core/Site.js
Outdated
| mobileNavHasOneRow(headerLinks) { | ||
| const hasLanguageDropdown = | ||
| env.translation.enabled && env.translation.enabledLanguages().length > 1; | ||
| const ordinaryHeaderLinks = headerLinks.filter( |
There was a problem hiding this comment.
Change to headerLinks.some() and you don't need to check for .length > 1.
marvinchin
force-pushed
the
handle-single-row-mobile-nav
branch
from
1b16063
to
908cac2
Compare
|
@yangshun fixed! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation
Fix #1187. Padding for certain components assumed that there will always be two rows in the nav bar in mobile view. Here we handle the case where the nav bar only has a single row on mobile devices.
I'm not 100% certain if
Site.jsis the best place to check whether the mobile nav bar occupies a single row, or if I'm applying thesingleRowMobileNavclass at the most suitable place. Please do let me know if there is a better way to achieve this!Have you read the Contributing Guidelines on pull requests?
Yes.
Test Plan
We test for the cases where there are two rows in the mobile nav bar (at least 1 doc/blog/page/href/language link) and when there is one row in the mobile nav bar (no doc/blog/page/href/language link).
Padding for mobile devices should be correct when there are two rows in the mobile nav bar:
Padding for mobile devices should be correct when there is one row in the mobile nav bar:
Padding for full screen devices should be correct when there are two rows in the mobile nav bar:
Padding for full screen devices should be correct when there is one row in the mobile nav bar