This repository was archived by the owner on Jan 6, 2025. It is now read-only.
fix(fxFlex): fxFlex=auto with overlapping breakpoints activated #183
Conversation
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
ThomasBurleson
force-pushed
the
fix/issue_135
branch
from
c47018b to
e01a1ea
Compare
|
@d3viant0ne - plz review. |
joshwiens
reviewed
Feb 14, 2017
.gitignore
Outdated
| @@ -18,6 +18,8 @@ build/Release | |||
|
|
|||
| # Users Environment Variables | |||
| .lock-wscript | |||
| yarn.lock | |||
There was a problem hiding this comment.
As opposed to ignoring the lock file, I would suggest adding a .gitattributes file and then treating it as a binary. Removes the merge conflict issue while still providing the ability to easily see any shifting dependencies upstream.
i.e
# .gitattributes
yarn.lock -diff
* text=auto
bin/* eol=lf
61e9b38 to
116ad70
Compare
ThomasBurleson
added
pr: lgtm
ThomasBurleson
force-pushed
the
fix/issue_135
branch
from
116ad70 to
1ed376c
Compare
mmalerba
reviewed
Feb 21, 2017
| import {DemoIssue5345} from "./issue.5345.demo"; | ||
| import {DemoIssue9897} from "./issue.9897.demo"; | ||
| import {DemoIssue181} from './issue.181.demo'; | ||
| import {DemoIssue5345} from "./issue.5345.demo"; |
There was a problem hiding this comment.
these first 2 are double imported
Layout changes from gt-sm will not restore default layout with auto fixes #135.
ThomasBurleson
force-pushed
the
fix/issue_135
branch
from
1ed376c to
f4b38c7
Compare
karlhaas
pushed a commit
to karlhaas/flex-layout
that referenced
this pull request
May 3, 2017
…lar#183) Layout changes from gt-sm will not restore default layout with auto fixes angular#135.
|
This issue has been automatically locked due to inactivity. Read more about our automatic conversation locking policy. This action has been performed automatically by a bot. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Layout changes from gt-sm will not restore default layout with auto
fixes #135.