(this.lower = r)} />
(this.upper = r)} />
diff --git a/ui/src/shared/components/CustomTimeRangeDropdown.js b/ui/src/shared/components/CustomTimeRangeDropdown.js
index d37369f75b..baa2b4dc3a 100644
--- a/ui/src/shared/components/CustomTimeRangeDropdown.js
+++ b/ui/src/shared/components/CustomTimeRangeDropdown.js
@@ -49,13 +49,11 @@ class CustomTimeRangeDropdown extends Component {
)} — ${moment(upper).format('MMM Do HH:mm')}`}
-
-
-
+
)
}
diff --git a/ui/src/shared/components/CustomTimeRangeOverlay.js b/ui/src/shared/components/CustomTimeRangeOverlay.js
index 8586751a52..da3a0dfce9 100644
--- a/ui/src/shared/components/CustomTimeRangeOverlay.js
+++ b/ui/src/shared/components/CustomTimeRangeOverlay.js
@@ -2,7 +2,6 @@ import React, {PropTypes, Component} from 'react'
import OnClickOutside from 'react-onclickoutside'
import CustomTimeRange from 'shared/components/CustomTimeRange'
-import OverlayTechnologies from 'shared/components/OverlayTechnologies'
class CustomTimeRangeOverlay extends Component {
constructor(props) {
@@ -17,15 +16,13 @@ class CustomTimeRangeOverlay extends Component {
const {onClose, timeRange, onApplyTimeRange} = this.props
return (
-
-
-
-
-
+
+
+
)
}
}
diff --git a/ui/src/shared/components/TimeRangeDropdown.js b/ui/src/shared/components/TimeRangeDropdown.js
index cc069d1aac..c5d50cc9fd 100644
--- a/ui/src/shared/components/TimeRangeDropdown.js
+++ b/ui/src/shared/components/TimeRangeDropdown.js
@@ -76,7 +76,7 @@ class TimeRangeDropdown extends Component {
const {isOpen, customTimeRange, isCustomTimeRangeOpen} = this.state
return (
-
+
Time Range
-
+
Custom Time Range
diff --git a/ui/src/style/components/custom-time-range.scss b/ui/src/style/components/custom-time-range.scss
index c74bff6e55..5f739256d6 100644
--- a/ui/src/style/components/custom-time-range.scss
+++ b/ui/src/style/components/custom-time-range.scss
@@ -242,3 +242,15 @@ $rd-cell-size: 30px;
background-color: $g6-smoke;
}
}
+/* Custom positioning for dashboard use */
+.time-range-dropdown {
+ position: relative;
+}
+.custom-time--overlay {
+ position: absolute;
+ top: 0;
+ right: calc(100% + 4px);
+ z-index: 2;
+
+ .custom-time--container {display: flex;}
+}