Skip to content

Comments

[FIX] Elements in User Info require some padding#13640

Merged
ggazzo merged 6 commits intoRocketChat:developfrom
mushroomgenie:develop
May 16, 2019
Merged

[FIX] Elements in User Info require some padding#13640
ggazzo merged 6 commits intoRocketChat:developfrom
mushroomgenie:develop

Conversation

@mushroomgenie
Copy link
Contributor

Closes #13638

Before

before_padding

After

after_padding

@CLAassistant
Copy link

CLAassistant commented Mar 8, 2019

CLA assistant check
All committers have signed the CLA.

@fliptrail
Copy link
Contributor

@mushroomgenie I guess package-lock.json should remain unchanged. @knrt10 What's your call?

@knrt10
Copy link
Contributor

knrt10 commented Mar 8, 2019

yes @fliptrail you are right. @mushroomgenie when you run npm i stash those package-lock.json changes and then commit

@mushroomgenie
Copy link
Contributor Author

@fliptrail and @knrt10 Sorry I must have missed that step while committing.I'll revert the commits and then push to the PR.

ggazzo
ggazzo previously approved these changes Mar 14, 2019
@ggazzo ggazzo added this to the 1.1.0 milestone Mar 18, 2019
@ggazzo
Copy link
Member

ggazzo commented Mar 18, 2019

@mushroomgenie please fix the conflicts (:

@mushroomgenie
Copy link
Contributor Author

@ggazzo Can you review the changes ?

@ggazzo ggazzo changed the title [FIX][UI/UX] Elements in User Info require some padding [FIX] Elements in User Info require some padding May 16, 2019
@ggazzo ggazzo merged commit 583313f into RocketChat:develop May 16, 2019
@sampaiodiego sampaiodiego mentioned this pull request May 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[UI/UX] Elements in User Info require some padding

5 participants