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 navigation toggle overlap #5391

Merged
merged 1 commit into from
Aug 3, 2023
Merged

Fix navigation toggle overlap #5391

merged 1 commit into from
Aug 3, 2023

Conversation

jancborchardt
Copy link
Member

This fixes the leftovers of nextcloud/groupware#2
The only part where this is still a problem is in month view in mobile mode, but all the rest is significantly better so I would consider it done for now.

Navigation.toggle.before.mp4
Nav.toggle.fix.mp4

Signed-off-by: Jan C. Borchardt <925062+jancborchardt@users.noreply.github.com>
@jancborchardt jancborchardt added 3. to review Waiting for reviews bug design Related to design, interface, interaction design, UX, etc. labels Aug 2, 2023
@jancborchardt jancborchardt self-assigned this Aug 2, 2023
@codecov
Copy link

codecov bot commented Aug 2, 2023

Codecov Report

Patch coverage: 50.00% and no project coverage change.

Comparison is base (814980e) 22.74% compared to head (a87c736) 22.74%.
Report is 6 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff            @@
##               main    #5391   +/-   ##
=========================================
  Coverage     22.74%   22.74%           
  Complexity      372      372           
=========================================
  Files           237      237           
  Lines         11684    11684           
  Branches       2270     2270           
=========================================
  Hits           2657     2657           
  Misses         9027     9027           
Flag Coverage Δ
javascript 13.95% <50.00%> (ø)
php 65.47% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed Coverage Δ
src/views/Calendar.vue 0.00% <ø> (ø)
src/views/EditSidebar.vue 0.00% <0.00%> (ø)
src/store/settings.js 88.59% <100.00%> (ø)

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Member

@st3iny st3iny left a comment

Choose a reason for hiding this comment

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

Tested and works. Thank you very much for fixing this ❤️

@st3iny st3iny added this to the v4.5.0 milestone Aug 3, 2023
@st3iny
Copy link
Member

st3iny commented Aug 3, 2023

/backport to stable4.4

@backportbot-nextcloud backportbot-nextcloud bot added the backport-request A backport was requested for this pull request label Aug 3, 2023
@st3iny st3iny merged commit ff43d1c into main Aug 3, 2023
40 checks passed
@st3iny st3iny deleted the fix/navigation-toggle-overlap branch August 3, 2023 09:12
@st3iny st3iny added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Aug 3, 2023
@backportbot-nextcloud backportbot-nextcloud bot removed the backport-request A backport was requested for this pull request label Aug 3, 2023
@raimund-schluessler
Copy link
Member

Sorry to ruin the party here, but if one enables Show week numbers, the navigation toggle now overlaps the week number completely. This is an issue in the day, week and month view.

Day view:
Screenshot 2023-08-04 at 14-37-28 4  Aug  2023 - Kalender - Nextcloud

Week view:
Screenshot 2023-08-04 at 14-35-09 Woche 31 aus 2023 - Kalender - Nextcloud

Month view:
Screenshot 2023-08-04 at 14-35-30 August 2023 - Kalender - Nextcloud

@jancborchardt
Copy link
Member Author

@raimund-schluessler right, good point.

  • in Day and Week view, we could widen the first column a little bit
  • in Month view we could make the weekday row higher

Do you think this would be a proper fix or do you see any further issues with that? @ChristophWurst @st3iny @siccovansas

@szaimen
Copy link
Contributor

szaimen commented Sep 14, 2023

I found a working solution with

.fc-scrollgrid-sync-inner {
margin-top:8px
}

.fc-timegrid-axis-cushion  {
margin-top:44px;
}

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish bug design Related to design, interface, interaction design, UX, etc.
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants