Merge pull request #39196 from nextcloud/feat/f2v/sharing

nextcloud · Jul 11, 2023 · 2cf8d6d · 2cf8d6d
2 parents 5c6ed30 + 74763e8
commit 2cf8d6d
Show file tree

Hide file tree

Showing 60 changed files with 2,228 additions and 1,329 deletions.
diff --git a/__mocks__/@nextcloud/axios.ts b/__mocks__/@nextcloud/axios.ts
@@ -20,6 +20,7 @@
  *
  */
 export default {
+	get: async () => ({ status: 200, data: {} }),
 	delete: async () => ({ status: 200, data: {} }),
 	post: async () => ({ status: 200, data: {} }),
 }
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
diff --git a/apps/files/css/files.css.map b/apps/files/css/files.css.map
diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss
@@ -144,13 +144,13 @@
 .nav-icon-favorites {
 	@include icon-color('starred', 'actions', variables.$color-black, 2, true);
 }
-.nav-icon-sharingin,
-.nav-icon-sharingout,
-.nav-icon-pendingshares,
-.nav-icon-shareoverview {
+.nav-icon-sharinginOld,
+.nav-icon-sharingoutOld,
+.nav-icon-pendingsharesOld,
+.nav-icon-shareoverviewOld {
 	@include icon-color('share', 'files', variables.$color-black);
 }
-.nav-icon-sharinglinks {
+.nav-icon-sharinglinksOld {
 	@include icon-color('public', 'files', variables.$color-black);
 }
 .nav-icon-extstoragemounts {
@@ -162,7 +162,7 @@
 .nav-icon-trashbin-starred {
 	@include icon-color('delete', 'files', #ff0000);
 }
-.nav-icon-deletedshares {
+.nav-icon-deletedsharesOld {
 	@include icon-color('unshare', 'files', variables.$color-black);
 }
 .nav-icon-favorites-starred {

diff --git a/apps/files/css/merged.css b/apps/files/css/merged.css