-
Notifications
You must be signed in to change notification settings - Fork 363
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Re-work padding/height for dialog variants (#786)
* Re-work padding/heigt for dialog variants * Resolve review comments
- Loading branch information
Showing
9 changed files
with
69 additions
and
140 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
examples/Demo/Shared/Pages/Dialog/Examples/DialogDefault.razor.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| ::deep > fluent-dialog::part(control) { | ||
| --dialog-width: 300px; | ||
| --dialog-height: 350px; | ||
| padding: 2rem; | ||
| padding: 2rem!important; | ||
| } |
23 changes: 3 additions & 20 deletions
23
examples/Demo/Shared/Pages/Dialog/Examples/SimpleCustomizedDialog.razor
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,71 +1 @@ | ||
| @page "/IssueTester" | ||
| @using Microsoft.Fast.Components.FluentUI | ||
| @inject DataSource Data | ||
| @inject HttpClient Http | ||
| @inject NavigationManager NavManager | ||
|
|
||
| <label for="people-listbox">Select a person</label> | ||
| <FluentSelect TOption="Person" | ||
| Items="@Data.People.WithVeryLongName()" | ||
| Id="people-listbox" | ||
| Width="200px" | ||
| Height="250px" | ||
| OptionValue="@(p => p.PersonId.ToString())" | ||
| OptionText="@(p => p.LastName + ", " + p.FirstName)" | ||
| @bind-Value="@SelectedValue" | ||
| @bind-SelectedOption="@SelectedPerson" /> | ||
|
|
||
|
|
||
| <div style="height: 434px; overflow:auto;" tabindex="-1"> | ||
| <FluentDataGrid ItemsProvider="foodRecallProvider" Virtualize="true" ItemSize="46" GenerateHeader="GenerateHeaderOption.Sticky" TGridItem="FoodRecall"> | ||
| <PropertyColumn Title="ID" Property="@(c => c!.Event_Id)" /> | ||
| <PropertyColumn Property="@(c => c!.State)" /> | ||
| <PropertyColumn Property="@(c => c!.City)" /> | ||
| <PropertyColumn Title="Company" Property="@(c => c!.Recalling_Firm)" /> | ||
| <PropertyColumn Property="@(c => c!.Status)" /> | ||
| <TemplateColumn Title="Actions" Align="@Align.End"> | ||
| <FluentButton IconEnd="@(new Icons.Regular.Size16.Edit())" OnClick="@(() => DemoLogger.WriteLine("Edit clicked"))" /> | ||
| <FluentButton IconEnd="@(new Icons.Regular.Size16.Delete())" OnClick="@(() => DemoLogger.WriteLine("Delete clicked"))" /> | ||
| </TemplateColumn> | ||
| </FluentDataGrid> | ||
| </div> | ||
|
|
||
| <p>Total: <strong>@numResults results found</strong></p> | ||
| <p> | ||
| Selected value: @SelectedValue <br /> | ||
| Selected person (strongly typed): @SelectedPerson?.ToString() | ||
| </p> | ||
|
|
||
| @code { | ||
| GridItemsProvider<FoodRecall> foodRecallProvider = default!; | ||
| int numResults; | ||
| Person? SelectedPerson; | ||
| string? SelectedValue = "4"; | ||
|
|
||
|
|
||
| protected override async Task OnInitializedAsync() | ||
| { | ||
| // Define the GridRowsDataProvider. Its job is to convert QuickGrid's GridRowsDataProviderRequest into a query against | ||
| // an arbitrary data soure. In this example, we need to translate query parameters into the particular URL format | ||
| // supported by the external JSON API. It's only possible to perform whatever sorting/filtering/etc is supported | ||
| // by the external API. | ||
| foodRecallProvider = async req => | ||
| { | ||
| var url = NavManager.GetUriWithQueryParameters("https://api.fda.gov/food/enforcement.json", new Dictionary<string, object?> | ||
| { | ||
| { "skip", req.StartIndex }, | ||
| { "limit", req.Count }, | ||
| }); | ||
|
|
||
| var response = await Http.GetFromJsonAsync<FoodRecallQueryResult>(url, req.CancellationToken); | ||
| return GridItemsProviderResult.From( | ||
| items: response!.Results, | ||
| totalItemCount: response!.Meta.Results.Total); | ||
| }; | ||
|
|
||
| // Display the number of results just for information. This is completely separate from the grid. | ||
| numResults = (await Http.GetFromJsonAsync<FoodRecallQueryResult>("https://api.fda.gov/food/enforcement.json"))!.Meta.Results.Total; | ||
| } | ||
|
|
||
|
|
||
| } |
12 changes: 7 additions & 5 deletions
12
examples/Demo/Shared/Pages/Panel/Examples/SimplePanel.razor
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 24 additions & 20 deletions
44
examples/Demo/Shared/Pages/SplashScreen/Examples/CustomSplashScreen.razor
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 20 additions & 16 deletions
36
src/Core/Components/Dialog/ContentComponents/FluentSplashScreen.razor
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,24 @@ | ||
| @namespace Microsoft.Fast.Components.FluentUI | ||
| @implements IDialogContentComponent<SplashScreenContent> | ||
|
|
||
| <FluentStack Orientation="Orientation.Vertical" HorizontalAlignment="HorizontalAlignment.Center" Class="fluent-launch"> | ||
| <h1> | ||
| @Content.Title | ||
| </h1> | ||
| <h2> | ||
| @Content.SubTitle | ||
| </h2> | ||
| <FluentProgressRing /> | ||
| <h3> | ||
| @Content.LoadingText | ||
| </h3> | ||
| <p>@Content.Message</p> | ||
| <div class="icon"> | ||
| @(new MarkupString(Content.Logo!)) | ||
| </div> | ||
| </FluentStack> | ||
| <FluentDialogHeader Visible="false" /> | ||
| <FluentDialogBody> | ||
| <FluentStack Orientation="Orientation.Vertical" HorizontalAlignment="HorizontalAlignment.Center" Class="fluent-launch"> | ||
| <h1> | ||
| @Content.Title | ||
| </h1> | ||
| <h2> | ||
| @Content.SubTitle | ||
| </h2> | ||
| <FluentProgressRing /> | ||
| <h3> | ||
| @Content.LoadingText | ||
| </h3> | ||
| <p>@Content.Message</p> | ||
| <div class="icon"> | ||
| @(new MarkupString(Content.Logo!)) | ||
| </div> | ||
| </FluentStack> | ||
| </FluentDialogBody> | ||
| <FluentDialogFooter Visible="false" /> | ||
|
|
2 changes: 0 additions & 2 deletions
2
src/Core/Components/Dialog/ContentComponents/MessageBox.razor.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters