Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge lastest changes to master #198

Merged
merged 40 commits into from
Sep 29, 2020
Merged

Merge lastest changes to master #198

merged 40 commits into from
Sep 29, 2020

Conversation

joebochill
Copy link
Collaborator

@joebochill joebochill commented Sep 28, 2020 •
edited
Loading

Changes proposed in this Pull Request:

  • Merge the latest updates into master

published as @pxblue/[email protected]

huayunh and others added 30 commits August 22, 2020 21:23
@huayunh
Modify drawer using link component from router dom
973a90d
@huayunh
Update change log
eed9d54
@huayunh
Add react router dom to dev dep
61dfcfb
@huayunh
Hide title on collapse
17cb415
@huayunh
Hide subtitle too
4c49fcb
@huayunh
Update changelog wording
aa9971c
@huayunh
Tweak clsx implementation
89a6f6f
@huayunh
Remove react router dom; Add component prop to info list item
616726a
@huayunh
Update docs
442941c
@huayunh
Merge branch 'dev' into feature/drawer-component
528fef6
@huayunh
Merge branch 'dev' into bug/178
bdb5a19
@huayunh
Remove root yarn.lock
d98c52e
@huayunh
Use drawer context
85c9fff
@huayunh
Take out the drawer context null check
226ca2c
@huayunh
Update according to pr
89c0a57
@huayunh
Merge branch 'dev' into feature/drawer-component
b097c9a
@huayunh
Remove the dev dependencies for the router dom
cadc915
@emclaug2
Add width knob
f2a3ec0
@emclaug2
Add border radius around heroBanner
db2acc2
@emclaug2
Lighten the gray
620d2a1
@huayunh
Update lock; push for comments
c8d81f6
@huayunh
Update drawer doc
4909d7a
@emclaug2
Increase min width to 350
f5d716d
@huayunh
Merge pull request #192 from pxblue/feature/banner-width-knob
4d2f426 
Add Width Knob to HeroBanner Story
@huayunh
Remove the unnecessary classes
b1b2e47
@joebochill
Merge pull request #188 from pxblue/bug/178
08e2e3f 
Hide title & subtitle on persistent drawer collapse
@huayunh
Remove react-router-dom
a092c8d
@huayunh
Update yarn lock too
98bfcdb
@huayunh
Fix icons that should not be flipped
4df0cc4
@huayunh
Lint code
40be9c4
@joebochill joebochill added the master For PRs going into the master branch label Sep 28, 2020
huayunh
huayunh approved these changes Sep 28, 2020
View reviewed changes
Copy link
Contributor

@huayunh huayunh left a comment

Choose a reason for hiding this comment

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

Code looks good

@huayunh
Copy link
Contributor

huayunh commented Sep 28, 2020

I think the infolistitem in react should use black500 for subtitle. Is this a theme thing, or is this a component library thing?

image

@huayunh
Copy link
Contributor

huayunh commented Sep 28, 2020

Can we change the list item tag to match what's in the DSM? Or is that for the next release?

The latest design is font size 10px, font weight 700, letter-spacing 1px, line-height 16px

@joebochill
Copy link
Collaborator Author

joebochill commented Sep 29, 2020 •
edited
Loading

Material UI defaults the ListItemText secondary value to use theme.palette.text.secondary. I just added a fix for it to use textPrimary instead of textSecondary.

The updates to the LIT across frameworks will come in the next release.

@emclaug2 emclaug2 self-requested a review September 29, 2020 13:12
@joebochill joebochill marked this pull request as ready for review September 29, 2020 13:33
@joebochill joebochill merged commit b52e5d9 into master Sep 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@daileytj daileytj daileytj approved these changes

@huayunh huayunh huayunh approved these changes

@emclaug2 emclaug2 emclaug2 approved these changes

@jeffvg jeffvg Awaiting requested review from jeffvg

Assignees
No one assigned
Labels
master For PRs going into the master branch
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@joebochill @huayunh @emclaug2 @daileytj @EvanMcLaughlin-eaton