Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export default class AssignStudentsManagerComponent extends Component {
<template>
<div class="assign-students-manager" data-test-assign-students-manager>
<div class="header">
<h2 data-test-title>
<h2 class="title text-align-bottom" data-test-title>
{{t "general.unassignedStudentsSummaryTitle"}}
</h2>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/app/components/courses/loading.gjs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export default class CoursesLoading extends Component {
</div>
<section class="courses">
<div class="header">
<h2 class="title">
<h2 class="title text-align-bottom">
{{t "general.courses"}}
</h2>
<div class="actions"></div>
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/app/components/courses/root.gjs
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ export default class CoursesRootComponent extends Component {
</div>
<section class="courses">
<div class="header">
<h2 data-test-courses-header-title class="title">
<h2 data-test-courses-header-title class="title text-align-bottom">
{{t "general.courses"}}
({{this.filteredCourses.length}})
</h2>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ export default class CurriculumInventoryReportsComponent extends Component {
</div>
<section class="reports">
<div class="header">
<h2 class="title">
<h2 class="title text-align-bottom">
{{t "general.curriculumInventoryReports"}}
</h2>
{{#if (and this.canCreate this.selectedProgram)}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export default class SequenceBlockListComponent extends Component {
...attributes
>
<div class="header" data-test-header>
<div class="title" data-test-title>
<div class="title text-align-bottom" data-test-title>
{{t "general.sequenceBlocks"}}
({{@sequenceBlocks.length}})
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/app/components/ilios-users.gjs
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ export default class IliosUsersComponent extends Component {
</div>
<section class="users">
<div class="header" data-test-header>
<span class="title" data-test-title>
<span class="title text-align-bottom" data-test-title>
{{t "general.users"}}
</span>
<div class="actions">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export default class InstructorGroupHeaderComponent extends Component {
<div class="instructor-group-header" data-test-instructor-group-header ...attributes>
{{! template-lint-disable no-bare-strings }}
<div class="header-bar">
<span class="title">
<span class="title text-align-bottom">
{{#if @canUpdate}}
<EditableField
data-test-title
Expand Down Expand Up @@ -80,7 +80,7 @@ export default class InstructorGroupHeaderComponent extends Component {
</h2>
{{/if}}
</span>
<span class="info" data-test-members>
<span class="info text-align-bottom" data-test-members>
{{t "general.members"}}:
{{@instructorGroup.users.length}}
</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ export default class InstructorGroupsRootComponent extends Component {

<div class="main-list">
<div class="header">
<h2 class="title">
<h2 class="title text-align-bottom">
{{t "general.instructorGroups"}}
{{#if this.isLoaded}}
({{this.filteredInstructorGroups.length}})
Expand Down
4 changes: 2 additions & 2 deletions packages/frontend/app/components/learner-group/header.gjs
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export default class LearnerGroupHeaderComponent extends Component {
<template>
<header class="learner-group-header" data-test-learner-group-header ...attributes>
<div class="header-bar">
<span class="title">
<span class="title text-align-bottom">
{{#if @canUpdate}}
<EditableField
data-test-title
Expand Down Expand Up @@ -113,7 +113,7 @@ export default class LearnerGroupHeaderComponent extends Component {
<h2 data-test-title>{{@learnerGroup.title}}</h2>
{{/if}}
</span>
<span class="info" data-test-members>
<span class="info text-align-bottom" data-test-members>
{{t "general.members"}}:
{{this.usersOnlyAtThisLevel.length}}
/
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/app/components/learner-groups/root.gjs
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ export default class LearnerGroupsRootComponent extends Component {

<div class="main-list">
<div class="header">
<h2 class="title">
<h2 class="title text-align-bottom">
{{t "general.learnerGroups"}}
{{#if this.isLoaded}}
({{this.filteredLearnerGroups.length}})
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/app/components/program-year/list.gjs
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ export default class ProgramYearListComponent extends Component {
<div class="program-year-list main-section" data-test-program-year-list ...attributes>
<section class="program-years" data-test-years>
<div class="header">
<div class="title">
<div class="title text-align-bottom">
{{t "general.programYears"}}
</div>
{{#if @canCreate}}
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/app/components/programs/root.gjs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export default class ProgramRootComponent extends Component {

<div class="main-list">
<div class="header">
<h2 class="title">
<h2 class="title text-align-bottom">
{{t "general.programs"}}
</h2>
<div class="actions">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ export default class ReportsSubjectsListComponent extends Component {
</div>
<section class="reports">
<div class="header">
<h2 data-test-courses-header-title class="title">
<h2 class="title text-align-bottom" data-test-courses-header-title>
{{t "general.reports"}}
({{this.filteredReports.length}})
</h2>
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/app/components/school-list.gjs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export default class SchoolListComponent extends Component {
<section class="school-list main-section" data-test-school-list ...attributes>
<section class="schools">
<div class="header">
<h2 class="title">
<h2 class="title text-align-bottom">
{{t "general.schools"}}
</h2>
{{#if this.currentUser.isRoot}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

.title {
@include m.main-list-box-header-title;
/* stylelint-disable-next-line property-disallowed-list */
line-height: unset;
}
}

Expand Down
2 changes: 2 additions & 0 deletions packages/frontend/app/styles/components/courses/root.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@

.title {
@include m.main-list-box-header-title;
/* stylelint-disable-next-line property-disallowed-list */
line-height: unset;
}

.actions {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@

.title {
@include m.main-list-box-header-title;
/* stylelint-disable-next-line property-disallowed-list */
line-height: unset;
}

.actions {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

.title {
@include m.main-list-box-header-title;
/* stylelint-disable-next-line property-disallowed-list */
line-height: unset;
}

.actions {
Expand Down
2 changes: 2 additions & 0 deletions packages/frontend/app/styles/components/ilios-users.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@

.title {
@include m.main-list-box-header-title;
/* stylelint-disable-next-line property-disallowed-list */
line-height: unset;
}

.actions {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,18 @@
.title {
@include m.ilios-heading-h4;
flex-grow: 2;
/* stylelint-disable-next-line property-disallowed-list */
line-height: unset;

.is-editing,
input {
width: 90%;
}
}

.title,
.info {
@include m.text-align-bottom;
/* stylelint-disable-next-line property-disallowed-list */
line-height: unset;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@

.title {
@include m.main-list-box-header-title;
/* stylelint-disable-next-line property-disallowed-list */
line-height: unset;
}

.actions {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,18 @@
.title {
@include m.ilios-heading-h4;
flex-grow: 2;
/* stylelint-disable-next-line property-disallowed-list */
line-height: unset;

.is-editing,
input {
width: 90%;
}
}

.title,
.info {
@include m.text-align-bottom;
/* stylelint-disable-next-line property-disallowed-list */
line-height: unset;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@

.title {
@include m.main-list-box-header-title;
/* stylelint-disable-next-line property-disallowed-list */
line-height: unset;
}

.actions {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

.title {
@include m.main-list-box-header-title;
/* stylelint-disable-next-line property-disallowed-list */
line-height: unset;
}

.actions {
Expand Down
2 changes: 2 additions & 0 deletions packages/frontend/app/styles/components/programs/root.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@

.title {
@include m.main-list-box-header-title;
/* stylelint-disable-next-line property-disallowed-list */
line-height: unset;
}

.actions {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@

.title {
@include m.main-list-box-header-title;
/* stylelint-disable-next-line property-disallowed-list */
line-height: unset;
}

.actions {
Expand Down
2 changes: 2 additions & 0 deletions packages/frontend/app/styles/components/school-list.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

.title {
@include m.main-list-box-header-title;
/* stylelint-disable-next-line property-disallowed-list */
line-height: unset;
}

.actions {
Expand Down
2 changes: 1 addition & 1 deletion packages/ilios-common/addon/components/print-course.gjs
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export default class PrintCourseComponent extends Component {
<template>
<section class="print-course" ...attributes>
<div class="header" data-test-course-header>
<h2 data-test-course-title>
<h2 class="text-align-bottom" data-test-course-title>
{{@course.title}}
</h2>
<h3 data-test-course-year>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@

h2 {
@include ilios-heading.ilios-heading-h4;
@include font-size.text-align-bottom;
/* stylelint-disable-next-line property-disallowed-list */
line-height: unset;

.fa-lock {
margin-right: 0.5rem;
Expand All @@ -47,7 +48,8 @@

.editinplace {
@include ilios-heading.ilios-heading-h4;
@include font-size.text-align-bottom;
/* stylelint-disable-next-line property-disallowed-list */
line-height: unset;

&.is-editing {
@include media.for-laptop-and-up {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,3 @@
font-size: var(--fs-#{$step});
line-height: calc(4px + 2ex);
}

@mixin text-align-bottom() {
display: flex;
align-items: flex-end;
line-height: unset;
}
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@

@mixin main-list-box-header-title {
@include ilios-heading.ilios-heading-h4;
@include font-size.text-align-bottom;
margin-bottom: 0.5rem;
@include media.for-laptop-and-up {
margin-bottom: 0;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.text-align-bottom {
display: flex;
align-items: flex-end;
}