From 9cc7938c6d9aa43de24fadeb7500b9146e80d540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Mon, 10 Feb 2020 14:35:41 +0000 Subject: [PATCH] fix(ui): align datetime pickers --- .../SilenceModal/DateTimeSelect/HourMinute.js | 52 +- .../__snapshots__/index.test.js.snap | 1716 +++++++++-------- .../SilenceModal/DateTimeSelect/index.js | 58 +- 3 files changed, 920 insertions(+), 906 deletions(-) diff --git a/ui/src/Components/SilenceModal/DateTimeSelect/HourMinute.js b/ui/src/Components/SilenceModal/DateTimeSelect/HourMinute.js index 5a15ac4ce..cdadd076b 100644 --- a/ui/src/Components/SilenceModal/DateTimeSelect/HourMinute.js +++ b/ui/src/Components/SilenceModal/DateTimeSelect/HourMinute.js @@ -48,31 +48,33 @@ const HourMinute = observer( const minute = dateValue.minute(); return ( - - - - - - - - - - - - - - -
- -
-

{hour > 9 ? hour : `0${hour}`}

-
-

:

-
-

{minute > 9 ? minute : `0${minute}`}

-
- -
+
+ + + + + + + + + + + + + + +
+ +
+

{hour > 9 ? hour : `0${hour}`}

+
+

:

+
+

{minute > 9 ? minute : `0${minute}`}

+
+ +
+
); } } diff --git a/ui/src/Components/SilenceModal/DateTimeSelect/__snapshots__/index.test.js.snap b/ui/src/Components/SilenceModal/DateTimeSelect/__snapshots__/index.test.js.snap index 9a8947cd2..677cbd6ba 100644 --- a/ui/src/Components/SilenceModal/DateTimeSelect/__snapshots__/index.test.js.snap +++ b/ui/src/Components/SilenceModal/DateTimeSelect/__snapshots__/index.test.js.snap @@ -262,456 +262,460 @@ exports[` 'Ends' tab matches snapshot 1`] = `
-
-
-
-
-
- - -
-
-
- February 2061 -
-
-
-
-
- Su -
-
- Mo -
-
- Tu -
-
- We -
-
- Th -
-
- Fr -
-
- Sa -
-
+
+
+
+
+
-
-
-
- 30 + Previous Month + + +
+
+
+ February 2061
-
- 31 +
-
- 1 -
-
- 2 -
-
- 3 -
-
- 4 -
-
- 5 +
+
+ Su +
+
+ Mo +
+
+ Tu +
+
+ We +
+
+ Th +
+
+ Fr +
+
+ Sa +
-
-
- 6 +
+
+
+ 30 +
+
+ 31 +
+
+ 1 +
+
+ 2 +
+
+ 3 +
+
+ 4 +
+
+ 5 +
-
- 7 +
+
+ 6 +
+
+ 7 +
+
+ 8 +
+
+ 9 +
+
+ 10 +
+
+ 11 +
+
+ 12 +
-
- 8 +
+
+ 13 +
+
+ 14 +
+
+ 15 +
+
+ 16 +
+
+ 17 +
+
+ 18 +
+
+ 19 +
-
- 9 +
+
+ 20 +
+
+ 21 +
+
+ 22 +
+
+ 23 +
+
+ 24 +
+
+ 25 +
+
+ 26 +
-
- 10 -
-
- 11 -
-
- 12 -
-
-
-
- 13 -
-
- 14 -
-
- 15 -
-
- 16 -
-
- 17 -
-
- 18 -
-
- 19 -
-
-
-
- 20 -
-
- 21 -
-
- 22 -
-
- 23 -
-
- 24 -
-
- 25 -
-
- 26 -
-
-
-
- 27 -
-
- 28 -
-
- 1 -
-
- 2 -
-
- 3 -
-
- 4 -
-
- 5 +
+
+ 27 +
+
+ 28 +
+
+ 1 +
+
+ 2 +
+
+ 3 +
+
+ 4 +
+
+ 5 +
-
-
- Today +
+ Today +
- - - - + + +
- - - + + + + - - + + - - - - - - - - + + + + + + + + - - + + - - -
+ + - - - - - - - - + + + + + + + - - - -
-

- 00 -

-
-

- : -

-
-

- 00 -

-
- - - + + + +
+

+ 00 +

+
+

+ : +

+
+

+ 00 +

+
+ + - - - - - - - - + + + + + + + - - - -
+ + + +
+
+
" @@ -752,450 +756,454 @@ exports[` 'Starts' tab matches snapshot 1`] = `
-
-
-
-
-
- -
-
-
- February 2060 -
-
-
-
-
- Su -
-
- Mo -
-
- Tu -
-
- We -
-
- Th -
-
- Fr -
-
- Sa -
-
+
+
+
+
+
-
-
-
- 1 + Next Month + +
+
+
+ February 2060
-
- 2 +
-
- 3 -
-
- 4 -
-
- 5 -
-
- 6 -
-
- 7 +
+
+ Su +
+
+ Mo +
+
+ Tu +
+
+ We +
+
+ Th +
+
+ Fr +
+
+ Sa +
-
-
- 8 +
+
+
+ 1 +
+
+ 2 +
+
+ 3 +
+
+ 4 +
+
+ 5 +
+
+ 6 +
+
+ 7 +
-
- 9 +
+
+ 8 +
+
+ 9 +
+
+ 10 +
+
+ 11 +
+
+ 12 +
+
+ 13 +
+
+ 14 +
-
- 10 +
+
+ 15 +
+
+ 16 +
+
+ 17 +
+
+ 18 +
+
+ 19 +
+
+ 20 +
+
+ 21 +
-
- 11 +
+
+ 22 +
+
+ 23 +
+
+ 24 +
+
+ 25 +
+
+ 26 +
+
+ 27 +
+
+ 28 +
-
- 12 -
-
- 13 -
-
- 14 -
-
-
-
- 15 -
-
- 16 -
-
- 17 -
-
- 18 -
-
- 19 -
-
- 20 -
-
- 21 -
-
-
-
- 22 -
-
- 23 -
-
- 24 -
-
- 25 -
-
- 26 -
-
- 27 -
-
- 28 -
-
-
-
- 29 -
-
- 1 -
-
- 2 -
-
- 3 -
-
- 4 -
-
- 5 -
-
- 6 +
+
+ 29 +
+
+ 1 +
+
+ 2 +
+
+ 3 +
+
+ 4 +
+
+ 5 +
+
+ 6 +
-
-
- Today +
+ Today +
- - - - + + +
- - - + + + + - - + + - - - - - - - - + + + + + + + + - - + + - - -
+ + - - - - - - - - + + + + + + + - - - -
-

- 00 -

-
-

- : -

-
-

- 00 -

-
- - - + + + +
+

+ 00 +

+
+

+ : +

+
+

+ 00 +

+
+ + - - - - - - - - + + + + + + + - - - -
+ + + +
+
+
" diff --git a/ui/src/Components/SilenceModal/DateTimeSelect/index.js b/ui/src/Components/SilenceModal/DateTimeSelect/index.js index a09a381c9..b049b9fbf 100644 --- a/ui/src/Components/SilenceModal/DateTimeSelect/index.js +++ b/ui/src/Components/SilenceModal/DateTimeSelect/index.js @@ -56,19 +56,21 @@ const TabNames = Object.freeze({ const TabContentStart = observer(({ silenceFormStore }) => { return ( -
- { - silenceFormStore.data.startsAt = moment(val); - silenceFormStore.data.verifyStarEnd(); - }} - /> +
+
+ { + silenceFormStore.data.startsAt = moment(val); + silenceFormStore.data.verifyStarEnd(); + }} + /> +
silenceFormStore.data.incStart(60)} @@ -82,20 +84,22 @@ const TabContentStart = observer(({ silenceFormStore }) => { const TabContentEnd = observer(({ silenceFormStore }) => { return ( -
- { - silenceFormStore.data.endsAt = moment(val); - silenceFormStore.data.verifyStarEnd(); - }} - /> +
+
+ { + silenceFormStore.data.endsAt = moment(val); + silenceFormStore.data.verifyStarEnd(); + }} + /> +
silenceFormStore.data.incEnd(60)}