Merge pull request #14922 from abpframework/auto-merge/rel-6-0/1519

Merge branch rel-7.0 with rel-6.0

modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor

@@ -14,22 +14,17 @@
         @* ************************* PAGE HEADER ************************* *@
         <PageHeader Title="@L["Users"]"
                     BreadcrumbItems="@BreadcrumbItems"
-                    Toolbar="@Toolbar">
-        </PageHeader>
+                    Toolbar="@Toolbar" />
     </CardHeader>
     <CardBody>
-        <Field Horizontal>
-            <FieldBody ColumnSize="ColumnSize.Is2.Is10.WithOffset">
-                <Addons>
-                    <Addon AddonType="AddonType.Start">
-                        <Label>@L["Search"]</Label>
-                    </Addon>
-                    <Addon AddonType="AddonType.Body">
-                        <TextEdit Style="margin-left: 0.5rem" Size="Size.Small" Text="@GetListInput.Filter" TextChanged="@OnSearchTextChanged"/>
-                    </Addon>
-                </Addons>
-            </FieldBody>
-        </Field>
+        <Row>
+            <Column ColumnSize="ColumnSize.Is3">
+                <Field>
+                    <FieldLabel>@L["Search"]</FieldLabel>
+                    <TextEdit Size="Size.Small" Text="@GetListInput.Filter" TextChanged="@OnSearchTextChanged" />
+                </Field>
+            </Column>
+        </Row>
         @* ************************* DATA GRID ************************* *@
         <AbpExtensibleDataGrid TItem="IdentityUserDto"
                                Data="Entities"