Skip to content

Commit

Permalink
Merge pull request #4649 from nextcloud/backport/4637/stable27
Browse files Browse the repository at this point in the history
[stable27] fix: Use resize observer to calculate menubar icon limit
  • Loading branch information
mejo- committed Aug 8, 2023
2 parents 6d2ab5a + 1f0e0e1 commit 731c460
Show file tree
Hide file tree
Showing 17 changed files with 121 additions and 179 deletions.
4 changes: 2 additions & 2 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.

4 changes: 2 additions & 2 deletions js/text-editors.js

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-files.js

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-public.js

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-text.js

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-viewer.js

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/vendors.js

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

178 changes: 81 additions & 97 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
],
"dependencies": {
"@hedgedoc/markdown-it-task-lists": "^2.0.1",
"@hocuspocus/provider": "^2.2.3",
"@nextcloud/auth": "^2.1.0",
"@nextcloud/axios": "^2.4.0",
"@nextcloud/browser-storage": "^0.2.0",
Expand Down Expand Up @@ -85,6 +84,7 @@
"@tiptap/pm": "^2.0.4",
"@tiptap/suggestion": "^2.0.4",
"@tiptap/vue-2": "^2.0.4",
"@vueuse/shared": "^10.3.0",
"debounce": "^1.2.1",
"escape-html": "^1.0.3",
"highlight.js": "^11.8.0",
Expand Down Expand Up @@ -123,6 +123,7 @@
"@vitejs/plugin-vue2": "^2.2.0",
"@vue/test-utils": "^1.3.0 <2",
"@vue/vue2-jest": "^29.2.4",
"@vueuse/core": "^10.3.0",
"cypress": "^12.17.3",
"eslint-plugin-cypress": "^2.13.3",
"identity-obj-proxy": "^3.0.0",
Expand Down
Loading

0 comments on commit 731c460

Please sign in to comment.