Add latest changes from gitlab-org/gitlab@master

2021-10-16 15:10:02 +00:00 · 2021-10-16 15:10:02 +00:00 · 60d80518a9
parent 2dae585b20
commit 60d80518a9
2 changed files with 4 additions and 1 deletions
--- a/app/assets/stylesheets/components/content_editor.scss
+++ b/app/assets/stylesheets/components/content_editor.scss
@ -1,4 +1,7 @@
 .ProseMirror {
+  max-height: 55vh;
+  overflow-y: auto;
+
  td,
  th,
  li,
--- a/app/assets/stylesheets/page_bundles/wiki.scss
+++ b/app/assets/stylesheets/page_bundles/wiki.scss
@ -152,5 +152,5 @@ ul.wiki-pages-list.content-list {
 }

 .wiki-form .markdown-area {
-  max-height: none;
+  max-height: 55vh;
 }