From a3f9817d0d53a8004258cb49fa6465e90195f581 Mon Sep 17 00:00:00 2001 From: mikkojamG Date: Thu, 19 Sep 2024 08:11:25 +0300 Subject: [PATCH] style: hearingList mobile style fixes KER-346 --- assets/sass/kerrokantasi/_hearing-list.scss | 18 ++++++++- .../assets/sass/hel/_hearing-list.scss | 28 +++++++++++-- .../__snapshots__/Hearings.test.jsx.snap | 18 +++------ src/views/Hearings/index.jsx | 40 ++++++++----------- 4 files changed, 62 insertions(+), 42 deletions(-) diff --git a/assets/sass/kerrokantasi/_hearing-list.scss b/assets/sass/kerrokantasi/_hearing-list.scss index b6b00dee6..bc9b63422 100644 --- a/assets/sass/kerrokantasi/_hearing-list.scss +++ b/assets/sass/kerrokantasi/_hearing-list.scss @@ -57,7 +57,7 @@ } &-closed { - margin-top: var(--spacing-3-xs); + margin-top: var(--spacing-2-xs); text-align: right; } @@ -89,6 +89,16 @@ .page-section--all-hearings-header { background-color: $gray-200; + + .all-hearings-header-container { + margin: 0 auto; + max-width: 60rem; + padding: 0 var(--spacing-s); + + @media (min-width: $screen-sm-min) { + padding: 0 var(--spacing-2-xs); + } + } } .hearing-comment__images { @@ -170,9 +180,13 @@ flex: 0 1 auto; font-size: $font-size-large; font-weight: 400; - margin: 0 $grid-gutter-width * 1.5 0 0; + margin: 0 0 var(--spacing-s) 0; color: var(--color-black-60); + @media (min-width: $screen-xs-min) { + margin: 0 $grid-gutter-width * 1.5 0 0; + } + span { margin-left: 0.15em; } diff --git a/cities/helsinki/assets/sass/hel/_hearing-list.scss b/cities/helsinki/assets/sass/hel/_hearing-list.scss index 48cba91a3..f8760d201 100644 --- a/cities/helsinki/assets/sass/hel/_hearing-list.scss +++ b/cities/helsinki/assets/sass/hel/_hearing-list.scss @@ -15,6 +15,16 @@ .page-section--all-hearings-header { background-color: $light-gray; + + .all-hearings-header-container { + margin: 0 auto; + max-width: 60rem; + padding: 0 var(--spacing-s); + + @media (min-width: $screen-sm-min) { + padding: 0 var(--spacing-2-xs); + } + } } .page-section--hearings-search { @@ -23,7 +33,11 @@ background-color: $light-gray; margin: 0 auto; max-width: 60rem; - padding: 0 var(--spacing-2-xs); + padding: 0 var(--spacing-s); + + @media (min-width: $screen-sm-min) { + padding: 0 var(--spacing-2-xs); + } } .page-section--hearings-tabs { @@ -36,8 +50,12 @@ justify-content: flex-end; max-width: 60rem; margin: 0 auto; - padding: 0 var(--spacing-2-xs); + padding: 0 var(--spacing-s); overflow: unset; + + @media (min-width: $screen-sm-min) { + padding: 0 var(--spacing-2-xs); + } } ul { @@ -65,6 +83,10 @@ &-container { max-width: 60rem; margin: 0 auto; - padding: var(--spacing-2-xl) var(--spacing-2-xs) 0; + padding: var(--spacing-2-xl) var(--spacing-s) 0; + + @media (min-width: $screen-sm-min) { + padding: var(--spacing-2-xl) var(--spacing-2-xs) 0; + } } } diff --git a/src/views/Hearings/__tests__/__snapshots__/Hearings.test.jsx.snap b/src/views/Hearings/__tests__/__snapshots__/Hearings.test.jsx.snap index dde4ec97b..58b842c4d 100644 --- a/src/views/Hearings/__tests__/__snapshots__/Hearings.test.jsx.snap +++ b/src/views/Hearings/__tests__/__snapshots__/Hearings.test.jsx.snap @@ -9,21 +9,13 @@ exports[` should render correctly 1`] = ` class="page-section page-section--all-hearings-header" >
-
-
-

- allHearings -

-
-
+ allHearings +
-
- - - - {(txt) =>

{txt}

}
- {isAdmin(user) && ( - - )} - {isAdmin(user) && } - -
+
+ + {(txt) =>

{txt}

}
+ {isAdmin(user) && ( + + )} + {isAdmin(user) && }
{!isEmpty(labels) ? (