Skip to content

Swagger ui redesign/standardize default inputs#5379

Merged
shockey merged 97 commits intoswagger-api:faceliftfrom
SmartBear:swagger-ui-redesign/standardize-default-inputs
May 30, 2019
Merged

Swagger ui redesign/standardize default inputs#5379
shockey merged 97 commits intoswagger-api:faceliftfrom
SmartBear:swagger-ui-redesign/standardize-default-inputs

Conversation

@Rody-Kirwan
Copy link
Copy Markdown
Contributor

@Rody-Kirwan Rody-Kirwan commented May 29, 2019

Description

Standardize all native inputs to use custom Input component in layout-utils. Minor updates to input styling to reflect UX design spec. Also updated any relevant px values to em or rem where necessary

Motivation and Context

Swagger-UI Redesign

How Has This Been Tested?

  • Tested manually against UX spec,
  • Tested against existing cypress test-suite

Screenshots (if appropriate):

Checklist

My PR contains...

  • No code changes (src/ is unmodified: changes to documentation, CI, metadata, etc.)
  • Dependency changes (any modification to dependencies in package.json)
  • Bug fixes (non-breaking change which fixes an issue)
  • Improvements (misc. changes to existing features)
  • Features (non-breaking change which adds functionality)

My changes...

  • are breaking changes to a public API (config options, System API, major UI change, etc).
  • are breaking changes to a private API (Redux, component props, utility functions, etc.).
  • are breaking changes to a developer API (npm script behavior changes, new dev system dependencies, etc).
  • are not breaking changes.

Documentation

  • My changes do not require a change to the project documentation.
  • My changes require a change to the project documentation.
  • If yes to above: I have updated the documentation accordingly.

Automated tests

  • My changes can not or do not need to be tested.
  • My changes can and should be tested by unit and/or integration tests.
  • If yes to above: I have added tests to cover my changes.
  • If yes to above: I have taken care to cover edge cases in my tests.
  • All new and existing tests passed.

Rody Kirwan and others added 30 commits April 25, 2019 15:13
FACELIFT Reset default text margins, Add updated spacing to informati…
633b239 
…on-container / scheme-container
FACELIFT Apply UX spacing changes where reasonable and applicable
22af77d
FACELIFT Update measurement from px => em
b5e00f0
FACELIFT - Added missing flex alignment
6d1b897
@taraokelly
Update operation colors, abstracted colors from element specific vari…
b7f6d6e 
…ables
@taraokelly
Removed colors.scss
6cc64c9
@taraokelly
Merge pull request #2 from Rody-Kirwan/swagger-redesign/update-colors
14b95cd 
Swagger redesign/update colors
FACELIFT - Update spacing measurements to use rem
29d46e1
FACELIFT - Update spacing to rem
f95ce1e
FACELIFT - Set root-level font-size
c601e06
@Rody-Kirwan
Merge pull request #1 from Rody-Kirwan/swagger-ui-redesign/reset-defa…
fb7c6d7 
…ult-margins-padding

Reset default text margins, Add updated spacing to information-container, scheme-container
FACELIFT - fix breaking cypress tests
0cd9b14
@lshaw-sb
first stage in updating fonts for redesign
d876c71
@taraokelly
Typo ⚾
bb1e177
@taraokelly
Undefined var fix
06597d1
@lshaw-sb
remove spaces, repace px with em
83bd491
@lshaw-sb
refactor for em font sizes
4d5c17c
@lshaw-sb
more em clean up
d837794
@lshaw-sb
remove margin refactor work
ec60f21
@lshaw-sb
cleanup
cb933f1
@lshaw-sb
cleanup
766d08f
@lshaw-sb
merge conflict
a87d9bb
@lshaw-sb
merge conflict
f6ab607
@lshaw-sb
more font updates
521bde9
@lshaw-sb
more font updates
d0a5cb1
@lshaw-sb
clean up
e17a583
@lshaw-sb
clean up whitespace
87e7179
@lshaw-sb
post review changes
02fe451
@lshaw-sb
post review changes
6a34877
@lshaw-sb
swagger-ui selector needs greater specificity for font size
bc5b8a2
Rody Kirwan added 23 commits May 23, 2019 14:06
Fix download-url-button
77e337b
Update Models / Schemas test case
567a581
Correct logic around show / hide sui-btn-group
a367237
Merge branch 'swagger-ui-redesign/standardize-default-buttons' into s…
f28e9b8 
…wager-ui-redesign/fonts-part-two
Merge remote-tracking branch 'upstream/facelift' into swager-ui-redes…
c13de98 
…ign/fonts-part-two

# Conflicts:
#	src/style/_buttons.scss
Replace text_code mixin with mono_text
9f65431
Replace text_body mixin with regular_text
5aa1daf
Replace text_body mixin with regular_text
68a6364
Replace "text_title" mixin with "light_text"
323218d
Replace "label_text" mixin with "light_text"
987ee71
Use mixin param names
4b47f14
Remove unnecessary weight arguments,
ffd2fb1
Use rem instead of px as fallback
b67ffbf
Use named args for scss params
32e5094
Fix typo
d9e0191
Update custom button font-size to use "em"
786c6b8
Replace native input with custom component in layout-utils
a49593e
Update default styling for inputs
a09aa81
Update default checkbox and textarea to em / rem
91c703a
Revert Input component changes
f70c47e
Set max-width on download-url-button
e0b5169
Merge remote-tracking branch 'upstream/facelift' into swagger-ui-rede…
626ec3f 
…sign/standardize-default-inputs

# Conflicts:
#	src/style/_table.scss
#	src/style/_topbar.scss
Use font-size variable
158d81f
@Rody-Kirwan Rody-Kirwan changed the base branch from master to facelift May 29, 2019 11:04
@Rody-Kirwan
Copy link
Copy Markdown
Contributor Author

Rody-Kirwan commented May 29, 2019

@shockey Seems to be a problem with our branching process...
97 commits (most of which are already merged) being tracked as changes?

@Rody-Kirwan Rody-Kirwan mentioned this pull request May 30, 2019
Merged
17 tasks
@shockey
Copy link
Copy Markdown
Contributor

shockey commented May 30, 2019

@Rody-Kirwan indeed -- likely because I've been merging PRs by squashing. Try git merge --rebase origin facelift in your feature branch to replay those squash commits on top of it.

@Rody-Kirwan
Copy link
Copy Markdown
Contributor Author

Rody-Kirwan commented May 30, 2019

@shockey Aha! Got ya. Didn't think of that.
Yeah, rebasing was an absolute mess when three of us changing the same files but shouldn't be an issue anymore

@shockey shockey merged commit 214c3dc into swagger-api:facelift May 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@shockey shockey shockey approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Rody-Kirwan @shockey @taraokelly @lshaw-sb