From 60d30dc8973fd9ad5b9d068f02b530d3a4fe89ea Mon Sep 17 00:00:00 2001 From: Michael Chadwick Date: Thu, 4 Dec 2025 14:45:35 -0800 Subject: [PATCH 01/18] added font-size shared classes file --- .../app/styles/ilios-common/shared.scss | 1 + .../styles/ilios-common/shared/font-size.scss | 38 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 packages/ilios-common/app/styles/ilios-common/shared/font-size.scss diff --git a/packages/ilios-common/app/styles/ilios-common/shared.scss b/packages/ilios-common/app/styles/ilios-common/shared.scss index ebcf4cde3e..2972228486 100644 --- a/packages/ilios-common/app/styles/ilios-common/shared.scss +++ b/packages/ilios-common/app/styles/ilios-common/shared.scss @@ -1,5 +1,6 @@ @forward "shared/critical-notice"; @forward "shared/data-visualization"; +@forward "shared/font-size"; @forward "shared/graph-with-data-table"; @forward "shared/icons"; @forward "shared/ilios-removable-table"; diff --git a/packages/ilios-common/app/styles/ilios-common/shared/font-size.scss b/packages/ilios-common/app/styles/ilios-common/shared/font-size.scss new file mode 100644 index 0000000000..d317e8e17e --- /dev/null +++ b/packages/ilios-common/app/styles/ilios-common/shared/font-size.scss @@ -0,0 +1,38 @@ +/* stylelint-disable property-disallowed-list */ + +.font-size-smallest { + font-size: var(--fs-smallest); + line-height: calc(4px + 2ex); +} +.font-size-small { + font-size: var(--fs-small); + line-height: calc(4px + 2ex); +} +.font-size-base { + font-size: var(--fs-base); + line-height: calc(4px + 2ex); +} +.font-size-medium { + font-size: var(--fs-medium); + line-height: calc(4px + 2ex); +} +.font-size-large { + font-size: var(--fs-large); + line-height: calc(4px + 2ex); +} +.font-size-xl { + font-size: var(--fs-xl); + line-height: calc(4px + 2ex); +} +.font-size-xxl { + font-size: var(--fs-xxl); + line-height: calc(4px + 2ex); +} +.font-size-xxxl { + font-size: var(--fs-xxxl); + line-height: calc(4px + 2ex); +} +.font-size-huge { + font-size: var(--fs-huge); + line-height: calc(4px + 2ex); +} From c535fcd949a74cde850216dec8c32437c17acd32 Mon Sep 17 00:00:00 2001 From: Michael Chadwick Date: Fri, 5 Dec 2025 10:41:08 -0800 Subject: [PATCH 02/18] first pass of changes: mixins not affected by other mixins; had to make a couple exceptions in shared font-size file, however --- .../app/components/bulk-new-users.gjs | 2 +- .../app/components/course-search-result.gjs | 12 ++++----- .../new-sequence-block.gjs | 2 +- .../curriculum-inventory/report-overview.gjs | 4 +-- .../sequence-block-overview.gjs | 4 +-- .../app/components/global-search-tags.gjs | 2 +- .../components/learner-group/upload-data.gjs | 2 +- .../app/components/manage-users-summary.gjs | 6 ++--- .../frontend/app/components/my-profile.gjs | 2 +- .../components/pending-updates-summary.gjs | 2 +- .../app/components/program-year/header.gjs | 4 +-- .../app/components/program-year/overview.gjs | 1 + .../components/reports/curriculum/header.gjs | 2 +- .../school-competencies-collapsed.gjs | 2 +- .../school-session-attributes-collapsed.gjs | 2 +- .../school-session-attributes-manager.gjs | 2 +- .../school-session-types-collapsed.gjs | 2 +- .../school-vocabularies-collapsed.gjs | 2 +- .../app/components/update-notification.gjs | 2 +- .../components/user-profile-bio-details.gjs | 4 +-- .../components/user-profile-bio-manager.gjs | 15 +++++------ .../app/components/user-profile-cohorts.gjs | 6 ++--- .../app/components/user-profile-ics.gjs | 6 ++--- .../components/user-profile-permissions.gjs | 24 +++++++++++++++--- .../app/components/user-profile-roles.gjs | 6 ++--- .../app/styles/components/bulk-new-users.scss | 1 - .../components/course-search-result.scss | 10 -------- .../new-sequence-block.scss | 6 ----- .../curriculum-inventory/report-overview.scss | 1 - .../sequence-block-overview.scss | 4 --- .../app/styles/components/ilios-footer.scss | 1 - .../learner-group/bulk-assignment.scss | 1 - .../app/styles/components/my-profile.scss | 1 - .../styles/components/pagination-links.scss | 1 - .../styles/components/programyear-header.scss | 1 - .../components/programyear-overview.scss | 1 - .../components/reports/curriculum-header.scss | 1 - .../components/update-notification.scss | 6 ----- .../styles/components/user-profile-bio.scss | 4 +-- .../app/styles/shared/admin-block.scss | 4 --- .../frontend/app/templates/application.gjs | 2 +- .../addon/components/collapsed-taxonomies.gjs | 2 +- .../addon/components/copy-button.gjs | 2 +- .../course/collapsed-objectives.gjs | 2 +- .../addon/components/course/loading.gjs | 2 +- .../addon/components/course/overview.gjs | 7 +++--- .../components/course/summary-header.gjs | 4 +-- .../addon/components/daily-calendar-event.gjs | 2 +- .../dashboard/material-list-item.gjs | 2 +- .../components/ilios-calendar-event-month.gjs | 10 ++++---- .../ilios-calendar-multiday-events.gjs | 2 +- .../addon/components/leadership-collapsed.gjs | 2 +- .../components/learning-material-uploader.gjs | 4 +-- .../learning-materials-sort-manager.gjs | 2 +- .../components/learningmaterial-search.gjs | 6 ++--- .../addon/components/mesh-manager.gjs | 2 +- .../addon/components/offering-calendar.gjs | 2 +- .../addon/components/offering-form.gjs | 8 ++++-- .../addon/components/offering-manager.gjs | 5 +++- .../addon/components/publish-all-sessions.gjs | 4 +-- .../components/selected-instructor-groups.gjs | 2 +- .../addon/components/selected-instructors.gjs | 2 +- .../components/session-offerings-list.gjs | 2 +- .../session/collapsed-objectives.gjs | 2 +- .../addon/components/session/overview.gjs | 2 +- .../addon/components/sessions-grid-header.gjs | 4 +-- .../components/sessions-grid-loading.gjs | 2 +- .../sessions-grid-offering-table.gjs | 12 ++++----- .../addon/components/sessions-grid-row.gjs | 2 +- ...ingle-event-learningmaterial-list-item.gjs | 25 +++++++++++++++---- .../single-event-objective-list.gjs | 2 +- .../addon/components/user-status.gjs | 2 +- .../learning-material-list-item.gjs | 2 +- .../components/course/publicationcheck.scss | 1 - .../components/course/summary-header.scss | 1 - .../course/visualize-objectives-graph.scss | 4 --- .../components/dashboard/materials.scss | 4 --- .../components/detail-learningmaterials.scss | 3 --- .../ilios-calendar-multiday-events.scss | 1 - .../learning-material-uploader.scss | 2 +- .../ilios-common/components/mesh-manager.scss | 1 - .../components/monthly-calendar.scss | 1 - .../components/offering-calendar.scss | 1 - .../components/offering-manager.scss | 1 - .../components/publish-all-sessions.scss | 4 --- .../components/session-offerings-list.scss | 1 - .../components/session-overview.scss | 1 - .../components/session-publicationcheck.scss | 1 - .../components/sessions-grid-header.scss | 1 - .../sessions-grid-offering-table.scss | 1 - .../single-event-learningmaterial-list.scss | 2 -- .../single-event-objective-list.scss | 1 - .../ilios-common/components/single-event.scss | 5 ---- .../ilios-common/components/toggle-yesno.scss | 4 --- .../ilios-common/mixins/course/overview.scss | 1 - .../ilios-common/mixins/ilios-form.scss | 1 - .../ilios-common/mixins/sessions-grid.scss | 5 ---- .../ilios-common/mixins/sort-manager.scss | 3 --- .../styles/ilios-common/shared/font-size.scss | 6 +++-- .../ilios-common/shared/ilios-table.scss | 2 -- .../ilios-common/shared/user-search.scss | 4 --- 101 files changed, 152 insertions(+), 205 deletions(-) diff --git a/packages/frontend/app/components/bulk-new-users.gjs b/packages/frontend/app/components/bulk-new-users.gjs index 7f0f3e35e1..25892dd1c1 100644 --- a/packages/frontend/app/components/bulk-new-users.gjs +++ b/packages/frontend/app/components/bulk-new-users.gjs @@ -436,7 +436,7 @@ export default class BulkNewUsersComponent extends Component { /> {{#if this.updateSelectedFile.isRunning}} -
+
{{else if (gte this.proposedUsers.length 1)}} diff --git a/packages/frontend/app/components/course-search-result.gjs b/packages/frontend/app/components/course-search-result.gjs index 8b737e3a11..ed43005f75 100644 --- a/packages/frontend/app/components/course-search-result.gjs +++ b/packages/frontend/app/components/course-search-result.gjs @@ -27,16 +27,16 @@ export default class CourseSearchResultComponent extends Component { {{@course.year}} {{@course.title}} - + {{@course.school}} - + {{t "general.course"}} {{#if this.sessions}}
    -
  • +
  • {{t "general.sessions"}}:
  • {{#each this.sessions as |session|}} @@ -44,7 +44,7 @@ export default class CourseSearchResultComponent extends Component { {{session.title}} @@ -55,7 +55,7 @@ export default class CourseSearchResultComponent extends Component { {{#if this.showMore}}
  • {{#if (notEq this.userSearchType "ldap")}} - @@ -324,7 +324,7 @@ export default class ManageUsersSummaryComponent extends Component { {{#if (eq result.type "user")}}
-
+

{{t "general.manageAPITokens"}}

diff --git a/packages/frontend/app/components/pending-updates-summary.gjs b/packages/frontend/app/components/pending-updates-summary.gjs index 5832876849..3ec35238e5 100644 --- a/packages/frontend/app/components/pending-updates-summary.gjs +++ b/packages/frontend/app/components/pending-updates-summary.gjs @@ -132,7 +132,7 @@ export default class PendingUpdatesSummaryComponent extends Component { @query={{hash school=this.bestSelectedSchool.id}} data-test-manage > - diff --git a/packages/frontend/app/components/program-year/header.gjs b/packages/frontend/app/components/program-year/header.gjs index 83183b316d..b0981a7a27 100644 --- a/packages/frontend/app/components/program-year/header.gjs +++ b/packages/frontend/app/components/program-year/header.gjs @@ -35,7 +35,7 @@ export default class ProgramYearHeaderComponent extends Component { {{/if}} {{#if @programYear}} -

+

{{t "general.matriculationYear"}} {{#if this.academicYearCrossesCalendarYearBoundaries}} {{@programYear.startYear}} @@ -45,7 +45,7 @@ export default class ProgramYearHeaderComponent extends Component { {{@programYear.startYear}} {{/if}}

-

+

{{#if @programYear.cohort.title}} ({{@programYear.cohort.title}}) {{else}} diff --git a/packages/frontend/app/components/program-year/overview.gjs b/packages/frontend/app/components/program-year/overview.gjs index 8a1b8ae7f7..7d16c6cde8 100644 --- a/packages/frontend/app/components/program-year/overview.gjs +++ b/packages/frontend/app/components/program-year/overview.gjs @@ -13,6 +13,7 @@ import { faChartColumn } from '@fortawesome/free-solid-svg-icons'; @route="program-year-visualize-objectives" @model={{@programYear}} title={{t "general.programYearVisualizations"}} + class="font-size-medium" data-test-go-to-visualizations > diff --git a/packages/frontend/app/components/reports/curriculum/header.gjs b/packages/frontend/app/components/reports/curriculum/header.gjs index 359dcab830..f6f24fa978 100644 --- a/packages/frontend/app/components/reports/curriculum/header.gjs +++ b/packages/frontend/app/components/reports/curriculum/header.gjs @@ -156,7 +156,7 @@ export default class ReportsCurriculumHeader extends Component { };