Skip to content

Commit

Permalink
Merge pull request #2095 from nextcloud/backport/stable22/1888
Browse files Browse the repository at this point in the history
[stable22] Only show image author annotations if needed
  • Loading branch information
max-nextcloud authored Jan 18, 2022
2 parents ed013f3 + d5fc975 commit b668529
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 15 deletions.
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.

2 changes: 1 addition & 1 deletion 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.

2 changes: 1 addition & 1 deletion 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.

3 changes: 2 additions & 1 deletion src/components/EditorWrapper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,8 @@ export default {
padding-bottom: 2px;
}

&:not(.show-color-annotations)::v-deep .author-annotation {
&:not(.show-color-annotations)::v-deep .author-annotation,
&:not(.show-color-annotations)::v-deep .image {
background-color: transparent !important;
color: var(--color-main-text) !important;
}
Expand Down

0 comments on commit b668529

Please sign in to comment.