Skip to content

Commit

Permalink
Merge pull request #8061 from michaelchadwick/frontend-5633-lg-member…
Browse files Browse the repository at this point in the history
…_subs-style-remove-padding

reduce padding on LG members/subgroups when none have been added
  • Loading branch information
dartajax authored Aug 23, 2024
2 parents 0db0f94 + 9c77536 commit ff25fbc
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 6 deletions.
2 changes: 1 addition & 1 deletion packages/frontend/app/components/learner-group/members.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{#let (unique-id) as |templateId|}}
<div
class="learner-group-members"
class="learner-group-members{{if (eq this.usersInGroup.length 0) " empty"}}"
data-test-learner-group-members
>
{{#if this.usersInGroup.length}}
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/app/components/learner-group/root.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@
</div>
{{/if}}
</div>
<div class="list">
<div class="list{{if (eq @learnerGroup.childrenCount 0) " empty"}}">
{{#if @learnerGroup.childrenCount}}
<LearnerGroup::List
@learnerGroups={{this.learnerGroups}}
Expand Down
6 changes: 4 additions & 2 deletions packages/frontend/app/styles/components/courses/list.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
@use "../../mixins" as m;

.courses-list {
@include m.main-list-box-table;

i {
margin-left: 0.5rem;
}

.list {
@include m.main-list-box-table;
}
}
6 changes: 4 additions & 2 deletions packages/frontend/app/styles/components/programs/list.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
@use "../../mixins" as m;

.list {
@include m.main-list-box-table;
.programs-root {
.list {
@include m.main-list-box-table;
}
}
4 changes: 4 additions & 0 deletions packages/frontend/app/styles/mixins/main-list.scss
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@
display: block;
padding: 1rem;

&.empty {
padding: 0;
}

table {
@include cm.ilios-table-structure;
@include cm.ilios-table-colors;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
margin: 0;
min-height: 2rem;
padding: 1rem 0;

&.empty {
min-height: auto;
padding-bottom: 0;
}
}

@mixin detail-container-title-style() {
Expand Down

0 comments on commit ff25fbc

Please sign in to comment.