Merge pull request #4039 from nextcloud/backport/3999/stable25

[stable25] fix: scroll for outline
nextcloud · Apr 12, 2023 · f46801b · f46801b
2 parents 2dfa82b + aea3d14
commit f46801b
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 15 deletions.
diff --git a/js/editor.js b/js/editor.js
diff --git a/js/editor.js.map b/js/editor.js.map
diff --git a/js/text-files.js b/js/text-files.js
diff --git a/js/text-files.js.map b/js/text-files.js.map
diff --git a/js/text-public.js b/js/text-public.js
diff --git a/js/text-public.js.map b/js/text-public.js.map
diff --git a/js/text-text.js b/js/text-text.js
diff --git a/js/text-text.js.map b/js/text-text.js.map
diff --git a/js/text-viewer.js b/js/text-viewer.js
diff --git a/js/text-viewer.js.map b/js/text-viewer.js.map
diff --git a/src/components/Editor/EditorOutline.vue b/src/components/Editor/EditorOutline.vue
@@ -58,6 +58,8 @@ export default {
 	padding: 0 10px 10px 10px;
 	position: fixed;
 	overflow: auto;
+	// 204px = 50px nc header + 60px collectives titlebar + 44px menubar + 50px bottom margin
+	max-height: calc(100% - 204px);
 
 	&-mobile {
 		box-shadow: 8px 0 17px -19px var(--color-box-shadow);
@@ -68,6 +70,9 @@ export default {
 	&__header {
 		margin: 0;
 		position: sticky;
+		top: 0;
+		z-index: 1;
+		background-color: var(--color-main-background);
 		padding: 0.6em 0.6em 0.6em 0;
 		display: flex;
 		align-items: center;

diff --git a/src/components/Editor/TableOfContents.vue b/src/components/Editor/TableOfContents.vue
@@ -90,6 +90,7 @@ export default {
 		overflow: hidden;
 		white-space: nowrap;
 		animation: initialPadding calc(var(--animation-duration) * 2);
+		width: calc(100% - var(--padding-left));
 
 		a:hover {
 			color: var(--color-primary-hover);