Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve shared status button #41453

Merged
merged 1 commit into from
Nov 14, 2023
Merged

Improve shared status button #41453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion apps/files/src/components/FileEntry/FileEntryActions.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
:container="getBoundariesElement"
:disabled="isLoading || loading !== ''"
:force-name="true"
type="tertiary"
:force-menu="enabledInlineActions.length === 0 /* forceMenu only if no inline actions */"
:inline="enabledInlineActions.length"
:open.sync="openedMenu"
Expand Down Expand Up @@ -94,7 +95,7 @@
<script lang="ts">
import { DefaultType, FileAction, Node, NodeStatus, View, getFileActions } from '@nextcloud/files'
import { showError, showSuccess } from '@nextcloud/dialogs'
import { translate as t } from '@nextcloud/l10n';
import { translate as t } from '@nextcloud/l10n'
import Vue, { PropType } from 'vue'

import ArrowLeftIcon from 'vue-material-design-icons/ArrowLeft.vue'
Expand Down Expand Up @@ -321,3 +322,15 @@ export default Vue.extend({
},
})
</script>

<style lang="scss" scoped>

:deep(.button-vue--icon-and-text, .files-list__row-action-sharing-status) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This means one of the libraries has an issue?
Do all apps that use the filepicker from nextcloud/dialogs need to cheat like this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, In the rush of those days I missed this comment.
No: this whole set of changes were temporary hacks for files screenshots sake and a less than ideal solutions. I wouldn't have wanted to replicate them in other places.
We talked about using two columns for owner and shared status and doing this properly in the near future.

.button-vue__text {
color: var(--color-primary-element);
}
.button-vue__icon {
color: var(--color-primary-element);
}
}
</style>
4 changes: 2 additions & 2 deletions dist/files-main.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files-main.js.map
View file
Open in desktop

Large diffs are not rendered by default.