diff --git a/app/assets/javascripts/components/NoteGroupView.tsx b/app/assets/javascripts/components/NoteGroupView.tsx index c84b62635..cfc03a5ed 100644 --- a/app/assets/javascripts/components/NoteGroupView.tsx +++ b/app/assets/javascripts/components/NoteGroupView.tsx @@ -40,7 +40,7 @@ export class NoteGroupView extends PureComponent { render() { return ( -
+
{this.state.showMultipleSelectedNotes && ( { > {this.state.marginResizersEnabled && this.editorContentRef.current ? ( -
- -
+ ) : null} {this.state.editorComponentViewer && ( diff --git a/app/assets/javascripts/components/PanelResizer.tsx b/app/assets/javascripts/components/PanelResizer.tsx index efcde9d4b..11210ca76 100644 --- a/app/assets/javascripts/components/PanelResizer.tsx +++ b/app/assets/javascripts/components/PanelResizer.tsx @@ -71,7 +71,7 @@ export class PanelResizer extends Component { document.addEventListener('mouseup', this.onMouseUp); document.addEventListener('mousemove', this.onMouseMove); this.debouncedResizeHandler = debounce(this.handleResize, 250); - if (this.props.side === PanelSide.Right) { + if (this.props.type === PanelResizeType.OffsetAndWidth) { window.addEventListener('resize', this.debouncedResizeHandler); } } diff --git a/app/assets/stylesheets/_columns.scss b/app/assets/stylesheets/_columns.scss index 74191ce79..dcbaa273d 100644 --- a/app/assets/stylesheets/_columns.scss +++ b/app/assets/stylesheets/_columns.scss @@ -5,16 +5,19 @@ .app-column-first { width: 180px; - flex-grow: 0; + flex-shrink: 0.2; } .app-column-second { width: 350px; - flex-grow: 0; + flex-shrink: 0.5; } .app-column-third { - flex: 1 50%; + flex-grow: 1; + flex-shrink: 0.3; } -.app-column {} +.app-column { + overflow: hidden; +} \ No newline at end of file diff --git a/app/assets/stylesheets/_editor.scss b/app/assets/stylesheets/_editor.scss index a570fd5c7..5c209bd15 100644 --- a/app/assets/stylesheets/_editor.scss +++ b/app/assets/stylesheets/_editor.scss @@ -7,7 +7,6 @@ $heading-height: 75px; } .section.editor { - flex: 1 50%; display: flex; flex-direction: column; overflow-y: hidden; @@ -39,7 +38,6 @@ $heading-height: 75px; z-index: $z-index-editor-title-bar; height: auto; - overflow: visible; .title { font-size: var(--sn-stylekit-font-size-h1); diff --git a/app/assets/stylesheets/_main.scss b/app/assets/stylesheets/_main.scss index 181b7a03e..9ad9017c4 100644 --- a/app/assets/stylesheets/_main.scss +++ b/app/assets/stylesheets/_main.scss @@ -132,7 +132,8 @@ $footer-height: 2rem; height: calc(100% - #{$footer-height}); width: 100%; vertical-align: top; - overflow: hidden; + overflow-x: scroll; + overflow-y: hidden; position: relative; panel-resizer, .panel-resizer { diff --git a/app/assets/stylesheets/_notes.scss b/app/assets/stylesheets/_notes.scss index ad12f66f5..ca6b773b2 100644 --- a/app/assets/stylesheets/_notes.scss +++ b/app/assets/stylesheets/_notes.scss @@ -5,7 +5,6 @@ border-left: 1px solid var(--sn-stylekit-border-color); border-right: 1px solid var(--sn-stylekit-border-color); font-size: var(--sn-stylekit-font-size-h2); - overflow: visible; user-select: none; -moz-user-select: none;