Merge pull request #8012 from jrjohnson/5616-lg-calendar

Relocate the Learner Group Calendar
ilios · Jul 30, 2024 · ec5bcc1 · ec5bcc1
2 parents 59c835a + 89a639d
commit ec5bcc1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/frontend/app/components/learner-group/root.hbs b/packages/frontend/app/components/learner-group/root.hbs
@@ -193,6 +193,9 @@
             />
           </div>
         {{else}}
+          {{#if this.showLearnerGroupCalendar}}
+            <LearnerGroup::Calendar @learnerGroup={{@learnerGroup}} />
+          {{/if}}
           <div class="learner-group-overview-content">
             <LearnerGroup::Members
               @learnerGroupId={{this.learnerGroupId}}
@@ -202,9 +205,6 @@
             />
           </div>
         {{/if}}
-        {{#if this.showLearnerGroupCalendar}}
-          <LearnerGroup::Calendar @learnerGroup={{@learnerGroup}} />
-        {{/if}}
         <section class="subgroups" data-test-subgroups>
           <div class="header">
             <h3 class="title">

diff --git a/packages/frontend/app/styles/components/learner-group/calendar.scss b/packages/frontend/app/styles/components/learner-group/calendar.scss
@@ -6,7 +6,7 @@
   border-radius: 5px;
   box-sizing: border-box;
   clear: both;
-  margin-bottom: 1rem;
+  margin: 1rem 0;
   min-height: 5rem;
   padding: 0.25rem 2rem 0.75rem;
   position: relative;