Skip to content

Commit 0fcddf7

Browse files
replace loading-shimmer and loading-text mixins with equivalent classes
1 parent 0bde600 commit 0fcddf7

File tree

20 files changed

+44
-84
lines changed

20 files changed

+44
-84
lines changed

packages/frontend/app/components/courses/loading-list.gjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import random from 'ember-math-helpers/helpers/random';
44
import truncate from 'ilios-common/helpers/truncate';
55
import formatDate from 'ember-intl/helpers/format-date';
66
<template>
7-
<table class="courses-loading-list" aria-hidden="true">
7+
<table class="courses-loading-list loading-shimmer loading-text" aria-hidden="true">
88
<thead>
99
<tr>
1010
<th colspan="8">

packages/frontend/app/components/courses/loading.gjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export default class CoursesLoading extends Component {
3333
<div class="schoolsfilter">
3434
<FaIcon @icon="building-columns" @fixedWidth={{true}} />
3535
{{#if this.hasMoreThanOneSchool}}
36-
<select aria-label={{t "general.filterBySchool"}} disabled>
36+
<select aria-label={{t "general.filterBySchool"}} class="loading-text" disabled>
3737
{{#each (sortBy "title" this.schools) as |school|}}
3838
<option>{{school.title}}</option>
3939
{{/each}}
@@ -42,7 +42,7 @@ export default class CoursesLoading extends Component {
4242
</div>
4343
<div class="yearsfilter">
4444
<FaIcon @icon="calendar" @fixedWidth={{true}} />
45-
<select aria-label={{t "general.filterByYear"}} disabled></select>
45+
<select aria-label={{t "general.filterByYear"}} class="loading-text" disabled></select>
4646
</div>
4747
<div class="titlefilter">
4848
<input

packages/frontend/app/components/reports/curriculum/header.gjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ export default class ReportsCurriculumHeader extends Component {
179179
{{else}}
180180
<button
181181
type="button"
182-
class="done text"
182+
class="done text loading-text"
183183
{{on "click" @runReport}}
184184
disabled={{not @countSelectedCourses}}
185185
id={{this.runButtonId}}

packages/frontend/app/components/reports/curriculum/learner-groups.gjs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,12 @@ export default class ReportsCurriculumLearnerGroupsComponent extends Component {
235235
></progress>
236236
{{/if}}
237237
</div>
238-
<div class="report-results {{if this.reportRunning 'running'}}" data-test-report-results>
238+
<div
239+
class="report-results{{if this.reportRunning ' loading-shimmer loading-text running'}}"
240+
data-test-report-results
241+
>
239242
<table>
240-
<caption>{{t "general.resultsSummary"}}</caption>
243+
<caption class="loading-text">{{t "general.resultsSummary"}}</caption>
241244
<thead>
242245
<tr>
243246
{{#if this.hasMultipleSchools}}
@@ -257,7 +260,7 @@ export default class ReportsCurriculumLearnerGroupsComponent extends Component {
257260
<td>{{this.schoolTitlePlaceholder}}</td>
258261
{{/if}}
259262
<td>
260-
<LinkTo @route="course" @model={{c.id}}>
263+
<LinkTo @route="course" @model={{c.id}} class="loading-text">
261264
{{c.title}}
262265
</LinkTo>
263266
</td>
@@ -273,7 +276,7 @@ export default class ReportsCurriculumLearnerGroupsComponent extends Component {
273276
<td>{{o.schoolTitle}}</td>
274277
{{/if}}
275278
<td>
276-
<LinkTo @route="course" @model={{o.courseId}}>
279+
<LinkTo @route="course" @model={{o.courseId}} class="loading-text">
277280
{{o.courseTitle}}
278281
</LinkTo>
279282
</td>

packages/frontend/app/components/reports/curriculum/loading.gjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export default class ReportsCurriculumLoading extends Component {
4545
}
4646
<template>
4747
<div
48-
class="reports-curriculum reports-curriculum-loading"
48+
class="reports-curriculum reports-curriculum-loading loading-shimmer loading-text"
4949
data-test-reports-curriculum
5050
...attributes
5151
>
@@ -61,7 +61,7 @@ export default class ReportsCurriculumLoading extends Component {
6161
<div class="reports-choose-course">
6262
<div class="schools">
6363
<FaIcon @icon="building-columns" />
64-
<select aria-label={{t "general.filterBySchool"}} disabled>
64+
<select aria-label={{t "general.filterBySchool"}} class="loading-text" disabled>
6565
<option>{{this.primarySchool.title}}</option>
6666
</select>
6767
</div>

packages/frontend/app/components/reports/curriculum/session-objectives.gjs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,12 @@ export default class ReportsCurriculumSessionObjectivesComponent extends Compone
228228
></progress>
229229
{{/if}}
230230
</div>
231-
<div class="report-results {{if this.reportRunning 'running'}}" data-test-report-results>
231+
<div
232+
class="report-results{{if this.reportRunning ' loading-shimmer loading-text running'}}"
233+
data-test-report-results
234+
>
232235
<table>
233-
<caption>{{t "general.resultsSummary"}}</caption>
236+
<caption class="loading-text">{{t "general.resultsSummary"}}</caption>
234237
<thead>
235238
<tr>
236239
{{#if this.hasMultipleSchools}}

packages/frontend/app/components/reports/list-loading.gjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import t from 'ember-intl/helpers/t';
22
import repeat from 'ilios-common/helpers/repeat';
33
import FaIcon from 'ilios-common/components/fa-icon';
44
<template>
5-
<div class="reports-list-loading" ...attributes>
5+
<div class="loading-shimmer loading-text" data-test-reports-list-loading ...attributes>
66
<table>
77
<thead>
88
<tr>

packages/frontend/app/styles/components.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@
146146
@forward "components/reports/subject-header";
147147
@forward "components/reports/subjects";
148148
@forward "components/reports/subjects-list";
149-
@forward "components/reports/list-loading";
150149

151150
@forward "components/school/session-type-visualize-vocabularies";
152151
@forward "components/school/session-type-visualize-vocabulary";
@@ -160,7 +159,6 @@
160159
@forward "components/courses/list-item";
161160
@forward "components/courses/new";
162161
@forward "components/courses/loading";
163-
@forward "components/courses/loading-list";
164162

165163
@forward "components/assign-students/manager";
166164
@forward "components/assign-students/root";

packages/frontend/app/styles/components/courses/loading-list.scss

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
@use "../../ilios-common/mixins" as cm;
2-
@use "../../ilios-common/colors" as c;
3-
41
.courses-loading {
52
.toggle-mycourses .toggle-buttons label {
6-
@include cm.loading-text;
73
cursor: default;
84
background-color: var(--lightest-grey);
5+
color: transparent;
6+
text-shadow: var(--very-transparent-black) 0 0 10px;
97
}
108

119
select {
12-
@include cm.loading-text;
1310
cursor: default;
1411
}
1512
}

0 commit comments

Comments
 (0)