Skip to content

Commit

Permalink
Merge pull request #1888 from nextcloud/bugfix/1779
Browse files Browse the repository at this point in the history
Only show image author annotations if needed
  • Loading branch information
azul authored Oct 25, 2021
2 parents d7f10f4 + 9f649aa commit dca0e66
Show file tree
Hide file tree
Showing 15 changed files with 23 additions and 22 deletions.
4 changes: 2 additions & 2 deletions js/editor-rich.js

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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/files-modal.js

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

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

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

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.

3 changes: 2 additions & 1 deletion src/components/EditorWrapper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,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 dca0e66

Please sign in to comment.