Skip to content

Fix Material non-primary themes #3621

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
RaymondLuong3 merged 1 commit into from
Jan 28, 2026
Merged

Fix Material non-primary themes #3621

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
2 changes: 2 additions & 0 deletions src/SIL.XForge.Scripture/ClientApp/src/app/settings/settings.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,10 +360,12 @@ <h2>{{ t("danger_zone") }}</h2>
id="delete-btn"
mat-flat-button
type="button"
color="warn"
(click)="openDeleteProjectDialog()"
[class.enabled]="!deleteButtonDisabled"
[disabled]="deleteButtonDisabled"
>
<mat-icon>delete</mat-icon>
{{ t("delete_this_project") }}
</button>
</mat-card-actions>
Expand Down
15 changes: 0 additions & 15 deletions src/SIL.XForge.Scripture/ClientApp/src/app/settings/settings.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,6 @@ a {
color: variables.$blueMedium;
}

mat-icon {
color: variables.$greyLight;
overflow: visible;
}

.indent {
margin-block-start: 16px;
margin-inline-start: 16px;
Expand Down Expand Up @@ -129,16 +124,6 @@ mat-icon {
}
}

// Use enabled class to work around changing styles while loading
#delete-btn:not(.enabled) {
background-color: rgba(0, 0, 0, 0.12);
color: rgba(0, 0, 0, 0.38);
}
#delete-btn:not(:disabled) {
background-color: var(--mat-sys-error);
color: var(--mat-sys-on-error);
}

mat-radio-group.tool-setting {
mat-radio-button {
margin-inline-start: 1em;
Expand Down
2 changes: 2 additions & 0 deletions src/SIL.XForge.Scripture/ClientApp/src/themes/_default.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,5 +162,7 @@ $_dark-theme: mat.define-theme(
html.theme-default-dark {
color-scheme: dark;
@include mat.all-component-colors($_dark-theme);
// Keep `color="primary" | "accent" | "warn"` working in dark mode too.
@include mat.color-variants-backwards-compatibility($_dark-theme);
@include mat-styles.theme($_dark-theme);
}
3 changes: 3 additions & 0 deletions src/SIL.XForge.Scripture/ClientApp/src/themes/themes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ html {
@include mat.elevation-classes();
@include mat.app-background();
@include mat.all-component-themes($default-theme);
// Enable M2-style `color="primary" | "accent" | "warn"` variants for M3 themes.
// This keeps existing templates working (e.g. `<button mat-button color="accent">`).
@include mat.color-variants-backwards-compatibility($default-theme);
@include mat.all-component-typographies($default-theme);
@include mat.typography-hierarchy($default-theme);
}
Expand Down
Loading