This repository was archived by the owner on Mar 4, 2020. It is now read-only.
fix(Icon): revert changes with different roots#1435
Merged
layershifter merged 6 commits intomasterfrom May 31, 2019
Merged
Conversation
Codecov Report
@@ Coverage Diff @@
## master #1435 +/- ##
==========================================
- Coverage 73.59% 73.53% -0.07%
==========================================
Files 787 787
Lines 5890 5894 +4
Branches 1738 1722 -16
==========================================
- Hits 4335 4334 -1
- Misses 1549 1554 +5
Partials 6 6
Continue to review full report at Codecov.
|
kuzhelov
changed the title
….com/stardust-ui/react into fix/revert-icon-roots
layershifter
requested review from
dvdzkwsk,
kuzhelov,
levithomason,
miroslavstastny and
mnajdova
as code owners
layershifter
changed the title
mnajdova
reviewed
May 31, 2019
|
|
||
| const iconStyles: ComponentSlotStylesInput<IconProps, IconVariables> = { | ||
| fontRoot: (): ICSSInJSStyle => ({ | ||
| root: (): ICSSInJSStyle => ({ |
Contributor
There was a problem hiding this comment.
Shuold we add this conditionally if the icon is font icon? Won't this break icons on docs?
Contributor
There was a problem hiding this comment.
I check that it doesn't break anything, so not sure if you should implement the comment...
Contributor
There was a problem hiding this comment.
agree that it is better to introduce explicit condition check here, as we are expecting this rule to be applied exclusively to font-based icons
mnajdova
approved these changes
May 31, 2019
….com/stardust-ui/react into fix/revert-icon-roots # Conflicts: # CHANGELOG.md
kuzhelov
approved these changes
May 31, 2019
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
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.
Fixes #1407.
Reverts changes with multiple roots from #1337 (
svgRoot&fontRoot). This idea breaks ability to override styles viastylesprop onIconcomponent:svgRoot&fontRoothad more priority on merge. Also we usedBoxcomponent there, it's redundant.We definitely will want to separate these styles somehow to avoid conditions, but
svgRoot/fontRootis definitely bad stuff.