Skip to content

Make dialogs look more like M3 #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danielchalmers merged 1 commit into from
Jul 17, 2026
Merged

Make dialogs look more like M3 #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions JournalApp/Components/EditCategoryDialog.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,14 @@
<DialogActions>
@if (Category != null)
{
<MudButton Class="delete-button" StartIcon="@Icons.Material.Rounded.DeleteForever" OnClick="Delete" Color="Color.Error">Delete</MudButton>
<MudButton Class="delete-button" OnClick="Delete" Color="Color.Error">Delete</MudButton>

<MudSpacer />
}

<MudButton Class="cancel-button" StartIcon="@Icons.Material.Rounded.Close" OnClick="Cancel">Cancel</MudButton>
<MudButton Class="cancel-button" OnClick="Cancel" Color="Color.Primary">Cancel</MudButton>

<MudButton Class="submit-button" StartIcon="@Icons.Material.Rounded.Check" OnClick="Submit" Variant="Variant.Filled" Color="Color.Primary">Submit</MudButton>
<MudButton Class="submit-button" OnClick="Submit" Color="Color.Primary">Submit</MudButton>
</DialogActions>
</MudDialog>

Expand Down
4 changes: 2 additions & 2 deletions JournalApp/Components/EditDoseDialog.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
</DialogContent>

<DialogActions>
<MudButton Class="cancel-button" StartIcon="@Icons.Material.Rounded.Close" OnClick="Cancel">Cancel</MudButton>
<MudButton Class="cancel-button" OnClick="Cancel" Color="Color.Primary">Cancel</MudButton>

<MudButton Class="submit-button" StartIcon="@Icons.Material.Rounded.Check" OnClick="Submit" Variant="Variant.Filled" Color="Color.Primary">Submit</MudButton>
<MudButton Class="submit-button" OnClick="Submit" Color="Color.Primary">Submit</MudButton>
</DialogActions>
</MudDialog>

Expand Down
4 changes: 2 additions & 2 deletions JournalApp/Components/EditNoteDialog.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
</DialogContent>

<DialogActions>
<MudButton Class="cancel-button" StartIcon="@Icons.Material.Rounded.Close" OnClick="Cancel">Cancel</MudButton>
<MudButton Class="cancel-button" OnClick="Cancel" Color="Color.Primary">Cancel</MudButton>

<MudButton Class="submit-button" StartIcon="@Icons.Material.Rounded.Check" OnClick="Submit" Variant="Variant.Filled" Color="Color.Primary">Submit</MudButton>
<MudButton Class="submit-button" OnClick="Submit" Color="Color.Primary">Submit</MudButton>
</DialogActions>
</MudDialog>

Expand Down
6 changes: 3 additions & 3 deletions JournalApp/Components/JaMessageBox.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
}
else if (!string.IsNullOrWhiteSpace(CancelText))
{
<MudButton Class="mud-message-box__cancel-button" OnClick="OnCancelClicked">@CancelText</MudButton>
<MudButton Class="mud-message-box__cancel-button" OnClick="OnCancelClicked" Color="Color.Primary">@CancelText</MudButton>
}
@if (NoButton is not null)
{
Expand All @@ -51,7 +51,7 @@
}
else if (!string.IsNullOrWhiteSpace(NoText))
{
<MudButton Class="mud-message-box__no-button" OnClick="OnNoClicked">@NoText</MudButton>
<MudButton Class="mud-message-box__no-button" OnClick="OnNoClicked" Color="Color.Primary">@NoText</MudButton>
}
@if (YesButton is not null)
{
Expand All @@ -61,7 +61,7 @@
}
else if (!string.IsNullOrWhiteSpace(YesText))
{
<MudButton Class="mud-message-box__yes-button" OnClick="OnYesClicked" Variant="Variant.Filled" Color="Color.Primary">@YesText</MudButton>
<MudButton Class="mud-message-box__yes-button" OnClick="OnYesClicked" Color="Color.Primary">@YesText</MudButton>
}
</MudFocusTrap>
</div>
Expand Down
32 changes: 28 additions & 4 deletions JournalApp/wwwroot/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,14 +269,38 @@ label.mud-switch.mud-disabled .mud-switch-span {
--mud-palette-surface: var(--mud-palette-gray-lighter);
}

/* M3 dialogs sit on surfaceContainerHigh. */
/* M3 dialogs sit on surfaceContainerHigh with the 24px container inset. */
.mud-dialog {
padding: 12px !important;
gap: 12px !important;
padding: 24px !important;
gap: 16px !important;
border-radius: 28px;
--mud-palette-surface: var(--mud-palette-gray-lighter);
}

/* M3 dialog headline is headline-small on the leading edge, not a centered bold h6. */
.mud-dialog-title {
padding: 0 !important;
display: flex;
align-items: center;
justify-content: flex-start;
}

.mud-dialog-title .mud-typography-h6 {
font-size: 24px;
font-weight: 400;
line-height: 32px;
}

/* M3 dialog supporting text reads on onSurfaceVariant; inputs keep their own stronger ink. */
.mud-dialog-content {
color: var(--mud-palette-text-secondary);
}

.mud-dialog-actions {
gap: 8px;
justify-content: flex-end;
}

/* M3 filled cards: tonal, flat (depth comes from tone, not shadow). */
.mud-card {
padding: 12px !important;
Expand All @@ -290,7 +314,7 @@ label.mud-switch.mud-disabled .mud-switch-span {
font-size: inherit;
}

.mud-dialog-title, .mud-card-header {
.mud-card-header {
padding: 0 !important;
padding-top: 8px !important;
display: flex;
Expand Down
Loading