Skip to content
Snippets Groups Projects
Commit 87bd070c authored by Tom Robinson's avatar Tom Robinson
Browse files

Fix data ref sidebar not filling viewport and fullscreen dashboards not hiding nav bar

parent fe7706e8
Branches
Tags
No related merge requests found
......@@ -2,6 +2,8 @@
import React from "react";
import PropTypes from "prop-types";
import fitViewport from "metabase/hoc/FitViewPort";
const SidebarLayout = ({ className, style, sidebar, children }) => (
<div
className={className}
......@@ -10,7 +12,7 @@ const SidebarLayout = ({ className, style, sidebar, children }) => (
{React.cloneElement(
sidebar,
{
style: { flexShrink: 0 },
style: { flexShrink: 0, alignSelf: "stretch" },
className: "scroll-y scroll-show scroll--light scroll-show--hover",
},
sidebar.props.children,
......@@ -39,4 +41,4 @@ SidebarLayout.propTypes = {
children: PropTypes.element.isRequired,
};
export default SidebarLayout;
export default fitViewport(SidebarLayout);
.Nav {
z-index: 4;
flex-shrink: 0;
}
.QuestionCircle {
......
......@@ -180,6 +180,8 @@ export default class Navbar extends Component {
renderAdminNav() {
return (
// NOTE: DO NOT REMOVE `Nav` CLASS FOR NOW, USED BY MODALS, FULLSCREEN DASHBOARD, ETC
// TODO: hide nav using state in redux instead?
<nav className={cx("Nav AdminNav sm-py1")}>
<div className="sm-pl4 flex align-center pr1">
<div className="NavTitle flex align-center">
......@@ -224,6 +226,8 @@ export default class Navbar extends Component {
renderEmptyNav() {
return (
// NOTE: DO NOT REMOVE `Nav` CLASS FOR NOW, USED BY MODALS, FULLSCREEN DASHBOARD, ETC
// TODO: hide nav using state in redux instead?
<nav className="Nav sm-py1 relative">
<ul className="wrapper flex align-center">
<li>
......@@ -244,7 +248,9 @@ export default class Navbar extends Component {
renderMainNav() {
return (
<Flex
className="relative bg-brand text-white z3"
// NOTE: DO NOT REMOVE `Nav` CLASS FOR NOW, USED BY MODALS, FULLSCREEN DASHBOARD, ETC
// TODO: hide nav using state in redux instead?
className="Nav relative bg-brand text-white z3"
align="center"
py={1}
pr={2}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment