From f37b10dc01e20177e6805dca674ca73d3cbf2c46 Mon Sep 17 00:00:00 2001 From: James Stewart Date: Tue, 3 Oct 2017 19:22:46 -0500 Subject: [PATCH 1/2] Fix Secondary Panes Scroll Bar --- src/components/SecondaryPanes/CommandBar.css | 1 - src/components/SecondaryPanes/SecondaryPanes.css | 9 ++++++++- src/components/SecondaryPanes/index.js | 10 ++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/components/SecondaryPanes/CommandBar.css b/src/components/SecondaryPanes/CommandBar.css index c3c52e9c98..990825c180 100644 --- a/src/components/SecondaryPanes/CommandBar.css +++ b/src/components/SecondaryPanes/CommandBar.css @@ -3,7 +3,6 @@ border-bottom: 1px solid var(--theme-splitter-color); display: flex; overflow: hidden; - position: sticky; z-index: 1; background-color: var(--theme-toolbar-background); } diff --git a/src/components/SecondaryPanes/SecondaryPanes.css b/src/components/SecondaryPanes/SecondaryPanes.css index b10119bcc6..dde0c66390 100644 --- a/src/components/SecondaryPanes/SecondaryPanes.css +++ b/src/components/SecondaryPanes/SecondaryPanes.css @@ -1,4 +1,5 @@ .secondary-panes { + overflow: auto; display: flex; flex-direction: column; flex: 1; @@ -14,7 +15,13 @@ Ref: https://github.com/devtools-html/debugger.html/issues/3426 */ .secondary-panes--sticky-commandbar { - overflow-y: scroll; + overflow-y: hidden; +} + +.secondary-panes-wrapper { + height: 100%; + width: 100%; + overflow: hidden; } .secondary-panes .accordion { diff --git a/src/components/SecondaryPanes/index.js b/src/components/SecondaryPanes/index.js index 55cd6f9a03..3e39c26209 100644 --- a/src/components/SecondaryPanes/index.js +++ b/src/components/SecondaryPanes/index.js @@ -232,11 +232,13 @@ class SecondaryPanes extends Component { render() { return ( -
+
- {this.props.horizontal - ? this.renderHorizontalLayout() - : this.renderVerticalLayout()} +
+ {this.props.horizontal + ? this.renderHorizontalLayout() + : this.renderVerticalLayout()} +
{this.renderUtilsBar()}
); From f1ba6e135dc9355d44cc5648374b18b1bcb6c9cf Mon Sep 17 00:00:00 2001 From: codehag Date: Tue, 10 Oct 2017 14:55:59 +0200 Subject: [PATCH 2/2] fix up css --- src/components/SecondaryPanes/SecondaryPanes.css | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/components/SecondaryPanes/SecondaryPanes.css b/src/components/SecondaryPanes/SecondaryPanes.css index dde0c66390..8d3cac7188 100644 --- a/src/components/SecondaryPanes/SecondaryPanes.css +++ b/src/components/SecondaryPanes/SecondaryPanes.css @@ -1,5 +1,5 @@ .secondary-panes { - overflow: auto; + overflow: scroll; display: flex; flex-direction: column; flex: 1; @@ -14,14 +14,12 @@ the wrapper. Ref: https://github.com/devtools-html/debugger.html/issues/3426 */ -.secondary-panes--sticky-commandbar { - overflow-y: hidden; -} .secondary-panes-wrapper { height: 100%; width: 100%; - overflow: hidden; + display: flex; + flex-direction: column; } .secondary-panes .accordion {