From 6866293d4e51556c14d05f57e6fa18b660402cc4 Mon Sep 17 00:00:00 2001
From: Thibaud Colas <thibaudcolas@gmail.com>
Date: Fri, 31 Mar 2023 04:46:34 +0100
Subject: [PATCH] Styling tweaks for new icons

---
 client/scss/components/_button.scss           |  5 +-
 client/scss/components/_help-block.scss       |  2 +-
 client/scss/components/_listing.scss          | 13 +--
 client/scss/components/_panel.scss            |  2 +-
 client/scss/components/_userbar.scss          |  2 +-
 client/scss/components/forms/_select.scss     |  2 +-
 .../overrides/_vendor.datetimepicker.scss     |  4 +-
 client/scss/tools/_mixins.general.scss        |  2 +-
 client/src/components/ComboBox/ComboBox.scss  |  3 +-
 client/src/components/Draftail/Draftail.scss  | 84 ++++---------------
 .../src/components/Minimap/CollapseAll.scss   |  1 -
 .../components/Minimap/CollapseAll.test.tsx   |  4 +-
 client/src/components/Minimap/CollapseAll.tsx |  2 +-
 .../src/components/Minimap/MinimapItem.scss   |  4 -
 client/storybook/preview.scss                 |  2 +-
 .../pages/listing/_modern_dropdown.html       |  2 +-
 .../wagtailadmin/shared/breadcrumbs.html      |  2 +-
 .../templates/wagtailadmin/shared/panel.html  |  2 +-
 .../includes/action_list_item.html            |  2 +-
 19 files changed, 39 insertions(+), 101 deletions(-)

diff --git a/client/scss/components/_button.scss b/client/scss/components/_button.scss
index 0deae4e1b4..d3c41d80e1 100644
--- a/client/scss/components/_button.scss
+++ b/client/scss/components/_button.scss
@@ -41,7 +41,7 @@
 
   &.button--icon {
     .icon {
-      @include svg-icon(1.5em);
+      @include svg-icon();
     }
   }
 
@@ -140,7 +140,7 @@
       }
 
       .icon {
-        @include svg-icon(1.5em);
+        @include svg-icon();
       }
     }
 
@@ -267,6 +267,7 @@
       display: inline-block;
       opacity: 0.8;
       padding: 0;
+      margin-inline-end: 0.5em;
     }
 
     .button-longrunning__icon {
diff --git a/client/scss/components/_help-block.scss b/client/scss/components/_help-block.scss
index 8a59db91e5..b4831ba678 100644
--- a/client/scss/components/_help-block.scss
+++ b/client/scss/components/_help-block.scss
@@ -35,7 +35,7 @@
   position: relative;
 
   .icon {
-    @include svg-icon(1.25rem);
+    @include svg-icon(1rem);
     position: absolute;
     inset-inline-start: 1.125rem;
     top: 0.8125rem;
diff --git a/client/scss/components/_listing.scss b/client/scss/components/_listing.scss
index 080cf67bbf..24a3733ea1 100644
--- a/client/scss/components/_listing.scss
+++ b/client/scss/components/_listing.scss
@@ -323,23 +323,16 @@ ul.listing {
     text-align: center;
 
     .icon {
-      width: 15px;
-      height: 18px;
+      width: 1rem;
+      height: 1rem;
       vertical-align: middle;
-
-      &::before {
-        margin-inline-end: 2px;
-      }
+      margin-inline-end: 2px;
     }
 
     &--active a,
     a:hover {
       color: $color-teal;
     }
-
-    &--active .icon {
-      opacity: 1;
-    }
   }
 
   .handle {
diff --git a/client/scss/components/_panel.scss b/client/scss/components/_panel.scss
index ed4d307dd2..9cd1127b8f 100644
--- a/client/scss/components/_panel.scss
+++ b/client/scss/components/_panel.scss
@@ -129,7 +129,7 @@ $header-gap: theme('spacing.1');
   height: $header-icon-size;
 
   // Only rotate the default caret icon, not custom ones.
-  [aria-expanded='false'] &.icon-arrow-down-big {
+  [aria-expanded='false'] &.icon-placeholder {
     transform: rotate(-90deg);
   }
 
diff --git a/client/scss/components/_userbar.scss b/client/scss/components/_userbar.scss
index 4a061a3b78..f9a9cd2db0 100644
--- a/client/scss/components/_userbar.scss
+++ b/client/scss/components/_userbar.scss
@@ -203,7 +203,7 @@ $positions: (
     }
 
     &-icon {
-      @include svg-icon(1.1em, middle);
+      @include svg-icon(1em, middle);
       margin-inline-end: 0.5em;
       fill: currentColor;
       opacity: 0.4;
diff --git a/client/scss/components/forms/_select.scss b/client/scss/components/forms/_select.scss
index 60168d512c..1929a2e0b4 100644
--- a/client/scss/components/forms/_select.scss
+++ b/client/scss/components/forms/_select.scss
@@ -3,7 +3,7 @@
 
 $select-size: $text-input-height;
 $chevron-width: 1rem;
-$chevron-height: 0.5rem;
+$chevron-height: 1rem;
 $chevron-top-offset: math.div($select-size - $chevron-height, 2);
 $chevron-inline-end-offset: math.div($select-size - $chevron-width, 2);
 
diff --git a/client/scss/overrides/_vendor.datetimepicker.scss b/client/scss/overrides/_vendor.datetimepicker.scss
index a582fb54e0..4a5f1f27f2 100644
--- a/client/scss/overrides/_vendor.datetimepicker.scss
+++ b/client/scss/overrides/_vendor.datetimepicker.scss
@@ -72,8 +72,8 @@
     &:before {
       content: '';
       display: inline-block;
-      width: 1em;
-      height: 1em;
+      width: 1rem;
+      height: 1rem;
       text-align: center;
       margin: 0;
       background-color: currentColor;
diff --git a/client/scss/tools/_mixins.general.scss b/client/scss/tools/_mixins.general.scss
index 8d3d158e11..318c7af7dc 100644
--- a/client/scss/tools/_mixins.general.scss
+++ b/client/scss/tools/_mixins.general.scss
@@ -77,7 +77,7 @@
   position: initial;
 }
 
-@mixin svg-icon($size: 1.5em, $position: text-top) {
+@mixin svg-icon($size: 1em, $position: text-top) {
   width: $size;
   height: $size;
   vertical-align: $position;
diff --git a/client/src/components/ComboBox/ComboBox.scss b/client/src/components/ComboBox/ComboBox.scss
index 154168244e..85d942fdcf 100644
--- a/client/src/components/ComboBox/ComboBox.scss
+++ b/client/src/components/ComboBox/ComboBox.scss
@@ -113,7 +113,8 @@ $spacing-sm: theme('spacing.5');
   .icon-h4,
   .icon-h5,
   .icon-h6 {
-    width: theme('spacing.6');
+    width: theme('spacing.5');
+    height: theme('spacing.5');
   }
 
   // Explicitly override the selected color for SVG support.
diff --git a/client/src/components/Draftail/Draftail.scss b/client/src/components/Draftail/Draftail.scss
index d68faa419b..4b1aaceceb 100644
--- a/client/src/components/Draftail/Draftail.scss
+++ b/client/src/components/Draftail/Draftail.scss
@@ -94,24 +94,6 @@ $draftail-editor-font-family: $font-sans;
   width: 100%;
 }
 
-.Draftail-ToolbarButton,
-.Draftail-ComboBox__option {
-  .icon {
-    width: $draftail-toolbar-icon-size;
-    height: $draftail-toolbar-icon-size;
-    vertical-align: middle;
-  }
-
-  .icon-h1,
-  .icon-h2,
-  .icon-h3,
-  .icon-h4,
-  .icon-h5,
-  .icon-h6 {
-    width: 1.5 * $draftail-toolbar-icon-size;
-  }
-}
-
 .Draftail-Toolbar {
   border-width: 0;
   // Remove once we drop support for Safari 14.
@@ -218,52 +200,6 @@ $draftail-editor-font-family: $font-sans;
   }
 }
 
-.Draftail-ComboBox [role='combobox'] {
-  padding: theme('spacing.4');
-}
-
-.Draftail-ComboBox [aria-autocomplete='list'] {
-  border-radius: theme('borderRadius.DEFAULT');
-  border: 1px solid $color-input-border;
-}
-
-.Draftail-ComboBox__menu {
-  padding: theme('spacing.4');
-}
-
-.Draftail-ComboBox__optgroup-label {
-  @apply w-label-3;
-  background-color: theme('colors.grey.50');
-}
-
-.Draftail-ComboBox__option,
-.Draftail-ComboBox__status {
-  color: theme('colors.primary.DEFAULT');
-  padding: theme('spacing.3') 0;
-  border-width: 1px;
-}
-
-.Draftail-ComboBox__status {
-  padding-inline-start: theme('spacing.3');
-}
-
-.Draftail-ComboBox__option[aria-selected='true'] {
-  color: theme('colors.secondary.DEFAULT');
-  border-radius: theme('borderRadius.sm');
-  background: transparent;
-  cursor: pointer;
-}
-
-.Draftail-ComboBox__option-icon {
-  color: inherit;
-  margin: 0 theme('spacing.3');
-}
-
-.Draftail-ComboBox__option-text {
-  @apply w-label-3;
-  color: inherit;
-}
-
 .Draftail-ToolbarGroup::before {
   display: none;
 }
@@ -286,6 +222,22 @@ $draftail-editor-font-family: $font-sans;
   &:active {
     border: 1px solid $color-grey-3;
   }
+
+  .icon {
+    width: $draftail-toolbar-icon-size;
+    height: $draftail-toolbar-icon-size;
+    vertical-align: middle;
+  }
+
+  .icon-h1,
+  .icon-h2,
+  .icon-h3,
+  .icon-h4,
+  .icon-h5,
+  .icon-h6 {
+    width: 1.25 * $draftail-toolbar-icon-size;
+    height: 1.25 * $draftail-toolbar-icon-size;
+  }
 }
 
 .Draftail-ToolbarButton--pin {
@@ -307,10 +259,6 @@ $draftail-editor-font-family: $font-sans;
       border-color: $color-input-hover-border;
     }
   }
-
-  .icon {
-    transform: rotate(30deg);
-  }
 }
 
 .Draftail-block--blockquote {
diff --git a/client/src/components/Minimap/CollapseAll.scss b/client/src/components/Minimap/CollapseAll.scss
index b761012a1a..e82993acd3 100644
--- a/client/src/components/Minimap/CollapseAll.scss
+++ b/client/src/components/Minimap/CollapseAll.scss
@@ -25,7 +25,6 @@
     width: theme('spacing[2.5]');
     height: theme('spacing[2.5]');
     margin-inline-end: theme('spacing[2.5]');
-    border-top: 1px solid currentColor;
   }
 
   &--floating {
diff --git a/client/src/components/Minimap/CollapseAll.test.tsx b/client/src/components/Minimap/CollapseAll.test.tsx
index 03be6e3e2d..333d206a92 100644
--- a/client/src/components/Minimap/CollapseAll.test.tsx
+++ b/client/src/components/Minimap/CollapseAll.test.tsx
@@ -13,7 +13,7 @@ describe('CollapseAll', () => {
     );
     expect(wrapper.text()).toBe('<Icon />Collapse all');
     expect(wrapper.find('button').prop('aria-expanded')).toBe(true);
-    expect(wrapper.find('Icon').prop('name')).toBe('arrow-up-big');
+    expect(wrapper.find('Icon').prop('name')).toBe('collapse-up');
   });
 
   it('renders with expanded set to false', () => {
@@ -22,6 +22,6 @@ describe('CollapseAll', () => {
     );
     expect(wrapper.text()).toBe('<Icon />Expand all');
     expect(wrapper.find('button').prop('aria-expanded')).toBe(false);
-    expect(wrapper.find('Icon').prop('name')).toBe('arrow-down-big');
+    expect(wrapper.find('Icon').prop('name')).toBe('collapse-down');
   });
 });
diff --git a/client/src/components/Minimap/CollapseAll.tsx b/client/src/components/Minimap/CollapseAll.tsx
index 7a356dbfd6..583df4bfaf 100644
--- a/client/src/components/Minimap/CollapseAll.tsx
+++ b/client/src/components/Minimap/CollapseAll.tsx
@@ -27,7 +27,7 @@ const CollapseAll: React.FunctionComponent<CollapseAllProps> = ({
       floating ? 'w-minimap__collapse-all--floating' : ''
     } ${insideMinimap ? 'w-minimap__collapse-all--inside' : ''}`}
   >
-    <Icon name={expanded ? 'arrow-up-big' : 'arrow-down-big'} />
+    <Icon name={expanded ? 'collapse-up' : 'collapse-down'} />
     {expanded ? gettext('Collapse all') : gettext('Expand all')}
   </button>
 );
diff --git a/client/src/components/Minimap/MinimapItem.scss b/client/src/components/Minimap/MinimapItem.scss
index b435a603ad..167b6eddf4 100644
--- a/client/src/components/Minimap/MinimapItem.scss
+++ b/client/src/components/Minimap/MinimapItem.scss
@@ -22,10 +22,6 @@
     padding: theme('spacing.1');
   }
 
-  .icon-arrow-down-big {
-    transform: rotate(-90deg);
-  }
-
   // Minimap items have a lot of different states denoted with their text color, border color, and background.
   // The order of the following declaration blocks is essential so the correct states take priority.
   :where(.w-minimap--expanded) & {
diff --git a/client/storybook/preview.scss b/client/storybook/preview.scss
index f68758fec1..07890d2df1 100644
--- a/client/storybook/preview.scss
+++ b/client/storybook/preview.scss
@@ -16,5 +16,5 @@ textarea {
 }
 
 .icon {
-  @include svg-icon(1.5em);
+  @include svg-icon();
 }
diff --git a/wagtail/admin/templates/wagtailadmin/pages/listing/_modern_dropdown.html b/wagtail/admin/templates/wagtailadmin/pages/listing/_modern_dropdown.html
index ddbc5ac845..1cea7c6261 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/listing/_modern_dropdown.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/listing/_modern_dropdown.html
@@ -3,7 +3,7 @@
 <div {{ self.attrs }} class="{{ classes|join:' ' }}" data-button-with-dropdown>
     <button class="{{ button_classes|join:' ' }}" data-button-with-dropdown-toggle data-hover-tooltip-content="{{ title }}" data-tippy-offset="[0, -2]">
         <span class="{% if hide_title %}w-sr-only{% endif %}">{{ title }}</span>
-        {% if icon_name %}{% icon name=icon_name classname='w-w-5 w-h-5' %}{% endif %}
+        {% if icon_name %}{% icon name=icon_name classname='w-w-4 w-h-4' %}{% endif %}
     </button>
 
     <div data-button-with-dropdown-content class="w-hidden w-p-0">
diff --git a/wagtail/admin/templates/wagtailadmin/shared/breadcrumbs.html b/wagtail/admin/templates/wagtailadmin/shared/breadcrumbs.html
index 7d976a576f..9b7d0d07b8 100644
--- a/wagtail/admin/templates/wagtailadmin/shared/breadcrumbs.html
+++ b/wagtail/admin/templates/wagtailadmin/shared/breadcrumbs.html
@@ -18,7 +18,7 @@
                 aria-label="{% trans 'Toggle breadcrumbs' %}"
                 aria-expanded="false"
             >
-                {% icon name="breadcrumb-expand" classname="w-w-5 w-h-5" %}
+                {% icon name="breadcrumb-expand" classname="w-w-4 w-h-4" %}
             </button>
         {% endif %}
         <div class="w-relative w-h-slim-header w-mr-4 w-top-0 w-z-20 w-flex w-items-center w-flex-row w-flex-1 sm:w-flex-none w-transition w-duration-300">
diff --git a/wagtail/admin/templates/wagtailadmin/shared/panel.html b/wagtail/admin/templates/wagtailadmin/shared/panel.html
index 1d48d87a4d..4706cd4428 100644
--- a/wagtail/admin/templates/wagtailadmin/shared/panel.html
+++ b/wagtail/admin/templates/wagtailadmin/shared/panel.html
@@ -27,7 +27,7 @@
                 {% icon name="link" classname="w-panel__icon" %}
             </a>
             <button class="w-panel__toggle" type="button" aria-label="{% trans 'Toggle section' %}" aria-describedby="{{ heading_id }}" data-panel-toggle aria-controls="{{ content_id }}" aria-expanded="true">
-                {% firstof icon "arrow-down-big" as icon_name %}
+                {% firstof icon "placeholder" as icon_name %}
                 {% icon name=icon_name classname="w-panel__icon" %}
             </button>
             {% if heading %}
diff --git a/wagtail/admin/templates/wagtailadmin/shared/side_panels/includes/action_list_item.html b/wagtail/admin/templates/wagtailadmin/shared/side_panels/includes/action_list_item.html
index f9029b94be..916e383724 100644
--- a/wagtail/admin/templates/wagtailadmin/shared/side_panels/includes/action_list_item.html
+++ b/wagtail/admin/templates/wagtailadmin/shared/side_panels/includes/action_list_item.html
@@ -3,7 +3,7 @@
 
     {% block content %}
         <section class="w-flex w-space-x-3" aria-labelledby="status-sidebar-{{ title|cautious_slugify }}">
-            {% icon name=icon_name classname='w-w-5 w-h-5 w-text-primary w-flex-shrink-0' %}
+            {% icon name=icon_name classname='w-w-4 w-h-4 w-text-primary w-flex-shrink-0 w-mt-0.5' %}
 
             <div class="w-flex w-flex-1 w-items-start w-justify-between">
                 <div class="w-flex w-flex-col w-flex-1 w-pr-5">