Merge pull request #578 from sharelatex/as-fix-cm-scrolling

Fix rich text not scrolling correctly
This commit is contained in:
Alasdair Smith 2018-05-24 09:57:38 +01:00 committed by GitHub
commit 0665cf1ebf
2 changed files with 26 additions and 7 deletions

View file

@ -201,13 +201,9 @@
} }
} }
.cm-editor-wrapper { /**************************************
height: 100%; Ace
***************************************/
.CodeMirror {
height: 100%;
}
}
// The internal components of the aceEditor directive // The internal components of the aceEditor directive
.ace-editor-wrapper { .ace-editor-wrapper {
@ -282,6 +278,23 @@
} }
} }
/**************************************
CodeMirror
***************************************/
.cm-editor-wrapper {
position: relative;
height: 100%;
}
.cm-editor-body {
height: 100%;
}
// CM (for some reason) has height set to 300px in it's stylesheet
.CodeMirror {
height: 100%;
}
.ui-layout-resizer when (@is-overleaf = false) { .ui-layout-resizer when (@is-overleaf = false) {
width: 6px; width: 6px;
background-color: @editor-resizer-bg-color; background-color: @editor-resizer-bg-color;

View file

@ -775,6 +775,12 @@
} }
} }
#editor-rich-text {
.rp-size-expanded & {
right: @review-panel-width;
}
}
.rp-toggle { .rp-toggle {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;