Skip to content
Snippets Groups Projects
Commit 9345f92a authored by Allen Gilliland's avatar Allen Gilliland
Browse files

Merge branch 'create_dashboard' of github.com:metabase/metabase-init into create_dashboard

parents ec000f8f 97768c5a
Branches
Tags
No related merge requests found
.Dashboard {
background-color: white;
background-color: #f9fbfc;
}
.Dash-wrapper {
......@@ -55,6 +55,10 @@
}
}
.DashCard .Card {
background-color: white;
}
.Dash--editing .DashCard .Card.Card--recent {
/*background-color: rgb(255, 250, 243);*/
animation-duration: 30s;
......
......@@ -32,23 +32,17 @@ export default class Dashboard extends Component {
let { dashboard } = this.props;
let { error } = this.state;
return (
<div className="Dashboard full-height flex flex-row flex-full">
<div className="Dashboard full-height flex flex-column flex-full">
{ !error && !dashboard ?
<div className="text-centered my4 py4">
<div className="Dash-wrapper wrapper">
<div className="my4 py4 text-brand">
<LoadingSpinner />
<h1 className="text-normal text-grey-2">Loading...</h1>
</div>
</div>
<div className="Dash-wrapper wrapper py4 text-brand text-centered flex-full bg-white">
<LoadingSpinner />
<h1 className="text-normal text-grey-2">Loading...</h1>
</div>
: null }
{ error ?
<div className="Dash-wrapper wrapper">
<div className="full-height text-centered flex layout-centered">
<h2 className="text-error text-grey-1">{error.data}</h2>
</div>
<div className="Dash-wrapper wrapper py4 text-brand text-centered flex-full bg-white">
<h1 className="text-normal text-grey-2">{error.data}</h1>
</div>
: null }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment