Skip to content

Commit f771fe7

Browse files
first pass of changes: mixins not affected by other mixins; had to make a couple exceptions in shared font-size file, however
1 parent 151bac3 commit f771fe7

File tree

107 files changed

+156
-213
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+156
-213
lines changed

packages/frontend/app/components/bulk-new-users.gjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ export default class BulkNewUsersComponent extends Component {
436436
/>
437437
</div>
438438
{{#if this.updateSelectedFile.isRunning}}
439-
<div class="file-is-loading">
439+
<div class="file-is-loading font-size-xxxl">
440440
<LoadingSpinner />
441441
</div>
442442
{{else if (gte this.proposedUsers.length 1)}}

packages/frontend/app/components/course-search-result.gjs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,24 @@ export default class CourseSearchResultComponent extends Component {
2626
<small>{{@course.year}}</small>
2727
{{@course.title}}
2828
</LinkTo>
29-
<span class="school-flag" data-test-school-title>
29+
<span class="school-flag font-size-smallest" data-test-school-title>
3030
{{@course.school}}
3131
</span>
32-
<span class="course-flag">
32+
<span class="course-flag font-size-smallest">
3333
{{t "general.course"}}
3434
</span>
3535
<GlobalSearchTags @tags={{@course.matchedIn}} />
3636
{{#if this.sessions}}
3737
<ul>
38-
<li class="sessions">
38+
<li class="sessions font-size-small">
3939
{{t "general.sessions"}}:
4040
</li>
4141
{{#each this.sessions as |session|}}
4242
<li class="session-row">
4343
<LinkTo
4444
@route="session"
4545
@models={{array @course.id session.id}}
46-
class="session-title-link"
46+
class="session-title-link font-size-small"
4747
>
4848
{{session.title}}
4949
</LinkTo>
@@ -54,7 +54,7 @@ export default class CourseSearchResultComponent extends Component {
5454
{{#if this.showMore}}
5555
<li>
5656
<button
57-
class="show-less link-button"
57+
class="show-less link-button font-size-small"
5858
type="button"
5959
{{on "click" (set this "showMore" false)}}
6060
>
@@ -65,11 +65,11 @@ export default class CourseSearchResultComponent extends Component {
6565
{{else}}
6666
<li>
6767
<button
68-
class="show-more link-button"
68+
class="show-more link-button font-size-small"
6969
type="button"
7070
{{on "click" (set this "showMore" true)}}
7171
>
72-
<FaIcon @icon="angle-down" />
72+
<FaIcon @icon="angle-down" class="font-size-base" />
7373
{{t "general.showMore"}}
7474
</button>
7575
</li>

packages/frontend/app/components/curriculum-inventory/new-sequence-block.gjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ export default class CurriculumInventoryNewSequenceBlock extends Component {
462462
{{/each}}
463463
</select>
464464
{{#if this.course}}
465-
<span class="details" data-test-course-details>
465+
<span class="details font-size-small" data-test-course-details>
466466
{{t "general.level"}}:
467467
{{this.course.level}},
468468
{{t "general.startDate"}}:

packages/frontend/app/components/curriculum-inventory/report-overview.gjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ export default class CurriculumInventoryReportOverviewComponent extends Componen
239239
<LinkTo
240240
@route="verification-preview"
241241
@model={{@report}}
242-
class="verification-preview"
242+
class="verification-preview font-size-medium"
243243
data-test-transition-to-verification-preview
244244
>
245245
<FaIcon
@@ -250,7 +250,7 @@ export default class CurriculumInventoryReportOverviewComponent extends Componen
250250
</LinkTo>
251251
{{#if this.showRollover}}
252252
<button
253-
class="link-button rollover"
253+
class="link-button rollover font-size-medium"
254254
type="button"
255255
aria-label={{t "general.curriculumInventoryReportRollover"}}
256256
{{on "click" this.transitionToRollover}}

packages/frontend/app/components/curriculum-inventory/sequence-block-overview.gjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ export default class CurriculumInventorySequenceBlockOverviewComponent extends C
695695
</span>
696696
{{#if this.selectedCourse}}
697697
{{#if this.selectedCourse.id}}
698-
<span class="details" data-test-course-details>
698+
<span class="details font-size-small" data-test-course-details>
699699
{{t "general.level"}}:
700700
{{this.selectedCourse.level}},
701701
{{t "general.startDate"}}:
@@ -720,7 +720,7 @@ export default class CurriculumInventorySequenceBlockOverviewComponent extends C
720720
</span>
721721
{{/if}}
722722
{{else if this.course}}
723-
<span class="details" data-test-course-details>
723+
<span class="details font-size-small" data-test-course-details>
724724
{{t "general.level"}}:
725725
{{this.course.level}},
726726
{{t "general.startDate"}}:

packages/frontend/app/components/global-search-tags.gjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { concat } from '@ember/helper';
55
{{#if @tags}}
66
<div class="global-search-tags" data-test-global-search-tags>
77
{{#each @tags as |tag|}}
8-
<span class="global-search-tag" data-test-global-search-tag>
8+
<span class="global-search-tag font-size-smallest" data-test-global-search-tag>
99
{{#if (eq tag "meshdescriptors")}}
1010
{{t "general.mesh"}}
1111
{{else if (eq tag "learningmaterials")}}

packages/frontend/app/components/learner-group/upload-data.gjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ export default class LearnerGroupUploadDataComponent extends Component {
265265
/>
266266
{{/if}}
267267
{{#if this.uploadData.isPending}}
268-
<LoadingSpinner class="loading-file" />
268+
<LoadingSpinner class="loading-file font-size-xxl" />
269269
{{/if}}
270270
{{#if this.invalidUsers}}
271271
<p class="error">

packages/frontend/app/components/manage-users-summary.gjs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,13 +264,13 @@ export default class ManageUsersSummaryComponent extends Component {
264264
@query={{hash showNewUserForm=true showBulkNewUserForm=false filter=null}}
265265
data-test-create-user-link
266266
>
267-
<button type="button">
267+
<button type="button" class="font-size-base">
268268
{{t "general.create"}}
269269
</button>
270270
</LinkTo>
271271
{{#if (notEq this.userSearchType "ldap")}}
272272
<LinkTo @route="users" @query={{hash showBulkNewUserForm=true showNewUserForm=false}}>
273-
<button type="button">
273+
<button type="button" class="font-size-base">
274274
{{t "general.createBulk"}}
275275
</button>
276276
</LinkTo>
@@ -324,7 +324,7 @@ export default class ManageUsersSummaryComponent extends Component {
324324
{{#if (eq result.type "user")}}
325325
<li class="user clickable">
326326
<button
327-
class="link-button"
327+
class="link-button font-size-base"
328328
type="button"
329329
disabled={{this.clickUser.isRunning}}
330330
data-userid={{result.user.id}}

packages/frontend/app/components/my-profile.gjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ export default class MyProfileComponent extends Component {
170170
/>
171171
<LearnerGroups @user={{@user}} />
172172
</div>
173-
<section class="token-maintenance" data-test-token-maintenance>
173+
<section class="token-maintenance font-size-small" data-test-token-maintenance>
174174
<h3>
175175
{{t "general.manageAPITokens"}}
176176
</h3>

packages/frontend/app/components/pagination-links.gjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export default class PaginationLinksComponent extends Component {
6262
disabled={{this.disablePrev}}
6363
data-test-prev
6464
>
65-
<FaIcon @icon="angle-left" />
65+
<FaIcon @icon="angle-left" class="font-size-medium" />
6666
{{t "general.prev"}}
6767
</button>
6868
{{#each this.pages as |pageNumber|}}
@@ -90,7 +90,7 @@ export default class PaginationLinksComponent extends Component {
9090
data-test-next
9191
>
9292
{{t "general.next"}}
93-
<FaIcon @icon="angle-right" />
93+
<FaIcon @icon="angle-right" class="font-size-medium" />
9494
</button>
9595
{{/if}}
9696
</div>

0 commit comments

Comments
 (0)