This repository has been archived by the owner on Mar 4, 2020. It is now read-only.
fix(mergeThemes): preserve fonts and static styles #217
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
levithomason
requested review from
dvdzkwsk,
kuzhelov,
miroslavstastny and
mnajdova
as code owners
Codecov Report
@@ Coverage Diff @@
## master #217 +/- ##
==========================================
+ Coverage 91.15% 91.24% +0.08%
==========================================
Files 59 59
Lines 1018 1017 -1
Branches 159 140 -19
==========================================
Hits 928 928
+ Misses 86 85 -1
Partials 4 4
Continue to review full report at Codecov.
|
levithomason
force-pushed
the
fix/merge-themes
branch
from
36b6fd2
to
dc5db0d
Compare
alinais
reviewed
Sep 18, 2018
| const mergeThemes = (...themes: IThemeInput[]): IThemePrepared => { | ||
| const emptyTheme = { | ||
| siteVariables: {}, | ||
| componentVariables: {}, | ||
| componentStyles: {}, | ||
| fontFaces: [], | ||
| staticStyles: [], | ||
| } as IThemePrepared | ||
|
|
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.
Merge themes currently doesn't handle font faces and static styles. When merging themes, this information is lost. We started merging themes at the top of the doc site in #204. Therefore, the doc site fonts and static styles are not correct.
This PR introduces font face and static style merging which resolves the regression introduced.