From 9894d9e9b7115ffe39c201fe5e23c4a22eab3afd Mon Sep 17 00:00:00 2001 From: wen-2018 <42974891+wen-2018@users.noreply.github.com> Date: Tue, 17 Dec 2024 10:30:00 -0400 Subject: [PATCH 1/2] update about page hero section to use reduced padding icons --- .../templates/mozorg/about/includes/m24/manifesto.html | 8 ++++---- media/css/m24/feature.scss | 5 +++-- media/img/icons/m24-large/bell.svg | 3 --- media/img/icons/m24-large/dollar.svg | 3 --- media/img/icons/m24-large/glasses.svg | 3 --- media/img/icons/m24-large/pencil.svg | 3 --- media/img/icons/m24-reduced-padding/bell.svg | 1 + media/img/icons/m24-reduced-padding/dollar.svg | 1 + media/img/icons/m24-reduced-padding/glasses.svg | 1 + media/img/icons/m24-reduced-padding/pencil.svg | 1 + 10 files changed, 11 insertions(+), 18 deletions(-) delete mode 100644 media/img/icons/m24-large/bell.svg delete mode 100644 media/img/icons/m24-large/dollar.svg delete mode 100644 media/img/icons/m24-large/glasses.svg delete mode 100644 media/img/icons/m24-large/pencil.svg create mode 100644 media/img/icons/m24-reduced-padding/bell.svg create mode 100644 media/img/icons/m24-reduced-padding/dollar.svg create mode 100644 media/img/icons/m24-reduced-padding/glasses.svg create mode 100644 media/img/icons/m24-reduced-padding/pencil.svg diff --git a/bedrock/mozorg/templates/mozorg/about/includes/m24/manifesto.html b/bedrock/mozorg/templates/mozorg/about/includes/m24/manifesto.html index 045011a7154..f40ed035657 100644 --- a/bedrock/mozorg/templates/mozorg/about/includes/m24/manifesto.html +++ b/bedrock/mozorg/templates/mozorg/about/includes/m24/manifesto.html @@ -43,7 +43,7 @@

{{ ftl('m24-about-together-we-can') }}

{% call picto( base_el='li', image=resp_img( - url='img/icons/m24-large/bell.svg', + url='img/icons/m24-reduced-padding/bell.svg', optional_attributes={ 'class': 'mzp-c-picto-image', 'loading': 'lazy' @@ -59,7 +59,7 @@

{{ ftl('m24-about-together-we-can') }}

{% call picto( base_el='li', image=resp_img( - url='img/icons/m24-large/glasses.svg', + url='img/icons/m24-reduced-padding/glasses.svg', optional_attributes={ 'class': 'mzp-c-picto-image', 'loading': 'lazy', @@ -75,7 +75,7 @@

{{ ftl('m24-about-together-we-can') }}

{% call picto( base_el='li', image=resp_img( - url='img/icons/m24-large/pencil.svg', + url='img/icons/m24-reduced-padding/pencil.svg', optional_attributes={ 'class': 'mzp-c-picto-image', 'loading': 'lazy' @@ -91,7 +91,7 @@

{{ ftl('m24-about-together-we-can') }}

{% call picto( base_el='li', image=resp_img( - url='img/icons/m24-large/dollar.svg', + url='img/icons/m24-reduced-padding/dollar.svg', optional_attributes={ 'class': 'mzp-c-picto-image', 'loading': 'lazy' diff --git a/media/css/m24/feature.scss b/media/css/m24/feature.scss index 0f9339d696f..ae90a7c8b70 100644 --- a/media/css/m24/feature.scss +++ b/media/css/m24/feature.scss @@ -60,8 +60,8 @@ text-wrap-style: balance; .mzp-c-picto-image { - height: 48px; - width: 48px; + height: 24px; + width: auto; } p { @@ -76,6 +76,7 @@ @media #{$mq-md} { .mzp-c-picto-image { margin-bottom: $spacer-sm; + height: 48px; } } diff --git a/media/img/icons/m24-large/bell.svg b/media/img/icons/m24-large/bell.svg deleted file mode 100644 index d9223e6ceca..00000000000 --- a/media/img/icons/m24-large/bell.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/media/img/icons/m24-large/dollar.svg b/media/img/icons/m24-large/dollar.svg deleted file mode 100644 index 7fdaeceadf3..00000000000 --- a/media/img/icons/m24-large/dollar.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/media/img/icons/m24-large/glasses.svg b/media/img/icons/m24-large/glasses.svg deleted file mode 100644 index 348ef9627a0..00000000000 --- a/media/img/icons/m24-large/glasses.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/media/img/icons/m24-large/pencil.svg b/media/img/icons/m24-large/pencil.svg deleted file mode 100644 index af0676b0f83..00000000000 --- a/media/img/icons/m24-large/pencil.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/media/img/icons/m24-reduced-padding/bell.svg b/media/img/icons/m24-reduced-padding/bell.svg new file mode 100644 index 00000000000..d5a769e9c2b --- /dev/null +++ b/media/img/icons/m24-reduced-padding/bell.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/media/img/icons/m24-reduced-padding/dollar.svg b/media/img/icons/m24-reduced-padding/dollar.svg new file mode 100644 index 00000000000..bfb8413746b --- /dev/null +++ b/media/img/icons/m24-reduced-padding/dollar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/media/img/icons/m24-reduced-padding/glasses.svg b/media/img/icons/m24-reduced-padding/glasses.svg new file mode 100644 index 00000000000..bcb5db5c1e1 --- /dev/null +++ b/media/img/icons/m24-reduced-padding/glasses.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/media/img/icons/m24-reduced-padding/pencil.svg b/media/img/icons/m24-reduced-padding/pencil.svg new file mode 100644 index 00000000000..52eedfbdbe0 --- /dev/null +++ b/media/img/icons/m24-reduced-padding/pencil.svg @@ -0,0 +1 @@ + \ No newline at end of file From 12a95640f19ff20325f0c91dbf3d4087884b5452 Mon Sep 17 00:00:00 2001 From: wen-2018 <42974891+wen-2018@users.noreply.github.com> Date: Tue, 17 Dec 2024 12:54:42 -0400 Subject: [PATCH 2/2] add viewBox for svgs and styles tweaks --- media/css/m24/feature.scss | 10 ++-------- media/img/icons/m24-reduced-padding/bell.svg | 2 +- media/img/icons/m24-reduced-padding/dollar.svg | 2 +- media/img/icons/m24-reduced-padding/glasses.svg | 2 +- media/img/icons/m24-reduced-padding/pencil.svg | 2 +- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/media/css/m24/feature.scss b/media/css/m24/feature.scss index ae90a7c8b70..de3535e1524 100644 --- a/media/css/m24/feature.scss +++ b/media/css/m24/feature.scss @@ -60,8 +60,9 @@ text-wrap-style: balance; .mzp-c-picto-image { - height: 24px; + height: 30px; width: auto; + margin: $spacer-sm 0 $spacer-md; } p { @@ -73,13 +74,6 @@ font-size: 24px; } -@media #{$mq-md} { - .mzp-c-picto-image { - margin-bottom: $spacer-sm; - height: 48px; - } -} - @media #{$mq-lg} { .mzp-c-picto { max-width: grid(6); diff --git a/media/img/icons/m24-reduced-padding/bell.svg b/media/img/icons/m24-reduced-padding/bell.svg index d5a769e9c2b..b72522ed5c6 100644 --- a/media/img/icons/m24-reduced-padding/bell.svg +++ b/media/img/icons/m24-reduced-padding/bell.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/media/img/icons/m24-reduced-padding/dollar.svg b/media/img/icons/m24-reduced-padding/dollar.svg index bfb8413746b..536f2d3d5b0 100644 --- a/media/img/icons/m24-reduced-padding/dollar.svg +++ b/media/img/icons/m24-reduced-padding/dollar.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/media/img/icons/m24-reduced-padding/glasses.svg b/media/img/icons/m24-reduced-padding/glasses.svg index bcb5db5c1e1..dba67d6a884 100644 --- a/media/img/icons/m24-reduced-padding/glasses.svg +++ b/media/img/icons/m24-reduced-padding/glasses.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/media/img/icons/m24-reduced-padding/pencil.svg b/media/img/icons/m24-reduced-padding/pencil.svg index 52eedfbdbe0..4d698834d3e 100644 --- a/media/img/icons/m24-reduced-padding/pencil.svg +++ b/media/img/icons/m24-reduced-padding/pencil.svg @@ -1 +1 @@ - \ No newline at end of file +