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.

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

(fix) O3-2840: Download button and TableToolbarSearch component shouldn't overlap #981

Merged
merged 3 commits into from
Feb 15, 2024

Conversation

subhamkumarr
Copy link
Contributor

@subhamkumarr subhamkumarr commented Feb 13, 2024

Requirements

  • This PR has a title that briefly describes the work done including the ticket number. If there is a ticket, make sure your PR title includes a conventional commit label. See existing PR titles for inspiration.
  • My work conforms to the OpenMRS 3.0 Styleguide and design documentation.
  • My work includes tests or is validated by existing tests.

Summary

The download button and search icon do not overlap with the table body.

Screenshots:

Before changes:

Untitled.video.-.Made.with.Clipchamp.2.mp4

After Changes:

OpenMRS.-.Personal.-.Microsoft.Edge.2024-02-11.00-05-02.mp4

Related Issue

https://openmrs.atlassian.net/jira/software/c/projects/O3/issues/O3-2840?filter=recentlyviewed

@subhamkumarr
Copy link
Contributor Author

subhamkumarr commented Feb 13, 2024

@denniskigen @vasharma05 Could you please review this PR.

@denniskigen
Copy link
Member

Could you please resolve the conflicts, @subhamkumarr?

@vasharma05
Copy link
Member

vasharma05 commented Feb 15, 2024

You did 2 different kinds of zoom here, the 1st video had ctrl+ and the second was actually the screen zooming, which is done by the touchpad. The first one changes the layout, the second one is just zooming in using touchpad.

Please add the updated video

@subhamkumarr
Copy link
Contributor Author

subhamkumarr commented Feb 15, 2024

@vasharma05, Done. I have changed the before change video. Could you please review it? Both the video is now screen zooming

@subhamkumarr
Copy link
Contributor Author

@denniskigen I resolved the merge conflicts.

@denniskigen denniskigen changed the title (fix: O3-2840): Download button and search icon overlap with the table body. (fix) O3-2840: Download button and TableToolbarSearch component shouldn't overlap Feb 15, 2024
@denniskigen
Copy link
Member

Thanks, @subhamkumarr. I've tweaked the approach slightly. Hope you don't mind.

@denniskigen denniskigen merged commit b5df690 into openmrs:main Feb 15, 2024
6 checks passed
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.

3 participants