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

[CORL-1212] Integrate RTE Buttons #3140

Merged
merged 3 commits into from Aug 27, 2020
Merged

[CORL-1212] Integrate RTE Buttons #3140

merged 3 commits into from Aug 27, 2020

Conversation

cvle
Copy link
Member

@cvle cvle commented Aug 26, 2020

What does this PR do?

  • Integrates RTE Buttons into Coral UI (colors, spacing, font)
  • Add label and translation for External Media.

@cvle cvle requested a review from tessalt August 26, 2020 15:14
@kgardnr kgardnr modified the milestones: v6.4.0, v6.3.4 Aug 26, 2020
@kgardnr kgardnr modified the milestones: v6.4.0, v6.3.4 Aug 26, 2020
@kgardnr kgardnr added the 🚀 merge it! Pull requests that should be merged after status checks pass with a review label Aug 26, 2020
@kodiakhq kodiakhq bot removed the 🚀 merge it! Pull requests that should be merged after status checks pass with a review label Aug 26, 2020
@kodiakhq
Copy link
Contributor

kodiakhq bot commented Aug 26, 2020

This PR currently has a merge conflict. Please resolve this and then re-add the 🚀 merge it! label.

@cvle cvle merged commit ee00751 into master Aug 27, 2020
@cvle cvle deleted the feat/CORL-1212 branch August 27, 2020 15:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kgardnr kgardnr kgardnr approved these changes

@tessalt tessalt Awaiting requested review from tessalt

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v6.3.4
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@cvle @kgardnr