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 overlapping toggle #5475

Merged
merged 2 commits into from
Sep 19, 2023
Merged

fix overlapping toggle #5475

merged 2 commits into from
Sep 19, 2023

Conversation

szaimen
Copy link
Contributor

@szaimen szaimen commented Sep 14, 2023

Close #5391

Before After
image image
image image
image image

Signed-off-by: Simon L <szaimen@e.mail.de>
@szaimen szaimen added 2. developing Work in progress bug design Related to design, interface, interaction design, UX, etc. labels Sep 14, 2023
@szaimen szaimen added this to the v4.6.0 milestone Sep 14, 2023
@szaimen szaimen added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Sep 14, 2023
@szaimen szaimen marked this pull request as ready for review September 14, 2023 14:18
@codecov
Copy link

codecov bot commented Sep 14, 2023

Codecov Report

Patch coverage has no change and project coverage change: -0.01% ⚠️

Comparison is base (bddcaa3) 22.62% compared to head (c4a89b8) 22.61%.
Report is 53 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main    #5475      +/-   ##
============================================
- Coverage     22.62%   22.61%   -0.01%     
  Complexity      395      395              
============================================
  Files           241      241              
  Lines         11843    11848       +5     
  Branches       2305     2306       +1     
============================================
  Hits           2679     2679              
- Misses         9164     9169       +5     
Flag Coverage Δ
javascript 13.81% <0.00%> (-0.01%) ⬇️
php 64.26% <ø> (ø)

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

Files Changed Coverage Δ
src/components/Appointments/AppointmentDetails.vue 0.00% <ø> (ø)
...rc/components/Editor/AvatarParticipationStatus.vue 0.00% <ø> (ø)
src/components/Editor/Invitees/InviteesList.vue 0.00% <0.00%> (ø)
src/mixins/EditorMixin.js 3.53% <0.00%> (ø)
src/views/Appointments/Booking.vue 0.00% <0.00%> (ø)
src/views/EditSidebar.vue 0.00% <ø> (ø)

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

Copy link
Member

@nimishavijay nimishavijay left a comment

Choose a reason for hiding this comment

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

Nice! :)

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.

I like the approach but it causes the week numbers to be misaligned in all but the first rows.

grafik

Signed-off-by: Simon L <szaimen@e.mail.de>
@szaimen
Copy link
Contributor Author

szaimen commented Sep 19, 2023

@st3iny thanks for the review! I adjusted the PR. Please test again as it should work btter now :)

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.

@st3iny st3iny merged commit 3cb958a into main Sep 19, 2023
38 of 40 checks passed
@st3iny st3iny deleted the enh/5391/fix-overlapping-toggle branch September 19, 2023 16:34
@szaimen
Copy link
Contributor Author

szaimen commented Sep 19, 2023

/backport to stable4.5

@backportbot-nextcloud backportbot-nextcloud bot added the backport-request A backport was requested for this pull request label Sep 19, 2023
@backportbot-nextcloud backportbot-nextcloud bot removed the backport-request A backport was requested for this pull request label Sep 19, 2023
@raimund-schluessler
Copy link
Member

That's how it looks for me now with Calendar 4.5.1 on Firefox 117 in Week view with German locale:

grafik

@szaimen
Copy link
Contributor Author

szaimen commented Sep 25, 2023

This seems to fix it in firefox:

.fc-timegrid-axis.fc-scrollgrid-shrink {
  height:65px;
}

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews bug design Related to design, interface, interaction design, UX, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants