Skip to content

Commit

Permalink
[stable22] make collabora on top of text idle message
Browse files Browse the repository at this point in the history
* Backports: #1860
* Target version: stable22

Signed-off-by: Luka Trovic <luka@nextcloud.com>
  • Loading branch information
luka-nextcloud authored and max-nextcloud committed Jan 13, 2022
1 parent cdd5712 commit ab2341c
Show file tree
Hide file tree
Showing 14 changed files with 24 additions and 26 deletions.
4 changes: 2 additions & 2 deletions js/editor-rich.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/editor-rich.js.map

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions js/editor.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/editor.js.map

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions js/files.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/files.js.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions js/public.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/public.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/viewer.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/viewer.js.map

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion src/components/EditorWrapper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,6 @@ export default {
}
.document-status {
z-index: 1010;
position: relative;
background-color: var(--color-main-background);
Expand Down
1 change: 0 additions & 1 deletion src/views/RichWorkspace.vue
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,6 @@ export default {
text-align: left;
max-height: 0;
transition: max-height 0.5s cubic-bezier(0, 1, 0, 1);
position: relative;
&.creatable {
min-height: 90px;
}
Expand Down

0 comments on commit ab2341c

Please sign in to comment.