From 927824c76d693e161b80de7484e93d4010b7eb2e Mon Sep 17 00:00:00 2001
From: Lucas Boilly <45385696+lucasboilly@users.noreply.github.com>
Date: Wed, 25 Sep 2024 03:18:18 -0500
Subject: [PATCH] chore: harmonized all button sizes in settings (#21457)

---
 .../admin/admin/src/pages/Settings/pages/Roles/CreatePage.tsx | 4 ++--
 .../admin/admin/src/pages/Settings/pages/Roles/EditPage.tsx   | 3 ++-
 .../admin/admin/src/pages/Settings/pages/Users/EditPage.tsx   | 1 -
 .../pages/Settings/pages/Webhooks/components/WebhookForm.tsx  | 2 --
 .../admin/src/pages/SettingsPage/pages/SingleSignOnPage.tsx   | 1 -
 .../core/review-workflows/admin/src/routes/settings/:id.tsx   | 1 -
 6 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/packages/core/admin/admin/src/pages/Settings/pages/Roles/CreatePage.tsx b/packages/core/admin/admin/src/pages/Settings/pages/Roles/CreatePage.tsx
index b462951464..838561ed2f 100644
--- a/packages/core/admin/admin/src/pages/Settings/pages/Roles/CreatePage.tsx
+++ b/packages/core/admin/admin/src/pages/Settings/pages/Roles/CreatePage.tsx
@@ -11,6 +11,7 @@ import {
   TextInput,
   Typography,
 } from '@strapi/design-system';
+import { Check } from '@strapi/icons';
 import { format } from 'date-fns';
 import { Formik, Form, FormikHelpers } from 'formik';
 import { useIntl } from 'react-intl';
@@ -197,14 +198,13 @@ const CreatePage = () => {
                         handleReset();
                         permissionsRef.current?.resetForm();
                       }}
-                      size="L"
                     >
                       {formatMessage({
                         id: 'app.components.Button.reset',
                         defaultMessage: 'Reset',
                       })}
                     </Button>
-                    <Button type="submit" loading={isSubmitting} size="L">
+                    <Button type="submit" loading={isSubmitting} startIcon={<Check />}>
                       {formatMessage({
                         id: 'global.save',
                         defaultMessage: 'Save',
diff --git a/packages/core/admin/admin/src/pages/Settings/pages/Roles/EditPage.tsx b/packages/core/admin/admin/src/pages/Settings/pages/Roles/EditPage.tsx
index be0c062e45..4493a0df70 100644
--- a/packages/core/admin/admin/src/pages/Settings/pages/Roles/EditPage.tsx
+++ b/packages/core/admin/admin/src/pages/Settings/pages/Roles/EditPage.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
 
 import { Box, Button, Flex, Main } from '@strapi/design-system';
+import { Check } from '@strapi/icons';
 import { Formik, FormikHelpers } from 'formik';
 import { useIntl } from 'react-intl';
 import { Navigate, useMatch } from 'react-router-dom';
@@ -191,9 +192,9 @@ const EditPage = () => {
                 <Flex gap={2}>
                   <Button
                     type="submit"
+                    startIcon={<Check />}
                     disabled={role.code === 'strapi-super-admin'}
                     loading={isSubmitting}
-                    size="L"
                   >
                     {formatMessage({
                       id: 'global.save',
diff --git a/packages/core/admin/admin/src/pages/Settings/pages/Users/EditPage.tsx b/packages/core/admin/admin/src/pages/Settings/pages/Users/EditPage.tsx
index f025aef3fe..7cb3fdc0cb 100644
--- a/packages/core/admin/admin/src/pages/Settings/pages/Users/EditPage.tsx
+++ b/packages/core/admin/admin/src/pages/Settings/pages/Users/EditPage.tsx
@@ -191,7 +191,6 @@ const EditPage = () => {
                     startIcon={<Check />}
                     loading={isSubmitting}
                     type="submit"
-                    size="L"
                   >
                     {formatMessage({ id: 'global.save', defaultMessage: 'Save' })}
                   </Button>
diff --git a/packages/core/admin/admin/src/pages/Settings/pages/Webhooks/components/WebhookForm.tsx b/packages/core/admin/admin/src/pages/Settings/pages/Webhooks/components/WebhookForm.tsx
index a117518ae8..3996ea7574 100644
--- a/packages/core/admin/admin/src/pages/Settings/pages/Webhooks/components/WebhookForm.tsx
+++ b/packages/core/admin/admin/src/pages/Settings/pages/Webhooks/components/WebhookForm.tsx
@@ -98,7 +98,6 @@ const WebhookForm = ({
                   variant="tertiary"
                   startIcon={<Publish />}
                   disabled={isCreating || isTriggering}
-                  size="L"
                 >
                   {formatMessage({
                     id: 'Settings.webhooks.trigger',
@@ -108,7 +107,6 @@ const WebhookForm = ({
                 <Button
                   startIcon={<Check />}
                   type="submit"
-                  size="L"
                   disabled={!modified}
                   loading={isSubmitting}
                 >
diff --git a/packages/core/admin/ee/admin/src/pages/SettingsPage/pages/SingleSignOnPage.tsx b/packages/core/admin/ee/admin/src/pages/SettingsPage/pages/SingleSignOnPage.tsx
index b0c06d3665..07817fec0d 100644
--- a/packages/core/admin/ee/admin/src/pages/SettingsPage/pages/SingleSignOnPage.tsx
+++ b/packages/core/admin/ee/admin/src/pages/SettingsPage/pages/SingleSignOnPage.tsx
@@ -144,7 +144,6 @@ export const SingleSignOnPage = () => {
                     loading={isSubmitting}
                     startIcon={<Check />}
                     type="submit"
-                    size="L"
                   >
                     {formatMessage({
                       id: 'global.save',
diff --git a/packages/core/review-workflows/admin/src/routes/settings/:id.tsx b/packages/core/review-workflows/admin/src/routes/settings/:id.tsx
index 5f052e1ba1..0fb6fbcfe6 100644
--- a/packages/core/review-workflows/admin/src/routes/settings/:id.tsx
+++ b/packages/core/review-workflows/admin/src/routes/settings/:id.tsx
@@ -335,7 +335,6 @@ const EditPage = () => {
                   <Button
                     startIcon={<Check />}
                     type="submit"
-                    size="M"
                     disabled={!modified || isSubmitting || values.stages.length === 0}
                     // if the confirm dialog is open the loading state is on
                     // the confirm button already