Merge pull request #580 from influxdata/zoom

Zoom
pull/584/merge
Andrew Watkins 2016-11-18 13:47:38 -08:00 committed by GitHub
commit ab59d12834
3 changed files with 6 additions and 5 deletions

View File

@ -1,5 +1,6 @@
## v1.1.0 [unreleased] ## v1.1.0 [unreleased]
- #576: Fix broken zoom on graphs that aren't the first.
- #575: Add Varnish Layout - #575: Add Varnish Layout
- #574: Fix broken graphs on Postgres Layouts by adding aggregates. - #574: Fix broken graphs on Postgres Layouts by adding aggregates.

View File

@ -66,12 +66,12 @@ export const KubernetesPage = React.createClass({
return ( return (
<div className="host-dashboard hosts-page"> <div className="host-dashboard hosts-page">
<div className="enterprise-header hosts-dashboard-header"> <div className="chronograf-header hosts-dashboard-header">
<div className="enterprise-header__container"> <div className="chronograf-header__container">
<div className="enterprise-header__left"> <div className="chronograf-header__left">
<h1>Kubernetes Dashboard</h1> <h1>Kubernetes Dashboard</h1>
</div> </div>
<div className="enterprise-header__right"> <div className="chronograf-header__right">
<h1>Range:</h1> <h1>Range:</h1>
<TimeRangeDropdown onChooseTimeRange={this.handleChooseTimeRange} selected={timeRange.inputValue} /> <TimeRangeDropdown onChooseTimeRange={this.handleChooseTimeRange} selected={timeRange.inputValue} />
</div> </div>

View File

@ -100,7 +100,7 @@ export const LayoutRenderer = React.createClass({
render() { render() {
return ( return (
<GridLayout layout={this.state.layout} isDraggable={false} isResizable={false} cols={12} rowHeight={90} width={1200}> <GridLayout useCSSTransforms={false} layout={this.state.layout} isDraggable={false} isResizable={false} cols={12} rowHeight={90} width={1200}>
{this.generateGraphs()} {this.generateGraphs()}
</GridLayout> </GridLayout>
); );