From 02cdaed8e68dc5d1ddb742b7f4953c2386e5d62a Mon Sep 17 00:00:00 2001 From: Suzanne Aitchison Date: Tue, 31 May 2022 09:55:19 +0100 Subject: [PATCH] layout tweaks for mobile (#17771) --- app/assets/stylesheets/components/forms.scss | 15 +++++++++++++++ .../DateRangePicker/DateRangePicker.jsx | 18 ++++++++++++++++-- .../__stories__/DateRangePicker.test.jsx | 11 +++++++++++ 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/components/forms.scss b/app/assets/stylesheets/components/forms.scss index ca3cefc7d..61e1dd4ff 100644 --- a/app/assets/stylesheets/components/forms.scss +++ b/app/assets/stylesheets/components/forms.scss @@ -382,6 +382,21 @@ textarea.crayons-textfield.crayons-textfield--ghost { } } + .CalendarMonthGrid__vertical { + margin-top: var(--su-2); + + .c-date-picker__month { + margin-top: var(--su-2); + } + + .CalendarMonth { + &_caption { + padding-bottom: var(--su-2); + padding-top: var(--su-3); + } + } + } + // The triangular ? button which shows keyboard shortcut information .DayPickerKeyboardShortcuts_buttonReset { &::before { diff --git a/app/javascript/crayons/formElements/DateRangePicker/DateRangePicker.jsx b/app/javascript/crayons/formElements/DateRangePicker/DateRangePicker.jsx index 760a237d8..dd8880971 100644 --- a/app/javascript/crayons/formElements/DateRangePicker/DateRangePicker.jsx +++ b/app/javascript/crayons/formElements/DateRangePicker/DateRangePicker.jsx @@ -5,12 +5,18 @@ import 'react-dates/initialize'; import moment from 'moment'; import { DateRangePicker as ReactDateRangePicker } from 'react-dates'; import defaultPhrases from 'react-dates/lib/defaultPhrases'; -import { START_DATE, ICON_BEFORE_POSITION } from 'react-dates/constants'; +import { + START_DATE, + ICON_BEFORE_POSITION, + VERTICAL_ORIENTATION, + HORIZONTAL_ORIENTATION, +} from 'react-dates/constants'; import { Icon } from '@crayons'; import ChevronLeft from '@images/chevron-left.svg'; import ChevronRight from '@images/chevron-right.svg'; import Calendar from '@images/calendar.svg'; import { getCurrentLocale } from '@utilities/runtime'; +import { useMediaQuery, BREAKPOINTS } from '@components/useMediaQuery'; const PICKER_PHRASES = { ...defaultPhrases, @@ -51,7 +57,7 @@ const MonthYearPicker = ({ years.push(earliestMoment.year()); return ( -
+