Skip to content

Commit

Permalink
WIP - Fix Secondary Panes Scroll Bar (firefox-devtools#4275)
Browse files Browse the repository at this point in the history
  • Loading branch information
James300 authored and Johnny Khalil committed Oct 13, 2017
1 parent a349480 commit 79a7cde
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
1 change: 0 additions & 1 deletion src/components/SecondaryPanes/CommandBar.css
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
9 changes: 7 additions & 2 deletions src/components/SecondaryPanes/SecondaryPanes.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.secondary-panes {
overflow: scroll;
display: flex;
flex-direction: column;
flex: 1;
Expand All @@ -13,8 +14,12 @@
the wrapper.
Ref: https://github.com/devtools-html/debugger.html/issues/3426
*/
.secondary-panes--sticky-commandbar {
overflow-y: scroll;

.secondary-panes-wrapper {
height: 100%;
width: 100%;
display: flex;
flex-direction: column;
}

.secondary-panes .accordion {
Expand Down
10 changes: 6 additions & 4 deletions src/components/SecondaryPanes/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -232,11 +232,13 @@ class SecondaryPanes extends Component {

render() {
return (
<div className="secondary-panes secondary-panes--sticky-commandbar">
<div className="secondary-panes-wrapper">
<CommandBar horizontal={this.props.horizontal} />
{this.props.horizontal
? this.renderHorizontalLayout()
: this.renderVerticalLayout()}
<div className="secondary-panes">
{this.props.horizontal
? this.renderHorizontalLayout()
: this.renderVerticalLayout()}
</div>
{this.renderUtilsBar()}
</div>
);
Expand Down

0 comments on commit 79a7cde

Please sign in to comment.