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

Fix tertiary text alignment and add width limit #355

Merged
merged 2 commits into from
Feb 26, 2021
Merged

Fix tertiary text alignment and add width limit #355

merged 2 commits into from
Feb 26, 2021

Conversation

Jack-Byrne
Copy link
Collaborator

Testing Plan

  • I have verified that I have not introduced new warnings in this PR (or explain why below)
  • I have tested this PR against Core and verified behavior (if applicable, if not applicable, explain why below).

Core Tests

  • Send addCommand with all text and icon parameters
  • Send submenu with all text and icon parameters
  • Ensure tertiary text and secondary image are aligned correctly between add command and submenu

Summary

  • Add width capability limit to tertiary text
  • Fix alignment of tertiary text and secondary image for addcommands vs submenus

CLA

iCollin
iCollin approved these changes Feb 16, 2021
View reviewed changes
src/js/Controllers/DisplayCapabilities.js
@@ -590,7 +590,11 @@ let capabilities = {
textField("subtleAlertSoftButtonText"),
textField("menuName"),
textField("secondaryText"),
textField("tertiaryText")
textField("tertiaryText", 20),
Copy link
Collaborator

Choose a reason for hiding this comment

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

good catch

@iCollin
Copy link
Collaborator

iCollin commented Feb 16, 2021

code looks good, approved pending testing

@Jack-Byrne Jack-Byrne merged commit 18ce1e4 into develop Feb 26, 2021
@Jack-Byrne Jack-Byrne deleted the fix/tertiary_text_spacing_and_width branch February 26, 2021 16:46
@iCollin iCollin mentioned this pull request Mar 18, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@iCollin iCollin iCollin approved these changes

Assignees
No one assigned
Labels
bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Jack-Byrne @iCollin @jordynmackool