From 8625fcc33203959509dacec05897fa6c11a4785d Mon Sep 17 00:00:00 2001 From: Jonathan Johnson Date: Thu, 5 Mar 2026 22:26:22 -0800 Subject: [PATCH 1/3] Extract Mixin for Ilios Overview Making this a share style instead of a mixin, and removed the course-overview mixin at the same time as it depended on overview. I didn't update the curriculum inventory as that is slated for deprecation. --- .../app/components/learner-group/root.gjs | 12 ++-- .../app/components/program-year/overview.gjs | 8 +-- .../app/components/program/overview.gjs | 16 ++--- .../components/learner-group/members.scss | 1 + .../styles/components/learner-group/root.scss | 17 +---- .../styles/components/program-overview.scss | 17 +---- .../components/programyear-overview.scss | 20 ++---- .../addon/components/course/loading.gjs | 22 +++---- .../addon/components/course/overview.gjs | 22 +++---- .../components/course/summary-header.gjs | 20 +++--- .../addon/components/session/ilm.gjs | 6 +- .../addon/components/session/overview.gjs | 16 ++--- .../components/course/loading.scss | 10 ++- .../components/course/overview.scss | 4 +- .../components/course/summary-header.scss | 31 +++------ .../components/session-overview.scss | 26 ++------ .../app/styles/ilios-common/mixins.scss | 1 - .../ilios-common/mixins/course/overview.scss | 47 -------------- .../app/styles/ilios-common/shared.scss | 1 + .../ilios-common/shared/ilios-overview.scss | 63 +++++++++++++++++++ 20 files changed, 155 insertions(+), 205 deletions(-) delete mode 100644 packages/ilios-common/app/styles/ilios-common/mixins/course/overview.scss create mode 100644 packages/ilios-common/app/styles/ilios-common/shared/ilios-overview.scss diff --git a/packages/frontend/app/components/learner-group/root.gjs b/packages/frontend/app/components/learner-group/root.gjs index 5ad1b41a70..48e98a1539 100644 --- a/packages/frontend/app/components/learner-group/root.gjs +++ b/packages/frontend/app/components/learner-group/root.gjs @@ -487,8 +487,8 @@ export default class LearnerGroupRootComponent extends Component { @sortUsersBy={{this.sortUsersBy}} @canUpdate={{@canUpdate}} /> -
-
+
+
{{#if @canUpdate}} @@ -505,7 +505,7 @@ export default class LearnerGroupRootComponent extends Component { {{/if}}
-
+
@@ -538,7 +538,7 @@ export default class LearnerGroupRootComponent extends Component { {{/if}}
-
+
@@ -661,7 +661,7 @@ export default class LearnerGroupRootComponent extends Component { @done={{fn @setIsBulkAssigning false}} /> {{else if @isEditing}} -
+
{{/if}} -
+
-
-
-

+
+
+

{{t "general.overview"}}

-
+
-
-

- {{t "general.overview"}} -

-
-
+
+
+

+ {{t "general.overview"}} +

+
+
+
@@ -101,7 +103,7 @@ export default class ProgramOverviewComponent extends Component { {{/if}}
-
+
diff --git a/packages/frontend/app/styles/components/learner-group/members.scss b/packages/frontend/app/styles/components/learner-group/members.scss index eadb095593..bf0a7dec6e 100644 --- a/packages/frontend/app/styles/components/learner-group/members.scss +++ b/packages/frontend/app/styles/components/learner-group/members.scss @@ -4,6 +4,7 @@ @include m.detail-container(var(--blue)); border-bottom: 0; display: grid; + grid-column: 1 / -1; grid-template-columns: 3fr 1fr; padding: 0; diff --git a/packages/frontend/app/styles/components/learner-group/root.scss b/packages/frontend/app/styles/components/learner-group/root.scss index e1a58a9069..6c2a4bebcf 100644 --- a/packages/frontend/app/styles/components/learner-group/root.scss +++ b/packages/frontend/app/styles/components/learner-group/root.scss @@ -4,21 +4,10 @@ .learner-group-root { .learner-group-overview { - @include m.ilios-overview(var(--orange)); - padding: 0; - - .block { - @include m.ilios-overview-block; - - &.defaulturl { - padding-bottom: 0.5rem; - } - } - .learner-group-overview-actions { padding: 0.5rem 0; - @include m.detail-container-header; + @include m.detail-container-header; .title { @include m.detail-container-title; } @@ -39,10 +28,6 @@ } } } - - .learner-group-overview-content { - border-bottom: 1px dotted var(--orange); - } } .cohortmembers { diff --git a/packages/frontend/app/styles/components/program-overview.scss b/packages/frontend/app/styles/components/program-overview.scss index ad23eb1f69..a08954494e 100644 --- a/packages/frontend/app/styles/components/program-overview.scss +++ b/packages/frontend/app/styles/components/program-overview.scss @@ -1,20 +1,5 @@ @use "../ilios-common/mixins" as m; .program-overview { - @include m.ilios-overview(var(--lightest-grey)); - - h2 { - margin-top: 0.5rem; - @include m.ilios-overview-title; - } - - .program-overview-content { - @include m.ilios-overview-content { - padding-top: 0.5rem; - } - - .block { - @include m.ilios-overview-block; - } - } + border-bottom: 1px dotted var(--lightest-grey); } diff --git a/packages/frontend/app/styles/components/programyear-overview.scss b/packages/frontend/app/styles/components/programyear-overview.scss index 6119f54643..5ace9a3561 100644 --- a/packages/frontend/app/styles/components/programyear-overview.scss +++ b/packages/frontend/app/styles/components/programyear-overview.scss @@ -1,28 +1,16 @@ @use "../ilios-common/mixins" as m; -@use "../ilios-common/constants"; .programyear-overview { - @include m.ilios-overview(var(--orange)); background: var(--white); border-top: 1px dotted var(--orange); border-bottom: 0; margin: 0 0.5rem; padding: 0 0 1rem 0; - .programyear-overview-header { - @include m.ilios-overview-header; - - h4 { - @include m.ilios-overview-title; - } - - .programyear-overview-actions { - @include m.ilios-overview-actions; - - a { - color: var(--light-blue); - @include m.font-size("medium"); - } + .actions { + a { + color: var(--light-blue); + @include m.font-size("medium"); } } } diff --git a/packages/ilios-common/addon/components/course/loading.gjs b/packages/ilios-common/addon/components/course/loading.gjs index 44e9c9b8e1..573fd565b1 100644 --- a/packages/ilios-common/addon/components/course/loading.gjs +++ b/packages/ilios-common/addon/components/course/loading.gjs @@ -11,30 +11,30 @@ import { faSquarePlus } from '@fortawesome/free-solid-svg-icons';
 
-
-
-
+
+
+
{{t "general.overview"}}
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
diff --git a/packages/ilios-common/addon/components/course/overview.gjs b/packages/ilios-common/addon/components/course/overview.gjs index 0eb7c52ba2..42c69a9031 100644 --- a/packages/ilios-common/addon/components/course/overview.gjs +++ b/packages/ilios-common/addon/components/course/overview.gjs @@ -234,13 +234,13 @@ export default class CourseOverview extends Component { this.level = this.args.course.level; }