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

feat: set expanded control bar height for small screens #1459

Merged
merged 28 commits into from
Jan 29, 2021
Merged

feat: set expanded control bar height for small screens #1459

merged 28 commits into from
Jan 29, 2021

Conversation

jenniferarnesen
Copy link
Collaborator

@jenniferarnesen jenniferarnesen commented Jan 21, 2021 •
edited by Sharmyn28
Loading

Fixes in this PR:

  • Small screen expanded controlbar: the search input field should stretch to the whole width
  • Small screen tapping “search icon” in the control bar, search input should focus
  • Small screen expanded controlbar: adjust "search icon"
  • Small screen expanded controlbar should take all the height - 32px
  • Vertical scrolling in the expanded controlbar should work

Control bar height (100vh - 32px)
image

Search input focus and whole width
image

Vertical scroll
image

jenniferarnesen and others added 27 commits January 20, 2021 10:32
@jenniferarnesen
fix: stretch dashboard search field to full width
abb045f
@jenniferarnesen
fix: set expanded controlbar in small screen to fill most of height
50d4738
@jenniferarnesen
fix: hide tooltip also when the control bar is clicked to expand
8b4b0b8
@jenniferarnesen
test: snapshot updates
c46c03b
@jenniferarnesen
fix: write better comment
a843bb4
@jenniferarnesen
Revert "fix: write better comment"
7081b1e 
This reverts commit a843bb4.
@jenniferarnesen
Revert "test: snapshot updates"
643d50e 
This reverts commit c46c03b.
@jenniferarnesen
Revert "fix: set expanded controlbar in small screen to fill most of …
9c582d7 
…height"

This reverts commit 50d4738.
@jenniferarnesen
fix: update snapshots
ac03274
@jenniferarnesen
Revert "Revert "fix: set expanded controlbar in small screen to fill …
8761dcc 
…most of height""

This reverts commit 9c582d7.
@jenniferarnesen
Revert "fix: hide tooltip also when the control bar is clicked to exp…
3e0b675 
…and"

This reverts commit 8b4b0b8.
@jenniferarnesen
fix: snapshot update
521066a
@Sharmyn28
fix: expanded control bar in small screens
2d5764b
@jenniferarnesen
Merge branch 'master' into feat/responsive-ctrl-bar-height
8b771c9
@jenniferarnesen
Merge branch 'master' into feat/responsive-ctrl-bar-height
6714069
@jenniferarnesen
Merge branch 'master' into feat/responsive-ctrl-bar-height
bc938b3
@Sharmyn28
Merge remote-tracking branch 'origin/feat/responsive-ctrl-bar-height'…
ba82288 
… into feat/responsive-ctrl-bar-height
@Sharmyn28
fix: constants for expanded control bar in small devices
5363fa9
@Sharmyn28
fix: focus search field when click on search icon
2fbb376
@Sharmyn28
fix: adjust search icon in expanded mode small device
3f5441c
@Sharmyn28
fix: adjust grid height for small screen after adjust control bar height
721e848
@Sharmyn28
fix: fix ViewDashboard cypress test for height window dimension
8a52913
@Sharmyn28
Merge branch 'master' into feat/responsive-ctrl-bar-height
0868820
@Sharmyn28
fix: test ViewDashboard for height window dimension
f146d3e
@jenniferarnesen
fix: regenerate snapshot
319edff
@jenniferarnesen
fix: spacer div should always be min height in small screen
334ebd5
@jenniferarnesen
test: add snapshot tests for small screen
72c965a
@Sharmyn28 Sharmyn28 self-requested a review January 28, 2021 16:13
cooper-joe
cooper-joe approved these changes Jan 28, 2021
View reviewed changes
Copy link
Member

@cooper-joe cooper-joe left a comment

Choose a reason for hiding this comment

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

LGTM 👍

I see we get the double-scrollbars when the control bar is expanded (scrollbar for controlbar, scrollbar for dashboard content). I think this might be inevitable, but I'll do some extra testing when this is on play.

@jenniferarnesen jenniferarnesen enabled auto-merge (squash) January 29, 2021 07:50
@jenniferarnesen jenniferarnesen merged commit 0d009ae into master Jan 29, 2021
@jenniferarnesen jenniferarnesen deleted the feat/responsive-ctrl-bar-height branch January 29, 2021 07:57
dhis2-bot added a commit that referenced this pull request Jan 29, 2021
@dhis2-bot
chore(release): cut 31.9.0 [skip ci]
56e268c 
# [31.9.0](v31.8.0...v31.9.0) (2021-01-29)

### Features

* set expanded control bar height for small screens ([#1459](#1459)) ([0d009ae](0d009ae))
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 31.9.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Sharmyn28 Sharmyn28 Sharmyn28 approved these changes

@cooper-joe cooper-joe cooper-joe approved these changes

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

Successfully merging this pull request may close these issues.
4 participants
@jenniferarnesen @dhis2-bot @Sharmyn28 @cooper-joe