fix(flat-button): icon size and position for multi-line anchors #1211
+80
−30
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
|
This pull request is being automatically deployed with ZEIT Now (learn more). 🔍 Inspect: https://zeit.co/commercetools/ui-kit/okjn8zaac |
tdeekens
reviewed
Dec 9, 2019
|
Yes, I'll add a test for this. |
jonnybel
commented
Dec 9, 2019
| if (!props.icon) return null; | ||
|
|
||
| let iconColor = 'solid'; | ||
| if (props.isDisabled) iconColor = 'neutral60'; | ||
| else if (props.tone === 'primary') iconColor = 'primary'; | ||
| else if (props.tone === 'secondary' && props.isMouseOver) |
There was a problem hiding this comment.
This was a leftover because there is no isMouseOver prop here.
jonnybel
commented
Dec 9, 2019
| : getTextColor(props.tone, true, overwrittenVars)}; | ||
| } | ||
| span + span { | ||
| margin-left: ${vars.spacingXs}; |
There was a problem hiding this comment.
Almost the same as using an Inline spacings component, but we can't use flexbox here.
jonnybel
force-pushed
the
ja-fix-linkbutton
branch
from
635dafe to
8587652
Compare
jonnybel
force-pushed
the
ja-fix-linkbutton
branch
from
8587652 to
476a4bb
Compare
tdeekens
approved these changes
Dec 9, 2019
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.
UKIT-95
Summary
This PR adjusts the
FlatButtonto allow breaking the text into multiple lines when the element is not abutton, and changes the position and size of the icon, not allowing it to shrink and keeping it on the same line as the text.Before:
After:
