Skip to content
This repository was archived by the owner on Mar 4, 2020. It is now read-only.

fix(mergeThemes): preserve fonts and static styles#217

Merged
levithomason merged 1 commit intomasterfrom
fix/merge-themes
Sep 12, 2018
Merged

fix(mergeThemes): preserve fonts and static styles#217
levithomason merged 1 commit intomasterfrom
fix/merge-themes

Conversation

@levithomason
Copy link
Member

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.

@codecov
Copy link

codecov bot commented Sep 11, 2018

Codecov Report

Merging #217 into master will increase coverage by 0.08%.
The diff coverage is 0%.

Impacted file tree graph

@@            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
Impacted Files Coverage Δ
src/components/Provider/Provider.tsx 60.46% <0%> (+1.37%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update fb1a6e8...dc5db0d. Read the comment docs.

@levithomason levithomason merged commit 21b6028 into master Sep 12, 2018
@levithomason levithomason deleted the fix/merge-themes branch September 12, 2018 00:09
fontFaces: [],
staticStyles: [],
} as IThemePrepared

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

posted in wrong pr...

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants