diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerContent.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerContent.tsx index 9ba41f99cabf..71ee11d8bd9e 100644 --- a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerContent.tsx +++ b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerContent.tsx @@ -77,11 +77,6 @@ export const TimePickerContentWithScreenSize: React.FC = (p return (
- {isFullscreen && ( -
- -
- )} {(!isFullscreen || !hideQuickRanges) && (
@@ -101,6 +96,11 @@ export const TimePickerContentWithScreenSize: React.FC = (p
)} + {isFullscreen && ( +
+ +
+ )}
{!hideTimeZone && isFullscreen && ( = (props) => { className={styles.container} style={{ height: '100%', - display: 'flex', - flexDirection: 'column', - justifyContent: 'center', - alignItems: 'center', + padding: '25px', }} >
@@ -279,18 +276,18 @@ const getStyles = stylesFactory((theme: GrafanaTheme2, isReversed, hideQuickRang body: css` display: flex; flex-direction: row-reverse; - height: ${isContainerTall ? '381px' : '217px'}; + height: ${isContainerTall ? '281px' : '217px'}; `, leftSide: css` display: flex; flex-direction: column; border-right: ${isReversed ? 'none' : `1px solid ${theme.colors.border.weak}`}; - width: ${!hideQuickRanges ? '60%' : '100%'}; + width: ${!hideQuickRanges ? '50%' : '100%'}; overflow: hidden; order: ${isReversed ? 1 : 0}; `, rightSide: css` - width: ${isFullscreen ? '40%' : '100%'}; !important; + width: ${isFullscreen ? '50%' : '100%'}; !important; border-right: ${isReversed ? `1px solid ${theme.colors.border.weak}` : 'none'}; display: flex; flex-direction: column; diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerFooter.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerFooter.tsx index 9037c4a7f4ed..79ffeaf57314 100644 --- a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerFooter.tsx +++ b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerFooter.tsx @@ -56,13 +56,11 @@ export const TimePickerFooter: FC = (props) => { return null; } + const fnColor = theme.isDark ? '#8EC4AD' : '#3A785E'; + return (
- -
@@ -71,6 +69,18 @@ export const TimePickerFooter: FC = (props) => {
+
+
{isEditing ? (
@@ -135,6 +145,7 @@ const getStyle = stylesFactory((theme: GrafanaTheme2) => { flex-direction: row; justify-content: space-between; align-items: center; + height: 60px; `, editContainer: css` border-top: 1px solid ${theme.colors.border.weak}; diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimeRangeForm.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimeRangeForm.tsx index 60c1584af2af..ca2cbd69dda1 100644 --- a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimeRangeForm.tsx +++ b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimeRangeForm.tsx @@ -139,7 +139,15 @@ export const TimeRangeForm: React.FC = (props) => { {fyTooltip}
- diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeZonePicker/TimeZoneDescription.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeZonePicker/TimeZoneDescription.tsx index fbfb016ccdf1..b9a420a33e7e 100644 --- a/packages/grafana-ui/src/components/DateTimePickers/TimeZonePicker/TimeZoneDescription.tsx +++ b/packages/grafana-ui/src/components/DateTimePickers/TimeZonePicker/TimeZoneDescription.tsx @@ -3,7 +3,7 @@ import React, { PropsWithChildren, useMemo } from 'react'; import { GrafanaTheme, TimeZoneInfo } from '@grafana/data'; -import { useTheme, stylesFactory } from '../../../themes'; +import { useTheme, stylesFactory, useTheme2 } from '../../../themes'; interface Props { info?: TimeZoneInfo; @@ -13,12 +13,17 @@ export const TimeZoneDescription: React.FC> = ({ info } const theme = useTheme(); const styles = getStyles(theme); const description = useDescription(info); + const { isDark } = useTheme2(); if (!info) { return null; } - return
{description}
; + return ( +
+ {description} +
+ ); }; const useDescription = (info?: TimeZoneInfo): string => {