diff --git a/ui/src/chronograf/containers/Header.js b/ui/src/chronograf/containers/Header.js index b4edf72c8..cdc8207be 100644 --- a/ui/src/chronograf/containers/Header.js +++ b/ui/src/chronograf/containers/Header.js @@ -108,26 +108,28 @@ const Header = React.createClass({ {text: 'Delete', icon: 'trash', target: '#deleteExplorerModal', handler: this.openDeleteExplorerModal}, ]; return ( -
-
-

Exploration:

- -
New Exploration
-
-
-

Source:

-
- - {this.context.source.name} +
+
+
+

Exploration:

+ +
New Exploration
+
+
+

Source:

+
+ + {this.context.source.name} +
+

Range:

+
-

Range:

-
diff --git a/ui/src/shared/components/ResizeContainer.js b/ui/src/shared/components/ResizeContainer.js index f1535348f..223402d58 100644 --- a/ui/src/shared/components/ResizeContainer.js +++ b/ui/src/shared/components/ResizeContainer.js @@ -62,7 +62,7 @@ const ResizeContainer = React.createClass({ const handle = ; return ( -
+
{left} {handle} {right} diff --git a/ui/src/style/chronograf/layout/_main.scss b/ui/src/style/chronograf/layout/_main.scss index fe162cf09..30f6534e1 100644 --- a/ui/src/style/chronograf/layout/_main.scss +++ b/ui/src/style/chronograf/layout/_main.scss @@ -13,50 +13,20 @@ left: 0; background-color: $g1-raven; - &__header { - margin-bottom: 0; - background-color: $g0-obsidian; - color: $g15-platinum; - position: absolute; - top: 0; - left: 0; - width: 100%; + .page-header { padding-left: $explorer-page-padding; - padding-right: $explorer-page-padding; - justify-content: space-between; + padding-right: ($explorer-page-padding + $scrollbar-width); } - - &-container { - height: 100%; - position: absolute; - width: 100%; - } - - .controls { - padding: 5px; - display: flex; - align-items: center; - justify-content: center; - } - /* Sessions Dropdown Styles */ - .chronograf-header__left { - flex-direction: row; - align-items: center; - } - .dropdown-title { - white-space: nowrap; + .page-header__container { + max-width: 100%; } } -.main-content { +.resize-container.page-contents { + overflow: hidden; display: flex; flex-direction: row; align-items: stretch; - position: absolute; - left: 0; - top: $chronograf-page-header-height; - height: calc(100% - #{$chronograf-page-header-height}); - width: 100%; } .panels {