Merge pull request #521 from neozhu/ImproveMappingConfiguration

✨ add color style
neozhu · Oct 1, 2023 · a461b17 · a461b17
2 parents a009a4c + bad119d
commit a461b17
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/src/Blazor.Server.UI/Pages/Documents/Documents.razor b/src/Blazor.Server.UI/Pages/Documents/Documents.razor
@@ -141,7 +141,7 @@
                     <CellTemplate>
                         <div class="d-flex flex-column">
                             <MudText Typo="Typo.body2">@context.Item.Title</MudText>
-                            <MudText Typo="Typo.body2">@context.Item.Description</MudText>
+                    <MudText Typo="Typo.body2" Style="@($"color:{Theme.Theme.ApplicationTheme().Palette.TextSecondary}")">@context.Item.Description</MudText>
                         </div>
                     </CellTemplate>
                 </PropertyColumn>
@@ -166,7 +166,7 @@
                                 }
                             </div>
                             <div class="flex-grow-0">
-                                <MudHighlighter Typo="Typo.body2" Text="@context.Item.Content" HighlightedText="@_searchString"></MudHighlighter>
+                        <MudHighlighter Typo="Typo.body2" Text="@context.Item.Content" HighlightedText="@_searchString" Style="@($"color:{Theme.Theme.ApplicationTheme().Palette.TextSecondary}")"></MudHighlighter>
                             </div>
                         </div>
                     </CellTemplate>
@@ -175,7 +175,7 @@
                     <CellTemplate>
                         <div class="d-flex flex-column">
                             <MudCheckBox Size="Size.Small" Label="@L[_currentDto.GetMemberDescription(x=>x.IsPublic)]" Checked="@context.Item.IsPublic" Disabled="true"></MudCheckBox>
-                            <MudText Typo="Typo.body2">@context.Item.DocumentType</MudText>
+                    <MudText Typo="Typo.body2" Style="@($"color:{Theme.Theme.ApplicationTheme().Palette.TextSecondary}")">@context.Item.DocumentType</MudText>
                         </div>
                     </CellTemplate>
                 </PropertyColumn>
@@ -189,7 +189,7 @@
                         {
                             <div class="d-flex flex-column">
                                 <MudText>@context.Item.Owner?.DisplayName</MudText>
-                                <MudText Typo="Typo.body2">@context.Item.Owner?.Email</MudText>
+                                <MudText Typo="Typo.body2" Style="@($"color:{Theme.Theme.ApplicationTheme().Palette.TextSecondary}")">@context.Item.Owner?.Email</MudText>
                             </div>
                         }
                     </CellTemplate>
@@ -198,7 +198,7 @@
                     <CellTemplate>
                         <div class="d-flex flex-column">
                             <MudText Typo="Typo.body2">@context.Item.TenantName</MudText>
-                            <MudText Typo="Typo.body2">@context.Item.TenantId</MudText>
+                    <MudText Typo="Typo.body2" Style="@($"color:{Theme.Theme.ApplicationTheme().Palette.TextSecondary}")">@context.Item.TenantId</MudText>
                         </div>
                     </CellTemplate>
                 </PropertyColumn>

diff --git a/src/Blazor.Server.UI/Pages/Identity/Roles/Roles.razor b/src/Blazor.Server.UI/Pages/Identity/Roles/Roles.razor
@@ -168,7 +168,7 @@
             <CellTemplate>
                 <div class="d-flex flex-column">
                     <MudText Typo="Typo.body2">@context.Item.Name</MudText>
-                    <MudText Typo="Typo.body2">@context.Item.Description</MudText>
+                    <MudText Typo="Typo.body2" Style="@($"color:{Theme.Theme.ApplicationTheme().Palette.TextSecondary}")">@context.Item.Description</MudText>
                 </div>
             </CellTemplate>
             <FooterTemplate>

diff --git a/src/Blazor.Server.UI/Pages/Identity/Users/Users.razor b/src/Blazor.Server.UI/Pages/Identity/Users/Users.razor
@@ -199,7 +199,7 @@
             <CellTemplate>
                 <div>
                     <MudText Typo="Typo.body2">@context.Item.TenantName</MudText>
-                    <MudText Typo="Typo.body2">@context.Item.TenantId</MudText>
+                    <MudText Typo="Typo.body2" Style="@($"color:{Theme.Theme.ApplicationTheme().Palette.TextSecondary}")">@context.Item.TenantId</MudText>
                 </div>
             </CellTemplate>
             <FooterTemplate>
@@ -223,7 +223,7 @@
                 </MudBadge>
                 <div class="pl-3">
                     <MudText Class="ml-2 align-self-center">@context.Item.UserName</MudText>
-                    <MudText Typo="Typo.body2" Class="ml-2 align-self-center">@context.Item.Email</MudText>
+                    <MudText Typo="Typo.body2" Class="ml-2 align-self-center" Style="@($"color:{Theme.Theme.ApplicationTheme().Palette.TextSecondary}")">@context.Item.Email</MudText>
                 </div>
 
             </CellTemplate>
@@ -232,7 +232,7 @@
             <CellTemplate>
                 <div class="d-flex flex-column">
                     <MudText Typo="Typo.body2">@context.Item.DisplayName</MudText>
-                    <MudText Typo="Typo.body2">@context.Item.PhoneNumber</MudText>
+                    <MudText Typo="Typo.body2" Style="@($"color:{Theme.Theme.ApplicationTheme().Palette.TextSecondary}")">@context.Item.PhoneNumber</MudText>
                 </div>
             </CellTemplate>
         </PropertyColumn>

diff --git a/src/Blazor.Server.UI/Pages/Products/Products.razor b/src/Blazor.Server.UI/Pages/Products/Products.razor
@@ -217,7 +217,7 @@
                     <CellTemplate>
                         <div class="d-flex flex-column">
                             <MudText Typo="Typo.body2">@context.Item.Name</MudText>
-                            <MudText Typo="Typo.body2">@context.Item.Description</MudText>
+                    <MudText Typo="Typo.body2" Style="@($"color:{Theme.Theme.ApplicationTheme().Palette.TextSecondary}")">@context.Item.Description</MudText>
                         </div>
                     </CellTemplate>
                 </PropertyColumn>

diff --git a/src/Blazor.Server.UI/Pages/SystemManagement/AuditTrails.razor b/src/Blazor.Server.UI/Pages/SystemManagement/AuditTrails.razor
@@ -60,7 +60,7 @@
              <CellTemplate>
                  <div class="d-flex flex-column">
                      <MudText Typo="Typo.body2">@context.Item.Owner?.UserName</MudText>
-                     <MudText Typo="Typo.body2">@context.Item.UserId</MudText>
+                     <MudText Typo="Typo.body2" Style="@($"color:{Theme.Theme.ApplicationTheme().Palette.TextSecondary}")">@context.Item.UserId</MudText>
                  </div>
              </CellTemplate>
          </PropertyColumn>
@@ -94,7 +94,7 @@
                         {
                             <tr>
                                 <td>@field.Key</td>
-                                <td>@(context.Item.OldValues?.ContainsKey(field.Key) ?? false ? context.Item.OldValues[field.Key] : string.Empty)</td>
+                                <td style="@($"color:{Theme.Theme.ApplicationTheme().Palette.TextSecondary}")">@(context.Item.OldValues?.ContainsKey(field.Key) ?? false ? context.Item.OldValues[field.Key] : string.Empty)</td>
                                 <td>@(context.Item.NewValues?.ContainsKey(field.Key) ?? false ? context.Item.NewValues[field.Key] : string.Empty)</td>
                             </tr>
                         }

diff --git a/src/Blazor.Server.UI/Pages/Tenants/Tenants.razor b/src/Blazor.Server.UI/Pages/Tenants/Tenants.razor
@@ -129,7 +129,7 @@
             <CellTemplate>
                 <div class="d-flex flex-column">
                     <MudText Typo="Typo.body2">@context.Item.Name</MudText>
-                    <MudText Typo="Typo.body2">@context.Item.Description</MudText>
+                    <MudText Typo="Typo.body2" Style="@($"color:{Theme.Theme.ApplicationTheme().Palette.TextSecondary}")">@context.Item.Description</MudText>
                 </div>
             </CellTemplate>
         </PropertyColumn>

diff --git a/src/Blazor.Server.UI/Theme/DefaultTheme.cs b/src/Blazor.Server.UI/Theme/DefaultTheme.cs
@@ -16,7 +16,7 @@ public static MudTheme ApplicationTheme()
                 AppbarBackground = "rgba(255,255,255,0.8)",
                 AppbarText = "#424242",
                 BackgroundGrey = "#F9FAFC",
-                TextSecondary = "#425466",
+                TextSecondary = "#99a0b0",
                 Dark = "#110E2D",
                 DarkLighten = "#1A1643",
                 GrayDefault = "#4B5563",