Skip to content

Commit 2cf8d6d

Browse files
authored
Merge pull request #39196 from nextcloud/feat/f2v/sharing
2 parents 5c6ed30 + 74763e8 commit 2cf8d6d

60 files changed

Lines changed: 2228 additions & 1329 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

__mocks__/@nextcloud/axios.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
*
2121
*/
2222
export default {
23+
get: async () => ({ status: 200, data: {} }),
2324
delete: async () => ({ status: 200, data: {} }),
2425
post: async () => ({ status: 200, data: {} }),
2526
}

apps/files/css/files.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/files/css/files.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/files/css/files.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,13 @@
144144
.nav-icon-favorites {
145145
@include icon-color('starred', 'actions', variables.$color-black, 2, true);
146146
}
147-
.nav-icon-sharingin,
148-
.nav-icon-sharingout,
149-
.nav-icon-pendingshares,
150-
.nav-icon-shareoverview {
147+
.nav-icon-sharinginOld,
148+
.nav-icon-sharingoutOld,
149+
.nav-icon-pendingsharesOld,
150+
.nav-icon-shareoverviewOld {
151151
@include icon-color('share', 'files', variables.$color-black);
152152
}
153-
.nav-icon-sharinglinks {
153+
.nav-icon-sharinglinksOld {
154154
@include icon-color('public', 'files', variables.$color-black);
155155
}
156156
.nav-icon-extstoragemounts {
@@ -162,7 +162,7 @@
162162
.nav-icon-trashbin-starred {
163163
@include icon-color('delete', 'files', #ff0000);
164164
}
165-
.nav-icon-deletedshares {
165+
.nav-icon-deletedsharesOld {
166166
@include icon-color('unshare', 'files', variables.$color-black);
167167
}
168168
.nav-icon-favorites-starred {

apps/files/css/merged.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)