Skip to content

Commit

Permalink
Merge pull request #3839 from nextcloud/bugfix/3838
Browse files Browse the repository at this point in the history
fix: Bring back direct editing scrolling and fix scrollbar color
  • Loading branch information
mejo- authored Feb 27, 2023
2 parents 6cf6e56 + 235c433 commit 7a9b452
Show file tree
Hide file tree
Showing 13 changed files with 23 additions and 23 deletions.
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/text-editors.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-editors.js.map

Large diffs are not rendered by default.

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.

10 changes: 5 additions & 5 deletions src/views/DirectEditing.vue
Original file line number Diff line number Diff line change
Expand Up @@ -128,22 +128,22 @@ export default {
</script>

<style lang="scss">
body {
position: fixed;
background-color: var(--color-main-background);
}
#content[class=app-public] {
margin: 0;
margin-top: 0;
}
</style>

<style scoped lang="scss">
body {
position: fixed;
}
#direct-editor {
width: 100%;
height: 100%;
position: fixed;
overflow: hidden;
overflow: auto;
&:deep(.text-editor) {
height: 100%;
Expand Down

0 comments on commit 7a9b452

Please sign in to comment.