From 7bf70a68e069bfe6568370a6775b96f5f5ba491f Mon Sep 17 00:00:00 2001
From: pKallert <91674611+pKallert@users.noreply.github.com>
Date: Fri, 17 Nov 2023 09:39:43 +0100
Subject: [PATCH] Feature: adjust icon styling

---
 Resources/Public/Icons/{sync.svg => syncronize.svg}        | 0
 .../Public/Icons/{sync_alert.svg => syncronize_alert.svg}  | 0
 .../Public/Icons/{sync_check.svg => syncronize_check.svg}  | 0
 .../src/Containers/Modals/SyncWorkspaceDialog/index.js     | 4 ++--
 .../Containers/Modals/SyncWorkspaceDialog/style.module.css | 7 ++++++-
 .../src/Containers/PrimaryToolbar/WorkspaceSync/index.js   | 6 +++---
 .../PrimaryToolbar/WorkspaceSync/style.module.css          | 4 ++--
 7 files changed, 13 insertions(+), 8 deletions(-)
 rename Resources/Public/Icons/{sync.svg => syncronize.svg} (100%)
 rename Resources/Public/Icons/{sync_alert.svg => syncronize_alert.svg} (100%)
 rename Resources/Public/Icons/{sync_check.svg => syncronize_check.svg} (100%)

diff --git a/Resources/Public/Icons/sync.svg b/Resources/Public/Icons/syncronize.svg
similarity index 100%
rename from Resources/Public/Icons/sync.svg
rename to Resources/Public/Icons/syncronize.svg
diff --git a/Resources/Public/Icons/sync_alert.svg b/Resources/Public/Icons/syncronize_alert.svg
similarity index 100%
rename from Resources/Public/Icons/sync_alert.svg
rename to Resources/Public/Icons/syncronize_alert.svg
diff --git a/Resources/Public/Icons/sync_check.svg b/Resources/Public/Icons/syncronize_check.svg
similarity index 100%
rename from Resources/Public/Icons/sync_check.svg
rename to Resources/Public/Icons/syncronize_check.svg
diff --git a/packages/neos-ui/src/Containers/Modals/SyncWorkspaceDialog/index.js b/packages/neos-ui/src/Containers/Modals/SyncWorkspaceDialog/index.js
index e01914e552..c5bdc3bf47 100644
--- a/packages/neos-ui/src/Containers/Modals/SyncWorkspaceDialog/index.js
+++ b/packages/neos-ui/src/Containers/Modals/SyncWorkspaceDialog/index.js
@@ -55,7 +55,7 @@ export default class SyncWorkspaceDialog extends PureComponent {
             'Synchronize personal workspace', {}, 'Neos.Neos.Ui', 'Main')
         return (
             <div>
-                <Icon icon="resource://Neos.Neos.Ui/Icons/sync_alert.svg" className={style.buttonIcon} size="2x"/>
+                <Icon icon="resource://Neos.Neos.Ui/Icons/syncronize_alert.svg" className={style.buttonIcon} size="2x"/>
                 <span className={style.modalTitle}>
                     {synchronizeWorkspaceLabel}
                 </span>
@@ -94,7 +94,7 @@ export default class SyncWorkspaceDialog extends PureComponent {
                 hoverStyle="warn"
                 onClick={this.handleConfirm}
             >
-                <Icon icon="resource://Neos.Neos.Ui/Icons/sync.svg" className={style.buttonIcon} size="2x"/>
+                <Icon icon="resource://Neos.Neos.Ui/Icons/syncronize.svg" className={style.buttonIcon} size="2x"/>
                 <span className={style.confirmText}>
                     {confirmationLabel}
                 </span>
diff --git a/packages/neos-ui/src/Containers/Modals/SyncWorkspaceDialog/style.module.css b/packages/neos-ui/src/Containers/Modals/SyncWorkspaceDialog/style.module.css
index ab8e5c73e0..4f6dbd1a70 100644
--- a/packages/neos-ui/src/Containers/Modals/SyncWorkspaceDialog/style.module.css
+++ b/packages/neos-ui/src/Containers/Modals/SyncWorkspaceDialog/style.module.css
@@ -1,21 +1,26 @@
 .modalContents {
     padding: var(--spacing-Full);
+    white-space: pre-line;
 }
 
 .buttonIcon {
     display: inline-block;
     width: 1.5rem;
+    height: 1.5rem;
     float: left;
-    margin-right: var(--spacing-Half);
+    margin-right: var(--spacing-Quarter);
 }
+
 .buttonIcon span {
     display: inline-block;
     width: 100%;
 }
+
 .buttonIcon svg {
     width: 100%;
     height: auto;
 }
+
 .confirmText{
     vertical-align: sub;
 }
diff --git a/packages/neos-ui/src/Containers/PrimaryToolbar/WorkspaceSync/index.js b/packages/neos-ui/src/Containers/PrimaryToolbar/WorkspaceSync/index.js
index bfd97c0e79..7316e924f3 100644
--- a/packages/neos-ui/src/Containers/PrimaryToolbar/WorkspaceSync/index.js
+++ b/packages/neos-ui/src/Containers/PrimaryToolbar/WorkspaceSync/index.js
@@ -40,13 +40,13 @@ export default class WorkspaceSync extends PureComponent {
             isSaving,
             isOpen
         } = this.props;
-        let icon = 'resource://Neos.Neos.Ui/Icons/sync_check.svg';
+        let icon = 'resource://Neos.Neos.Ui/Icons/syncronize_check.svg';
         switch (personalWorkspaceStatus) {
             case 'OUTDATED':
-                icon = 'resource://Neos.Neos.Ui/Icons/sync.svg';
+                icon = 'resource://Neos.Neos.Ui/Icons/syncronize.svg';
                 break;
             case 'OUTDATED_CONFLICT':
-                icon = 'resource://Neos.Neos.Ui/Icons/sync_alert.svg';
+                icon = 'resource://Neos.Neos.Ui/Icons/syncronize_alert.svg';
                 break;
         }
         if (personalWorkspaceStatus !== 'UP_TO_DATE') {
diff --git a/packages/neos-ui/src/Containers/PrimaryToolbar/WorkspaceSync/style.module.css b/packages/neos-ui/src/Containers/PrimaryToolbar/WorkspaceSync/style.module.css
index 30283da26f..97ffedf6c2 100644
--- a/packages/neos-ui/src/Containers/PrimaryToolbar/WorkspaceSync/style.module.css
+++ b/packages/neos-ui/src/Containers/PrimaryToolbar/WorkspaceSync/style.module.css
@@ -10,7 +10,7 @@
 }
 
 .iconRebase svg {
-    height: 2rem;
+    height: 1.5rem;
     width: auto;
 }
 
@@ -19,6 +19,6 @@
     align-items: center;
 }
 .rebaseButton {
-    padding: 4px;
+    padding: var(--spacing-Quarter);
     border-left: 1px solid black;
 }