Skip to content

Course->Session space normalization fixes #8780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dartajax merged 9 commits into from
Aug 29, 2025
Merged

Course->Session space normalization fixes #8780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b6836f3
learning materials spacing same on top and bottom, regardless of no l…
michaelchadwick Aug 25, 2025
82f4c84
fixed class spacing
michaelchadwick Aug 25, 2025
a06eb59
normalized space for empty session terms
michaelchadwick Aug 25, 2025
f0fcb4b
turn off unnecessary blue border at very bottom of session detail
michaelchadwick Aug 25, 2025
5863eee
normalized spacing for empty objectives
michaelchadwick Aug 25, 2025
fa885a3
lose some space around 'no offerings' message
michaelchadwick Aug 25, 2025
8cc7164
make session objectives collapsed table used 'condensed' styling like…
michaelchadwick Aug 25, 2025
8ea4484
removed top margin for session description and notes
michaelchadwick Aug 25, 2025
2b3c7ff
re-added border to bottom of session for future refactoring help
michaelchadwick Aug 28, 2025
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
2 changes: 1 addition & 1 deletion packages/ilios-common/addon/components/detail-learning-materials.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ export default class DetailCohortsComponent extends Component {
}
<template>
<section
class="detail-learningmaterials {{if this.displaySearchBox 'display-search-box'}}"
class="detail-learningmaterials{{if this.displaySearchBox ' display-search-box'}}"
data-test-detail-learning-materials
>
<div class="detail-learningmaterials-header">
Expand Down
12 changes: 7 additions & 5 deletions packages/ilios-common/addon/components/detail-mesh.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,17 @@ export default class DetailMeshComponent extends Component {
{{/if}}
</div>
</div>
<div class="content">
{{#if this.isManaging}}
{{#if this.isManaging}}
<div class="content">
<MeshManager
@editable={{@editable}}
@terms={{this.bufferedDescriptors}}
@add={{this.addDescriptorToBuffer}}
@remove={{this.removeDescriptorFromBuffer}}
/>
{{else}}
</div>
{{else}}
<div class="content{{unless this.meshDescriptors.length ' empty'}}">
{{#if this.meshDescriptors.length}}
<ul class="selected-mesh-terms">

Expand All @@ -125,8 +127,8 @@ export default class DetailMeshComponent extends Component {
{{/each}}
</ul>
{{/if}}
{{/if}}
</div>
</div>
{{/if}}
{{/if}}
</section>
</template>
Expand Down
12 changes: 7 additions & 5 deletions packages/ilios-common/addon/components/detail-taxonomies.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,22 +124,24 @@ export default class DetailTaxonomiesComponent extends Component {
{{/if}}
</div>
</div>
<div class="content">
{{#if this.isManaging}}
{{#if this.isManaging}}
<div class="content">
<TaxonomyManager
@vocabularies={{@subject.assignableVocabularies}}
@selectedTerms={{this.bufferedTerms}}
@add={{this.addTermToBuffer}}
@remove={{this.removeTermFromBuffer}}
/>
{{else}}
</div>
{{else}}
<div class="content{{unless this.terms.length ' empty'}}">
{{#each @subject.associatedVocabularies as |vocab|}}
{{#if vocab.termCount}}
<DetailTermsList @vocabulary={{vocab}} @terms={{this.terms}} @canEdit={{false}} />
{{/if}}
{{/each}}
{{/if}}
</div>
</div>
{{/if}}
</section>
</template>
}
2 changes: 1 addition & 1 deletion packages/ilios-common/addon/components/session/collapsed-objectives.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export default class SessionCollapsedObjectivesComponent extends Component {
</div>
{{#if this.objectivesData.isResolved}}
<div class="content">
<table>
<table class="condensed">
<thead>
<tr>
<th class="text-left">
Expand Down
2 changes: 1 addition & 1 deletion packages/ilios-common/addon/components/session/objectives.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export default class SessionObjectivesComponent extends Component {
}
<template>
<section class="session-objectives" data-test-session-objectives>
<div class="header">
<div class="header{{unless this.objectiveCount ' empty'}}">
{{#if this.showCollapsible}}
<div>
<button
Expand Down
4 changes: 3 additions & 1 deletion packages/ilios-common/app/styles/ilios-common/components/detail-learningmaterials.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,11 @@

.detail-learningmaterials-content {
@include m.detail-container-content;
padding: 0.5rem;
padding: 0 0.5em;

table {
margin-bottom: 0;

td {
ul {
@include m.ilios-list-reset;
Expand Down
9 changes: 9 additions & 0 deletions packages/ilios-common/app/styles/ilios-common/components/detail-mesh.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,17 @@
.content {
@include m.detail-container-content;

&.empty {
padding: 0 0.5em;
}

.mesh-manager {
padding: 0 0.5em;
}

.selected-mesh-terms {
@include m.ilios-tag-list;
padding: 0 0.5em;

.term-title {
font-weight: bold;
Expand Down
8 changes: 8 additions & 0 deletions packages/ilios-common/app/styles/ilios-common/components/detail-taxonomies.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,13 @@

.content {
@include m.detail-container-content;

&.empty {
padding: 0 0.5em;
}

.detail-terms-list {
margin-bottom: 0;
}
}
}
4 changes: 4 additions & 0 deletions packages/ilios-common/app/styles/ilios-common/components/session-offerings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@

.session-offerings-content {
@include m.detail-container-content;

p {
margin: 0;
}
}

.session-offerings-header {
Expand Down
1 change: 0 additions & 1 deletion packages/ilios-common/app/styles/ilios-common/components/session-overview.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@
.instructional-notes {
@include m.ilios-browser-defaults;
grid-column: 1 / -1;
margin-top: 1em;

.fade-text-control {
background-image: linear-gradient(
Expand Down
4 changes: 4 additions & 0 deletions packages/ilios-common/app/styles/ilios-common/mixins/objectives.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
justify-content: space-between;
margin-bottom: 0.5em;

&.empty {
margin-bottom: 0;
}

span {
display: flex;
align-items: center;
Expand Down