diff --git a/packages/frontend/app/styles/components/assign-students/manager.scss b/packages/frontend/app/styles/components/assign-students/manager.scss index 199b834127..aab3aa67d8 100644 --- a/packages/frontend/app/styles/components/assign-students/manager.scss +++ b/packages/frontend/app/styles/components/assign-students/manager.scss @@ -1,5 +1,4 @@ -@use "../../ilios-common/mixins" as cm; -@use "../../mixins" as m; +@use "../../ilios-common/mixins" as m; .assign-students-manager { @include m.main-list-box; @@ -8,7 +7,7 @@ @include m.main-list-box-header; h2 { - @include cm.ilios-heading; + @include m.ilios-heading; } .title { @@ -22,12 +21,12 @@ flex-direction: column; padding: 0.5rem; - @include cm.for-laptop-and-up { + @include m.for-laptop-and-up { flex-direction: row; } label { - @include cm.ilios-label; + @include m.ilios-label; margin: 0 0.5rem; } diff --git a/packages/frontend/app/styles/components/assign-students/root.scss b/packages/frontend/app/styles/components/assign-students/root.scss index 55ca3e65c1..f415f7cd31 100644 --- a/packages/frontend/app/styles/components/assign-students/root.scss +++ b/packages/frontend/app/styles/components/assign-students/root.scss @@ -1,8 +1,7 @@ -@use "../../ilios-common/mixins" as cm; -@use "../../mixins" as m; +@use "../../ilios-common/mixins" as m; .assign-students-root { - @include cm.main-section; + @include m.main-section; .filters { @include m.main-list-filters; diff --git a/packages/frontend/app/styles/components/courses/list.scss b/packages/frontend/app/styles/components/courses/list.scss index eb685fcf3c..32d68a8c45 100644 --- a/packages/frontend/app/styles/components/courses/list.scss +++ b/packages/frontend/app/styles/components/courses/list.scss @@ -1,4 +1,4 @@ -@use "../../mixins" as m; +@use "../../ilios-common/mixins" as m; .courses-list { @include m.main-list-box-table; diff --git a/packages/frontend/app/styles/components/courses/root.scss b/packages/frontend/app/styles/components/courses/root.scss index 70195a5e19..4f0fb8fd76 100644 --- a/packages/frontend/app/styles/components/courses/root.scss +++ b/packages/frontend/app/styles/components/courses/root.scss @@ -1,8 +1,7 @@ -@use "../../ilios-common/mixins" as cm; -@use "../../mixins" as m; +@use "../../ilios-common/mixins" as m; .courses-root { - @include cm.main-section; + @include m.main-section; .filters { @include m.main-list-filters; @@ -26,7 +25,7 @@ @include m.main-list-box-header; h2 { - @include cm.ilios-heading; + @include m.ilios-heading; } .title { diff --git a/packages/frontend/app/styles/components/curriculum-inventory/reports-list.scss b/packages/frontend/app/styles/components/curriculum-inventory/reports-list.scss index f669948afc..c688e32247 100644 --- a/packages/frontend/app/styles/components/curriculum-inventory/reports-list.scss +++ b/packages/frontend/app/styles/components/curriculum-inventory/reports-list.scss @@ -1,13 +1,12 @@ -@use "../../ilios-common/mixins" as cm; -@use "../../mixins" as m; +@use "../../ilios-common/mixins" as m; .curriculum-inventory-reports { - @include cm.main-section; + @include m.main-section; .filters { @include m.main-list-filters; - @include cm.for-laptop-and-up { + @include m.for-laptop-and-up { justify-content: flex-start; } @@ -28,7 +27,7 @@ @include m.main-list-box-header; h2 { - @include cm.ilios-heading; + @include m.ilios-heading; } .title { diff --git a/packages/frontend/app/styles/components/curriculum-inventory/sequence-block-list.scss b/packages/frontend/app/styles/components/curriculum-inventory/sequence-block-list.scss index 11e4fa95ef..0b77806958 100644 --- a/packages/frontend/app/styles/components/curriculum-inventory/sequence-block-list.scss +++ b/packages/frontend/app/styles/components/curriculum-inventory/sequence-block-list.scss @@ -1,15 +1,14 @@ @use "../../ilios-common/colors" as c; -@use "../../ilios-common/mixins" as cm; -@use "../../mixins" as m; +@use "../../ilios-common/mixins" as m; .curriculum-inventory-sequence-block-list { - @include cm.main-section; + @include m.main-section; .header { @include m.main-list-box-header; h2 { - @include cm.ilios-heading; + @include m.ilios-heading; } .title { @@ -33,8 +32,6 @@ } .saved-result { - border: 1px solid c.$fernGreen; - margin: 1rem; - padding: 0.75rem; + @include m.main-list-saved-new; } } diff --git a/packages/frontend/app/styles/components/ilios-users.scss b/packages/frontend/app/styles/components/ilios-users.scss index a2d6f90722..d4847f4547 100644 --- a/packages/frontend/app/styles/components/ilios-users.scss +++ b/packages/frontend/app/styles/components/ilios-users.scss @@ -1,8 +1,7 @@ -@use "../ilios-common/mixins" as cm; -@use "../mixins" as m; +@use "../ilios-common/mixins" as m; .ilios-users { - @include cm.main-section; + @include m.main-section; .filters { @include m.main-list-filters; @@ -19,7 +18,7 @@ @include m.main-list-box-header; h2 { - @include cm.ilios-heading; + @include m.ilios-heading; } .title { diff --git a/packages/frontend/app/styles/components/instructor-groups/loading.scss b/packages/frontend/app/styles/components/instructor-groups/loading.scss index f31b7bc1c0..3c13294711 100644 --- a/packages/frontend/app/styles/components/instructor-groups/loading.scss +++ b/packages/frontend/app/styles/components/instructor-groups/loading.scss @@ -1,4 +1,4 @@ -@use "../../mixins" as m; +@use "../../ilios-common/mixins" as m; .instructor-groups-loading { @include m.main-list-loading-table; diff --git a/packages/frontend/app/styles/components/instructor-groups/root.scss b/packages/frontend/app/styles/components/instructor-groups/root.scss index e4a6c563df..01c1a7dbaa 100644 --- a/packages/frontend/app/styles/components/instructor-groups/root.scss +++ b/packages/frontend/app/styles/components/instructor-groups/root.scss @@ -1,8 +1,7 @@ -@use "../../ilios-common/mixins" as cm; -@use "../../mixins" as m; +@use "../../ilios-common/mixins" as m; .instructor-groups-root { - @include cm.main-section; + @include m.main-section; .filters { @include m.main-list-filters; @@ -24,7 +23,7 @@ @include m.main-list-box-header; h2 { - @include cm.ilios-heading; + @include m.ilios-heading; } .title { diff --git a/packages/frontend/app/styles/components/learner-group/cohort-user-manager.scss b/packages/frontend/app/styles/components/learner-group/cohort-user-manager.scss index a3c7307ff0..ac1e257e31 100644 --- a/packages/frontend/app/styles/components/learner-group/cohort-user-manager.scss +++ b/packages/frontend/app/styles/components/learner-group/cohort-user-manager.scss @@ -1,29 +1,28 @@ @use "../../ilios-common/colors" as c; -@use "../../ilios-common/mixins" as cm; -@use "../../mixins" as m; +@use "../../ilios-common/mixins" as m; .learner-group-cohort-user-manager { - @include cm.detail-container(c.$tealBlue); + @include m.detail-container(c.$tealBlue); border-bottom: 0; border-top: 1px dotted c.$orange; .learner-group-cohort-user-manager-header { - @include cm.detail-container-header; + @include m.detail-container-header; .title { - @include cm.detail-container-title; + @include m.detail-container-title; } .actions { input { - @include cm.ilios-input; + @include m.ilios-input; width: 15rem; } } } .learner-group-cohort-user-manager-content { - @include cm.detail-container-content; + @include m.detail-container-content; .list { @include m.main-list-box-table; @@ -33,7 +32,7 @@ } .inline-button { - @include cm.ilios-button-reset; + @include m.ilios-button-reset; text-align: left; width: 100%; } diff --git a/packages/frontend/app/styles/components/learner-group/members.scss b/packages/frontend/app/styles/components/learner-group/members.scss index 40b06eb738..1bd313c0d2 100644 --- a/packages/frontend/app/styles/components/learner-group/members.scss +++ b/packages/frontend/app/styles/components/learner-group/members.scss @@ -1,31 +1,30 @@ @use "../../ilios-common/colors" as c; -@use "../../ilios-common/mixins" as cm; -@use "../../mixins" as m; +@use "../../ilios-common/mixins" as m; .learner-group-members { - @include cm.detail-container(c.$tealBlue); + @include m.detail-container(c.$tealBlue); border-bottom: 0; display: grid; grid-template-columns: 3fr 1fr; .title { - @include cm.detail-container-title-style; + @include m.detail-container-title-style; } .actions { input { - @include cm.ilios-input; + @include m.ilios-input; width: 15rem; } } .learner-group-members-content { - @include cm.detail-container-content; + @include m.detail-container-content; grid-column: 1 / -1; .list { @include m.main-list-box-table; - @include cm.ilios-zebra-table; + @include m.ilios-zebra-table; grid-column: 1 / -1; max-height: 540px; overflow: auto; @@ -33,7 +32,7 @@ } .inline-button { - @include cm.ilios-button-reset; + @include m.ilios-button-reset; text-align: left; width: 100%; } diff --git a/packages/frontend/app/styles/components/learner-group/root.scss b/packages/frontend/app/styles/components/learner-group/root.scss index f0cd6f84d7..ea0497b82c 100644 --- a/packages/frontend/app/styles/components/learner-group/root.scss +++ b/packages/frontend/app/styles/components/learner-group/root.scss @@ -1,18 +1,17 @@ @use "../../ilios-common/colors" as c; -@use "../../ilios-common/mixins" as cm; -@use "../../mixins" as m; +@use "../../ilios-common/mixins" as m; @use "sass:color"; .learner-group-root { - @include cm.main-section; + @include m.main-section; .learner-group-overview { - @include cm.ilios-overview(c.$orange); + @include m.ilios-overview(c.$orange); margin-left: 0.8rem; .block { - @include cm.ilios-overview-block; + @include m.ilios-overview-block; &.associatedcourses { align-items: flex-start; @@ -23,7 +22,7 @@ white-space: nowrap; } ul { - @include cm.ilios-tag-list; + @include m.ilios-tag-list; li { margin-top: 0; @@ -41,16 +40,16 @@ } .learner-group-overview-actions { - @include cm.detail-container-header; + @include m.detail-container-header; margin-top: 0.25rem; padding-top: 0.5rem; .title { - @include cm.detail-container-title; + @include m.detail-container-title; } .actions { - @include cm.for-phone-and-up { + @include m.for-phone-and-up { .toggle-buttons { display: inline; } @@ -66,20 +65,20 @@ .cohortmembers { .cohortmembers-loading { display: block; - @include cm.font-size("xxl"); + @include m.font-size("xxl"); margin: auto; text-align: center; } } .subgroups { - @include cm.detail-container-content; + @include m.detail-container-content; .header { - @include cm.detail-container-header; + @include m.detail-container-header; .title { - @include cm.detail-container-title; + @include m.detail-container-title; } } diff --git a/packages/frontend/app/styles/components/learner-group/user-manager.scss b/packages/frontend/app/styles/components/learner-group/user-manager.scss index 8295f9e951..32671e3a00 100644 --- a/packages/frontend/app/styles/components/learner-group/user-manager.scss +++ b/packages/frontend/app/styles/components/learner-group/user-manager.scss @@ -1,31 +1,30 @@ @use "../../ilios-common/colors" as c; -@use "../../ilios-common/mixins" as cm; -@use "../../mixins" as m; +@use "../../ilios-common/mixins" as m; .learner-group-user-manager { - @include cm.detail-container(c.$tealBlue); + @include m.detail-container(c.$tealBlue); border-bottom: 0; display: grid; grid-template-columns: 3fr 1fr; .title { - @include cm.detail-container-title-style; + @include m.detail-container-title-style; } .actions { input { - @include cm.ilios-input; + @include m.ilios-input; width: 15rem; } } .learner-group-user-manager-content { - @include cm.detail-container-content; + @include m.detail-container-content; grid-column: 1 / -1; .list { @include m.main-list-box-table; - @include cm.ilios-zebra-table; + @include m.ilios-zebra-table; grid-column: 1 / -1; max-height: 540px; overflow: auto; @@ -33,7 +32,7 @@ } .inline-button { - @include cm.ilios-button-reset; + @include m.ilios-button-reset; text-align: left; width: 100%; } diff --git a/packages/frontend/app/styles/components/learner-groups/loading.scss b/packages/frontend/app/styles/components/learner-groups/loading.scss index 7bdf2c270e..28ef75346b 100644 --- a/packages/frontend/app/styles/components/learner-groups/loading.scss +++ b/packages/frontend/app/styles/components/learner-groups/loading.scss @@ -1,4 +1,4 @@ -@use "../../mixins" as m; +@use "../../ilios-common/mixins" as m; .learner-groups-loading { @include m.main-list-loading-table; diff --git a/packages/frontend/app/styles/components/learner-groups/root.scss b/packages/frontend/app/styles/components/learner-groups/root.scss index 9196fc1236..c4807dd62c 100644 --- a/packages/frontend/app/styles/components/learner-groups/root.scss +++ b/packages/frontend/app/styles/components/learner-groups/root.scss @@ -1,11 +1,10 @@ @use "../../ilios-common/colors" as c; -@use "../../ilios-common/mixins" as cm; -@use "../../mixins" as m; +@use "../../ilios-common/mixins" as m; @use "sass:color"; .learner-groups-root { - @include cm.main-section; + @include m.main-section; .filters { @include m.main-list-filters; @@ -26,7 +25,7 @@ @include m.main-list-box-header; h2 { - @include cm.ilios-heading; + @include m.ilios-heading; } .title { diff --git a/packages/frontend/app/styles/components/pending-user-updates.scss b/packages/frontend/app/styles/components/pending-user-updates.scss index 25ce3d5f6a..56e283a512 100644 --- a/packages/frontend/app/styles/components/pending-user-updates.scss +++ b/packages/frontend/app/styles/components/pending-user-updates.scss @@ -1,8 +1,7 @@ -@use "../ilios-common/mixins" as cm; -@use "../mixins" as m; +@use "../ilios-common/mixins" as m; .pending-user-updates { - @include cm.main-section; + @include m.main-section; .filters { @include m.main-list-filters; @@ -21,7 +20,7 @@ @include m.main-list-box-table; button { - @include cm.ilios-button-reset; + @include m.ilios-button-reset; white-space: nowrap; } } diff --git a/packages/frontend/app/styles/components/program-year/list.scss b/packages/frontend/app/styles/components/program-year/list.scss index 880d64c397..a2b7de7f7a 100644 --- a/packages/frontend/app/styles/components/program-year/list.scss +++ b/packages/frontend/app/styles/components/program-year/list.scss @@ -1,8 +1,7 @@ -@use "../../ilios-common/mixins" as cm; -@use "../../mixins" as m; +@use "../../ilios-common/mixins" as m; .program-year-list { - @include cm.main-section; + @include m.main-section; .program-years { @include m.main-list-box; @@ -11,7 +10,7 @@ @include m.main-list-box-header; h2 { - @include cm.ilios-heading; + @include m.ilios-heading; } .title { @@ -35,6 +34,6 @@ .fa-lock, .fa-trash, .fa-unlock { - @include cm.icon; + @include m.icon; } } diff --git a/packages/frontend/app/styles/components/programs/list.scss b/packages/frontend/app/styles/components/programs/list.scss index aa777cd9ec..8392deb2d2 100644 --- a/packages/frontend/app/styles/components/programs/list.scss +++ b/packages/frontend/app/styles/components/programs/list.scss @@ -1,4 +1,4 @@ -@use "../../mixins" as m; +@use "../../ilios-common/mixins" as m; .programs-root { .list { diff --git a/packages/frontend/app/styles/components/programs/root.scss b/packages/frontend/app/styles/components/programs/root.scss index 9eb4d5b9b8..f92e5f1605 100644 --- a/packages/frontend/app/styles/components/programs/root.scss +++ b/packages/frontend/app/styles/components/programs/root.scss @@ -1,8 +1,7 @@ -@use "../../ilios-common/mixins" as cm; -@use "../../mixins" as m; +@use "../../ilios-common/mixins" as m; .programs-root { - @include cm.main-section; + @include m.main-section; .filters { @include m.main-list-filters; @@ -24,7 +23,7 @@ @include m.main-list-box-header; h2 { - @include cm.ilios-heading; + @include m.ilios-heading; } .title { diff --git a/packages/frontend/app/styles/components/reports/root.scss b/packages/frontend/app/styles/components/reports/root.scss index 4a060f1444..6135b39f51 100644 --- a/packages/frontend/app/styles/components/reports/root.scss +++ b/packages/frontend/app/styles/components/reports/root.scss @@ -1,8 +1,7 @@ -@use "../../ilios-common/mixins" as cm; -@use "../../mixins" as m; +@use "../../ilios-common/mixins" as m; .reports-root { - @include cm.main-section; + @include m.main-section; .filters { @include m.main-list-filters; @@ -23,7 +22,7 @@ @include m.main-list-box-header; h2 { - @include cm.ilios-heading; + @include m.ilios-heading; } .title { diff --git a/packages/frontend/app/styles/components/reports/subjects.scss b/packages/frontend/app/styles/components/reports/subjects.scss index 5befbfbc78..a7a8b5af8b 100644 --- a/packages/frontend/app/styles/components/reports/subjects.scss +++ b/packages/frontend/app/styles/components/reports/subjects.scss @@ -1,14 +1,13 @@ -@use "../../ilios-common/mixins" as cm; -@use "../../mixins" as m; +@use "../../ilios-common/mixins" as m; .reports-subjects { - @include cm.main-section; + @include m.main-section; .header { @include m.main-list-box-header; h2 { - @include cm.ilios-heading; + @include m.ilios-heading; } .title { @@ -20,7 +19,7 @@ margin-left: 1rem; .saved-reports { - @include cm.ilios-list-reset; + @include m.ilios-list-reset; margin: 0.5rem 0; li { @@ -30,7 +29,7 @@ } .fa-trash { - @include cm.icon; + @include m.icon; } } } diff --git a/packages/frontend/app/styles/components/school-list.scss b/packages/frontend/app/styles/components/school-list.scss index 13a6631f5b..4c8122200b 100644 --- a/packages/frontend/app/styles/components/school-list.scss +++ b/packages/frontend/app/styles/components/school-list.scss @@ -1,9 +1,8 @@ @use "../ilios-common/colors" as c; -@use "../ilios-common/mixins" as cm; -@use "../mixins" as m; +@use "../ilios-common/mixins" as m; .school-list { - @include cm.main-section; + @include m.main-section; .schools { @include m.main-list-box; @@ -12,7 +11,7 @@ @include m.main-list-box-header; h2 { - @include cm.ilios-heading; + @include m.ilios-heading; } .title { @@ -29,23 +28,23 @@ border: 1px solid c.$culturedGrey; padding: 1rem; - @include cm.for-laptop-and-up { + @include m.for-laptop-and-up { margin-left: 1rem; } .new-result-title { - @include cm.ilios-heading-h4; + @include m.ilios-heading-h4; } .form { - @include cm.ilios-form; + @include m.ilios-form; .item { - @include cm.ilios-form-item; + @include m.ilios-form-item; } .buttons { - @include cm.ilios-form-buttons; + @include m.ilios-form-buttons; } } } diff --git a/packages/frontend/app/styles/components/school-vocabularies-list.scss b/packages/frontend/app/styles/components/school-vocabularies-list.scss index 801ca6f0f8..66d7924de1 100644 --- a/packages/frontend/app/styles/components/school-vocabularies-list.scss +++ b/packages/frontend/app/styles/components/school-vocabularies-list.scss @@ -23,9 +23,7 @@ } .savedvocabulary { - border: 1px solid c.$fernGreen; - margin: 1rem; - padding: 1rem; + @include m.main-list-saved-new; } } diff --git a/packages/frontend/app/styles/components/school-vocabulary-term-manager.scss b/packages/frontend/app/styles/components/school-vocabulary-term-manager.scss index 058d2ca501..cec4360a57 100644 --- a/packages/frontend/app/styles/components/school-vocabulary-term-manager.scss +++ b/packages/frontend/app/styles/components/school-vocabulary-term-manager.scss @@ -43,9 +43,7 @@ width: 80%; .saved-result { - border: 1px solid c.$fernGreen; - margin: 1rem; - padding: 1rem; + @include m.main-list-saved-new; @include m.for-laptop-and-up { width: 40%; diff --git a/packages/frontend/app/styles/mixins.scss b/packages/frontend/app/styles/mixins.scss index 5a55337cc9..cbca87b972 100644 --- a/packages/frontend/app/styles/mixins.scss +++ b/packages/frontend/app/styles/mixins.scss @@ -1,4 +1,3 @@ -@forward "mixins/main-list"; @forward "mixins/admin-blocks"; @forward "mixins/header-menu"; @forward "mixins/verification-preview-table"; diff --git a/packages/ilios-common/addon/components/course/sessions.hbs b/packages/ilios-common/addon/components/course/sessions.hbs index 6a9b0c6de7..ecfdecd404 100644 --- a/packages/ilios-common/addon/components/course/sessions.hbs +++ b/packages/ilios-common/addon/components/course/sessions.hbs @@ -5,7 +5,8 @@ >