Skip to content

Commit 06e93a3

Browse files
replaced critial-notice() sass mixin with equivalent class and subclasses for instances where it is used
1 parent a0adc21 commit 06e93a3

File tree

10 files changed

+34
-19
lines changed

10 files changed

+34
-19
lines changed

packages/frontend/app/components/connection-status.gjs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,10 @@ export default class ConnectionStatusComponent extends Component {
8787
this.reconnect.perform();
8888
});
8989
<template>
90-
<div class="connection-status{{unless this.isOnline ' offline'}}" aria-hidden={{this.isOnline}}>
90+
<div
91+
class="connection-status critical-notice{{unless this.isOnline ' offline'}}"
92+
aria-hidden={{this.isOnline}}
93+
>
9194
{{#unless this.isOnline}}
9295
{{#if this.unableToReconnect}}
9396
<p class="unable-to-reconnect">

packages/frontend/app/components/update-notification.gjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export default class UpdateNotificationComponent extends Component {
2525
});
2626
<template>
2727
{{#if this.newVersion.isNewVersionAvailable}}
28-
<div class="update-notification" data-test-update-notification>
28+
<div class="update-notification critical-notice" data-test-update-notification>
2929
<button type="button" {{on "click" (perform this.click)}}>
3030
{{t "general.iliosUpdatePending"}}
3131
</button>

packages/frontend/app/styles/components/connection-status.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
@use "../ilios-common/mixins" as m;
22

33
.connection-status {
4-
@include m.critical-notice(var(--dark-yellow), var(--black), 2.5rem);
5-
64
display: none;
75
justify-content: space-between;
86
align-items: center;

packages/frontend/app/styles/components/update-notification.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

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

packages/ilios-common/addon/components/api-version-notice.gjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export default class ApiVersionNoticeComponent extends Component {
6666
});
6767
<template>
6868
<div
69-
class="api-version-notice{{if this.mismatched ' mismatch'}}"
69+
class="api-version-notice critical-notice{{if this.mismatched ' mismatch'}}"
7070
hidden={{not this.mismatched}}
7171
role={{if this.mismatched "alert" false}}
7272
data-test-load-finished={{this.check.lastSuccessful.value}}

packages/ilios-common/app/styles/ilios-common/components/api-version-notice.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
@use "../mixins" as m;
22

33
.api-version-notice {
4-
@include m.critical-notice(var(--dark-yellow), var(--black), 1rem);
5-
64
display: none;
75
padding: 0.25rem 1rem;
86

packages/ilios-common/app/styles/ilios-common/mixins.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
@forward "mixins/media";
22
@forward "mixins/collapsed-container";
3-
@forward "mixins/critical-notice";
43
@forward "mixins/detail-container";
54
@forward "mixins/font-size";
65
@forward "mixins/graph-with-data-table";

packages/ilios-common/app/styles/ilios-common/mixins/critical-notice.scss

Lines changed: 0 additions & 10 deletions
This file was deleted.

packages/ilios-common/app/styles/ilios-common/shared.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@forward "shared/critical-notice";
12
@forward "shared/data-visualization";
23
@forward "shared/ilios-zebra-table";
34
@forward "shared/loading-box";
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
.critical-notice {
2+
display: block;
3+
margin: 0;
4+
padding: 0;
5+
text-align: center;
6+
width: 100%;
7+
8+
&.connection-notice {
9+
background-color: --var(--dark-yellow);
10+
color: var(--black);
11+
min-height: 2.5rem;
12+
}
13+
14+
&.update-notice {
15+
button {
16+
background-color: var(--blue);
17+
color: var(--white);
18+
min-height: 3rem;
19+
}
20+
}
21+
22+
&.api-version-notice {
23+
background-color: (--dark-yellow);
24+
color: var(--black);
25+
min-height: 1rem;
26+
}
27+
}

0 commit comments

Comments
 (0)