Skip to content

Replace critical-notice() SASS mixin with equivalent class #8958

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
dartajax merged 3 commits into from
Dec 3, 2025
Merged

Replace critical-notice() SASS mixin with equivalent class #8958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69d602a
replaced critial-notice() sass mixin with equivalent class and subcla…
michaelchadwick Nov 19, 2025
5ad22c0
moved component-specific styles to their respective component style f…
michaelchadwick Nov 19, 2025
3a08d68
moved background-color up one level to color in the whole div, not ju…
michaelchadwick Dec 3, 2025
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
5 changes: 4 additions & 1 deletion packages/frontend/app/components/connection-status.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,10 @@ export default class ConnectionStatusComponent extends Component {
this.reconnect.perform();
});
<template>
<div class="connection-status{{unless this.isOnline ' offline'}}" aria-hidden={{this.isOnline}}>
<div
class="connection-status critical-notice{{unless this.isOnline ' offline'}}"
aria-hidden={{this.isOnline}}
>
{{#unless this.isOnline}}
{{#if this.unableToReconnect}}
<p class="unable-to-reconnect">
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/app/components/update-notification.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default class UpdateNotificationComponent extends Component {
});
<template>
{{#if this.newVersion.isNewVersionAvailable}}
<div class="update-notification" data-test-update-notification>
<div class="update-notification critical-notice" data-test-update-notification>
<button type="button" {{on "click" (perform this.click)}}>
{{t "general.iliosUpdatePending"}}
</button>
Expand Down
8 changes: 6 additions & 2 deletions packages/frontend/app/styles/components/connection-status.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
@use "../ilios-common/mixins" as m;

.connection-status {
@include m.critical-notice(var(--dark-yellow), var(--black), 2.5rem);

display: none;
justify-content: space-between;
align-items: center;
flex-direction: column;

&.critical-notice {
background-color: var(--dark-yellow);
color: var(--black);
min-height: 2.5rem;
}

&.offline {
display: flex;

Expand Down
10 changes: 9 additions & 1 deletion packages/frontend/app/styles/components/update-notification.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,15 @@

.update-notification {
button {
@include m.critical-notice(var(--blue), var(--white), 3rem);
@include m.font-size("large");
}

&.critical-notice {
background-color: var(--blue);

button {
color: var(--white);
min-height: 3rem;
}
}
}
2 changes: 1 addition & 1 deletion packages/ilios-common/addon/components/api-version-notice.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export default class ApiVersionNoticeComponent extends Component {
});
<template>
<div
class="api-version-notice{{if this.mismatched ' mismatch'}}"
class="api-version-notice critical-notice{{if this.mismatched ' mismatch'}}"
hidden={{not this.mismatched}}
role={{if this.mismatched "alert" false}}
data-test-load-finished={{this.check.lastSuccessful.value}}
Expand Down
8 changes: 6 additions & 2 deletions packages/ilios-common/app/styles/ilios-common/components/api-version-notice.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
@use "../mixins" as m;

.api-version-notice {
@include m.critical-notice(var(--dark-yellow), var(--black), 1rem);

display: none;
padding: 0.25rem 1rem;

&.critical-notice {
background-color: var(--dark-yellow);
color: var(--black);
min-height: 2.5rem;
}

&.mismatch {
display: block;
}
Expand Down
1 change: 0 additions & 1 deletion packages/ilios-common/app/styles/ilios-common/mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@forward "mixins/media";
@forward "mixins/collapsed-container";
@forward "mixins/critical-notice";
@forward "mixins/detail-container";
@forward "mixins/font-size";
@forward "mixins/graph-with-data-table";
Expand Down
10 changes: 0 additions & 10 deletions packages/ilios-common/app/styles/ilios-common/mixins/critical-notice.scss
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions packages/ilios-common/app/styles/ilios-common/shared.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@forward "shared/critical-notice";
@forward "shared/data-visualization";
@forward "shared/ilios-removable-table";
@forward "shared/ilios-table";
Expand Down
7 changes: 7 additions & 0 deletions packages/ilios-common/app/styles/ilios-common/shared/critical-notice.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.critical-notice {
display: block;
margin: 0;
padding: 0;
text-align: center;
width: 100%;
}
Loading