Merge branch 'main' of https://github.com/EasyAbp/Abp.SettingUi

EasyAbp · Mar 23, 2023 · 1898b11 · 1898b11
2 parents 577ad47 + f48e753
commit 1898b11
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/EasyAbp.Abp.SettingUi.Web/Pages/Components/Default.cshtml b/src/EasyAbp.Abp.SettingUi.Web/Pages/Components/Default.cshtml
@@ -6,19 +6,19 @@
 @foreach (var group in Model.GroupBy(sd => sd.Group2))
 {
  <form method="post" id="@(group.Key)SettingGroup">
- <abp-card>
+ <abp-card class="mb-3">
  <abp-card-header>
  <h4>@L[group.Key]</h4>
  </abp-card-header>
  <abp-card-body>
  @foreach (var settingHtmlInfo in group)
  {
  <div class="mb-3">
- <label for="@settingHtmlInfo.Name">@settingHtmlInfo.DisplayName</label>
+ <label class="form-label" for="@settingHtmlInfo.Name">@settingHtmlInfo.DisplayName</label>
  @await Html.PartialAsync($"~/Pages/Components/Partials/_{settingHtmlInfo.Type.ToPascalCase()}.cshtml", settingHtmlInfo)
  </div>
  }
- <hr class="my-4">
+ <hr class="my-3">
  <div>
  <abp-button type="submit" button-type="Primary" text="@L["Save"].Value" />
  <abp-button button-type="Warning" text="@L["Reset"].Value" class="reset" />

diff --git a/src/EasyAbp.Abp.SettingUi.Web/Pages/Components/Partials/_Number.cshtml b/src/EasyAbp.Abp.SettingUi.Web/Pages/Components/Partials/_Number.cshtml
@@ -2,6 +2,6 @@
 
 @if (!Model.Description.IsNullOrEmpty())
 {
-<p class="form-text">@Model.Description</p>
+<p class="form-text mt-0 mb-2">@Model.Description</p>
 }
 <input type="number" id="@Model.Name" name="@Model.FormName" value="@Model.Value" class="form-control"/>
diff --git a/src/EasyAbp.Abp.SettingUi.Web/Pages/Components/Partials/_Select.cshtml b/src/EasyAbp.Abp.SettingUi.Web/Pages/Components/Partials/_Select.cshtml
@@ -18,7 +18,7 @@
 
 @if (!Model.Description.IsNullOrEmpty())
 {
-<p class="form-text">@Model.Description</p>
+<p class="form-text mt-0 mb-2">@Model.Description</p>
 }
 <select id="@Model.Name" name="@Model.FormName" class="form-select">
  @foreach (var option in optionStr.Split(SettingUiConst.OptionsSeparator))

diff --git a/src/EasyAbp.Abp.SettingUi.Web/Pages/Components/Partials/_Text.cshtml b/src/EasyAbp.Abp.SettingUi.Web/Pages/Components/Partials/_Text.cshtml
@@ -2,6 +2,6 @@
 
 @if (!Model.Description.IsNullOrEmpty())
 {
-<p class="form-text">@Model.Description</p>
+<p class="form-text mt-0 mb-2">@Model.Description</p>
 }
 <input type="text" id="@Model.Name" name="@Model.FormName" value="@Model.Value" class="form-control"/>