From cbd819e1b454e987df94f2c9702c832edc7db8b6 Mon Sep 17 00:00:00 2001
From: Enis Necipoglu <iletisim@enisnecipoglu.com>
Date: Fri, 4 Nov 2022 16:01:10 +0300
Subject: [PATCH] Improvements on UiMessageAlert.razor

---
 .../Components/UiMessageAlert.razor           | 77 ++++++++++---------
 1 file changed, 40 insertions(+), 37 deletions(-)

diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor b/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor
index 511343d3cd..82fc576b7e 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor
+++ b/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor
@@ -1,49 +1,52 @@
 <Modal @ref="@ModalRef" Closing="@OnModalClosing">
     <ModalContent Centered="@CenterMessage">
-        <ModalHeader>
-            <ModalTitle>
-                @Title
-            </ModalTitle>
-        </ModalHeader>
+        @if (!Title.IsNullOrEmpty())
+        {
+            <ModalHeader>
+                <ModalTitle>
+                    @Title
+                </ModalTitle>
+            </ModalHeader>
+        }
         <ModalBody>
             @if ( ShowMessageIcon )
             {
-                <DisplayHeading Size="DisplayHeadingSize.Is2" Alignment="TextAlignment.Center">
-                    <Icon Name="@MessageIcon" Style="@MessageIconStyle" />
+                <DisplayHeading Size="DisplayHeadingSize.Is2" TextAlignment="TextAlignment.Center">
+                    <Icon Name="@MessageIcon" Style="@MessageIconStyle" />                    
                 </DisplayHeading>
             }
-            <Text Alignment="TextAlignment.Center">
+            <Paragraph TextAlignment="TextAlignment.Center" Margin="Margin.Is0.FromBottom">
                 @Message
-            </Text>
+            </Paragraph>
         </ModalBody>
-        <ModalFooter>
-            @if ( IsConfirmation )
-            {
-                <Button Color="Color.Danger" Padding="Padding.Is2.OnX" Clicked="@OnCancelClicked">
-                    @if ( Options?.CancelButtonIcon != null )
-                    {
-                        <Icon Name="@Options.CancelButtonIcon" Margin="Margin.Is2.FromEnd" />
-                    }
-                    @CancelButtonText
-                </Button>
-                <Button Color="Color.Primary" Padding="Padding.Is2.OnX" Clicked="@OnConfirmClicked">
-                    @if ( Options?.ConfirmButtonIcon != null )
-                    {
-                        <Icon Name="@Options.ConfirmButtonIcon" Margin="Margin.Is2.FromEnd" />
-                    }
-                    @ConfirmButtonText
-                </Button>
-            }
-            else
-            {
-                <Button Color="Color.Primary" Padding="Padding.Is2.OnX" Clicked="@OnOkClicked">
-                    @if ( Options?.OkButtonIcon != null )
-                    {
-                        <Icon Name="@Options.OkButtonIcon" Margin="Margin.Is2.FromEnd" />
-                    }
-                    @OkButtonText
-                </Button>
-            }
+        <ModalFooter class="d-flex justify-content-center">
+                @if ( IsConfirmation )
+                {
+                    <Button Color="Color.Danger" Padding="Padding.Is3.OnX" Margin="Margin.Is1.OnX" Clicked="@OnCancelClicked">
+                        @if ( Options?.CancelButtonIcon != null )
+                        {
+                            <Icon Name="@Options.CancelButtonIcon" Margin="Margin.Is2.FromEnd" />
+                        }
+                        @CancelButtonText
+                    </Button>
+                    <Button Color="Color.Primary" Padding="Padding.Is3.OnX" Margin="Margin.Is1.OnX" Clicked="@OnConfirmClicked">
+                        @if ( Options?.ConfirmButtonIcon != null )
+                        {
+                            <Icon Name="@Options.ConfirmButtonIcon" Margin="Margin.Is2.FromEnd" />
+                        }
+                        @ConfirmButtonText
+                    </Button>
+                }
+                else
+                {
+                    <Button Color="Color.Primary" Padding="Padding.Is3.OnX" Margin="Margin.Is1.OnX" Clicked="@OnOkClicked">
+                        @if ( Options?.OkButtonIcon != null )
+                        {
+                            <Icon Name="@Options.OkButtonIcon" Margin="Margin.Is2.FromEnd" />
+                        }
+                        @OkButtonText
+                    </Button>
+                }
         </ModalFooter>
     </ModalContent>
 </Modal>
\ No newline at end of file