Skip to content
Snippets Groups Projects
Commit ebefcd87 authored by chris's avatar chris Committed by john
Browse files

scroll panes don't overlap on editor render

parent 3d206132
No related branches found
No related tags found
No related merge requests found
...@@ -10,7 +10,7 @@ import Comments from './panes/Comments/CommentBoxList' ...@@ -10,7 +10,7 @@ import Comments from './panes/Comments/CommentBoxList'
import CommentsProvider from './panes/Comments/CommentsProvider' import CommentsProvider from './panes/Comments/CommentsProvider'
import ContainerEditor from './ContainerEditor' import ContainerEditor from './ContainerEditor'
import Notes from './panes/Notes/Notes' // import Notes from './panes/Notes/Notes'
import NotesProvider from './panes/Notes/NotesProvider' import NotesProvider from './panes/Notes/NotesProvider'
// import TableOfContents from './panes/TableOfContents/TableOfContents' // import TableOfContents from './panes/TableOfContents/TableOfContents'
......
...@@ -263,7 +263,7 @@ $active-blue: #4a90e2; ...@@ -263,7 +263,7 @@ $active-blue: #4a90e2;
color: $transparent-black; color: $transparent-black;
font-family: 'Fira Sans'; font-family: 'Fira Sans';
line-height: 38px; line-height: 38px;
margin: 1.5% 0% 5% 15%; margin: 1.5% 0% 0% 15%;
min-height: 100vh; min-height: 100vh;
padding: 1% 0%; padding: 1% 0%;
transition: .3s; transition: .3s;
......
...@@ -16,10 +16,10 @@ $background: #fff; ...@@ -16,10 +16,10 @@ $background: #fff;
.se-scrollable { .se-scrollable {
background: $background; background: $background;
margin-top: 0; margin: 0% 0% 5% 0%;
min-height: 95px; min-height: 135px;
.se-content { div.se-content {
background: $background; background: $background;
box-shadow: none; box-shadow: none;
margin: 0; margin: 0;
......
...@@ -19,11 +19,7 @@ class Notes extends Component { ...@@ -19,11 +19,7 @@ class Notes extends Component {
} }
didUpdate () { didUpdate () {
// TEMP This will be merged in redesign branch. this.computeScrollPane()
this.el.el.classList.remove('sm-auto-fill')
this.el.el.classList.remove('se-pane')
const mainScrollPane = document.getElementById('content-panel')
mainScrollPane.style.height = this.el.el.offsetTop - 162 + 'px'
} }
render ($$) { render ($$) {
...@@ -104,6 +100,11 @@ class Notes extends Component { ...@@ -104,6 +100,11 @@ class Notes extends Component {
window.removeEventListener('mouseup', this.stopResize, false) window.removeEventListener('mouseup', this.stopResize, false)
} }
computeScrollPane () {
const mainScrollPane = document.getElementById('content-panel').children
mainScrollPane[0].style.maxHeight = this.el.el.offsetTop - 162 + 'px'
}
onNotesUpdated (change) { onNotesUpdated (change) {
const notesProvider = this.getProvider() const notesProvider = this.getProvider()
notesProvider.handleDocumentChange(change) notesProvider.handleDocumentChange(change)
......
...@@ -5,7 +5,7 @@ $light-blue: #e4f0ff; ...@@ -5,7 +5,7 @@ $light-blue: #e4f0ff;
background-color: $white; background-color: $white;
bottom: 0; bottom: 0;
counter-reset: note-footer; counter-reset: note-footer;
height: 95px; height: 135px;
left: 15%; left: 15%;
max-height: 700px; max-height: 700px;
min-height: 10px; min-height: 10px;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment