Skip to content

Conversation

@backportbot
Copy link

@backportbot backportbot bot commented Apr 30, 2025

Backport of #7130

@backportbot backportbot bot requested review from max-nextcloud and mejo- April 30, 2025 15:59
@backportbot backportbot bot added bug Something isn't working 3. to review regression labels Apr 30, 2025
@backportbot backportbot bot added this to the Nextcloud 31.0.5 milestone Apr 30, 2025
@mejo- mejo- force-pushed the backport/7130/stable31 branch from 3f5dedb to 09da6c8 Compare April 30, 2025 16:02
mejo- added 2 commits April 30, 2025 18:04
Move DocumentStatus into parent container to do so.

Fixes stickyness of document status if editor does not have the full
app content height, e.g. in Collectives or Deck.

Signed-off-by: Jonas <[email protected]>
Fixes stickyness of menubar when editor does not have the full app
height, e.g. in Collectives and Deck.

Fixes: nextcloud/collectives#1704

Signed-off-by: Jonas <[email protected]>
@mejo- mejo- force-pushed the backport/7130/stable31 branch 4 times, most recently from 2bd4c81 to 26c48a9 Compare April 30, 2025 16:13
@mejo- mejo- marked this pull request as ready for review April 30, 2025 16:14
mejo- added 8 commits April 30, 2025 18:16
Fixes "[Vue warn]: Property or method "lock" is not defined on the
instance but referenced during render."

Signed-off-by: Jonas <[email protected]>
Make sure that document status and collision resolve dialog stay visible
when scrolling down long documents.

Signed-off-by: Jonas <[email protected]>
Use flexbox layout instead of height `100%` to avoid issues where editor
is embedded into other apps and doesn't take full height.

Signed-off-by: Jonas <[email protected]>
We want the border to separate document content and menubar. So when we
display the menubar at the bottom on mobile, the menubar border should
be on top, not bottom of it.

Signed-off-by: Jonas <[email protected]>
I spent some time trying to figure out where the extra 8px came from
that created the scrollbar even with short content on mobile. In the end
this seems like an acceptable workaround for now.

Signed-off-by: Jonas <[email protected]>
@mejo- mejo- force-pushed the backport/7130/stable31 branch from 26c48a9 to edc1272 Compare April 30, 2025 16:16
@codecov
Copy link

codecov bot commented Apr 30, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 51.89%. Comparing base (dfa604b) to head (edc1272).
Report is 12 commits behind head on stable31.

Additional details and impacted files
@@             Coverage Diff              @@
##           stable31    #7158      +/-   ##
============================================
+ Coverage     51.84%   51.89%   +0.05%     
============================================
  Files           287      287              
  Lines         40853    40904      +51     
  Branches        794      794              
============================================
+ Hits          21182    21229      +47     
- Misses        19550    19554       +4     
  Partials        121      121              

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@mejo- mejo- merged commit 0b618ce into stable31 Apr 30, 2025
64 checks passed
@mejo- mejo- deleted the backport/7130/stable31 branch April 30, 2025 18:31
@blizzz blizzz mentioned this pull request May 5, 2025
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review bug Something isn't working regression

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants