Skip to content

A Swiss Army knife for developers.

Fixed container and grid

Etienne Baudouxcb4d6a698b26
diff --git a/src/app/dev/DevToys.Blazor/Assets/sass/theme/_default.scss b/src/app/dev/DevToys.Blazor/Assets/sass/theme/_default.scss
index f7e67c9a5..f00c0c3ab 100644
--- a/src/app/dev/DevToys.Blazor/Assets/sass/theme/_default.scss
+++ b/src/app/dev/DevToys.Blazor/Assets/sass/theme/_default.scss
@@ -6,11 +6,11 @@
html, body {
/* Font Families */
--font-family-fallback:
- "Segoe UI", /* Windows (Vista+) and Windows Phone. */
-apple-system, /* San Francisco in Safari (on Mac OS X and iOS); Neue Helvetica and Lucida Grande on older versions of Mac OS X. */
BlinkMacSystemFont, /* Equivalent of -apple-system, for Chrome on Mac OS X. */
- Roboto, /* Android (Ice Cream Sandwich (4.0)+) and Chrome OS. */
- Ubuntu, /* all versions of Ubuntu. */
+ "Segoe UI", /* Windows (Vista+) and Windows Phone. */
+ "Roboto", /* Android (Ice Cream Sandwich (4.0)+) and Chrome OS. */
+ "Ubuntu", /* all versions of Ubuntu. */
system-ui, /* Default UI font on a given platform. */
'Helvetica Neue', Helvetica, Arial, sans-serif; /* Fallback */
--font-family-text: "Segoe UI Variable Text", "Seoge UI Variable Static Text", var(--font-family-fallback);
diff --git a/src/app/dev/DevToys.Blazor/Components/Layout/Container/Container.razor.cs b/src/app/dev/DevToys.Blazor/Components/Layout/Container/Container.razor.cs
index 3601efb71..86b1b5e83 100644
--- a/src/app/dev/DevToys.Blazor/Components/Layout/Container/Container.razor.cs
+++ b/src/app/dev/DevToys.Blazor/Components/Layout/Container/Container.razor.cs
@@ -66,8 +66,10 @@ public partial class Container : StyledComponentBase
{
case VerticalAlignment.Stretch:
styleBuilder.AddImportantStyle("align-items", "stretch");
+ styleBuilder.AddImportantStyle("height", "100%", !Height.HasValue);
styleBuilder.AddImportantStyle("max-height", "100%", !Height.HasValue);
innerStyleBuilder.AddImportantStyle("max-height", "inherit", !Height.HasValue);
+ innerStyleBuilder.AddImportantStyle("height", "100%", !Height.HasValue);
break;
case VerticalAlignment.Top:
diff --git a/src/app/dev/DevToys.Blazor/Components/Layout/Grid/Grid.razor.cs b/src/app/dev/DevToys.Blazor/Components/Layout/Grid/Grid.razor.cs
index 76057442a..3987552ad 100644
--- a/src/app/dev/DevToys.Blazor/Components/Layout/Grid/Grid.razor.cs
+++ b/src/app/dev/DevToys.Blazor/Components/Layout/Grid/Grid.razor.cs
@@ -10,6 +10,8 @@ public partial class Grid : StyledComponentBase
.AddStyle("grid-template-columns", GetGridTemplate(Columns))
.AddStyle("grid-template-rows", GetGridTemplate(Rows))
.AddStyle("gap", $"{RowSpacing.ToPx()} {ColumnSpacing.ToPx()}")
+ .AddImportantStyle("height", "inherit")
+ .AddImportantStyle("width", "inherit")
.AddStyle(Style)
.Build();
diff --git a/src/app/dev/DevToys.Blazor/Components/UIElements/UIButtonPresenter.razor b/src/app/dev/DevToys.Blazor/Components/UIElements/UIButtonPresenter.razor
index 191fdf716..d84862c47 100644
--- a/src/app/dev/DevToys.Blazor/Components/UIElements/UIButtonPresenter.razor
+++ b/src/app/dev/DevToys.Blazor/Components/UIElements/UIButtonPresenter.razor
@@ -9,7 +9,7 @@
IsEnabled="@UIButton.IsEnabled"
Appearance="ButtonAppearance.Neutral"
@onclick=OnButtonClickAsync>
- @UIButton?.Text
+ <TextBlock Text="@UIButton?.Text" />
</Button>
}
</CascadingValue>
\ No newline at end of file
diff --git a/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor b/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor
index e72ec0491..d3f2e09a1 100644
--- a/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor
+++ b/src/app/dev/DevToys.Blazor/Pages/SubPages/ToolPage.razor
@@ -10,11 +10,13 @@
GridLength.Auto,
new GridLength(1, GridUnitType.Fraction)
})">
+
<GridCell Row="0">
<TextBlock Appearance="@TextBlockAppearance.Title"
Style="font-size: 24px !important"
Text="@ViewModel.HeaderText" />
</GridCell>
+
<GridCell Row="1">
<UIElementPresenter UIElement="@ViewModel.ToolView" />
</GridCell>