Merge pull request #476 from art-institute-of-chicago/fix/digipub-cle…

…anup Pubs FE cleanup for deploy FINAL v3
art-institute-of-chicago · Aug 15, 2024 · 4d188a3 · 4d188a3
2 parents 5e29337 + 6db5094
commit 4d188a3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/frontend/scss/molecules/_m-listing.scss b/frontend/scss/molecules/_m-listing.scss
@@ -2206,7 +2206,7 @@ a:focus:hover .btn--magazine {
   }
 
   .m-listing----cover-title {
-    position: relative;
+    position: absolute;
     display: flex;
     justify-content: center;
     align-items: center;

diff --git a/frontend/scss/organisms/_o-accordion.scss b/frontend/scss/organisms/_o-accordion.scss
@@ -403,10 +403,16 @@ h3 {
     padding-bottom: 20px;
     border-bottom: 1px solid $color__rules--primary;
 
-    .m-link-list__item:first-child::after {
+    &.m-link-list__item:first-of-type::after {
       content: none;
     }
 
+    .m-link-list__trigger {
+      &::before {
+        padding-top: 25px !important;
+      }
+    }
+
     &.o-blocks>:last-child {
       margin-bottom: 0;
     }
@@ -416,7 +422,7 @@ h3 {
     }
 
     a.m-link-list__trigger.f-secondary {
-      color: $color__black--90;
+      color: $color__black--54;
 
       &:hover,
       &:focus:hover,
@@ -426,7 +432,7 @@ h3 {
     }
 
     &.m-link-list__item::after {
-      margin-top: 7px !important;
+      margin-top: 15px !important;
     }
 
     .m-link-list__item.s-active {

diff --git a/resources/views/components/organisms/_o-table-of-contents.blade.php b/resources/views/components/organisms/_o-table-of-contents.blade.php
@@ -5,17 +5,14 @@
                 <button id="toc-{{ StringHelpers::getUtf8Slug($item->title) }}" class="o-accordion__trigger {{ $titleFont ?? 'f-list-3' }}" tabindex="0"{!! (isset($item->gtmAttributes)) ? ' '.$item->gtmAttributes.'' : '' !!} aria-expanded="true">
                     {!! $item->title !!}
                     <span class="o-accordion__trigger-icon">
-                        <svg class="icon--plus
-                        "><use xlink:href="#icon--plus" /></svg>
+                        <svg class="icon--plus"><use xlink:href="#icon--plus" /></svg>
                         <svg class="icon--minus"><use xlink:href="#icon--minus" /></svg>
                     </span>
                 </button>
             </h3>
-            @foreach ($item->children as $child)
-                <div id="panel_{{ StringHelpers::getUtf8Slug($item->title) }}" class="o-accordion__panel" aria-labelledby="{{ StringHelpers::getUtf8Slug($item->title) }}" aria-hidden="false">
-                    @include('components.organisms._o-table-of-contents', ['items' => $item->children->sortBy('position')])
-                </div>
-            @endforeach
+            <div id="panel_{{ StringHelpers::getUtf8Slug($item->title) }}" class="o-accordion__panel" aria-labelledby="{{ StringHelpers::getUtf8Slug($item->title) }}" aria-hidden="false">
+                @include('components.organisms._o-table-of-contents', ['items' => $item->children->sortBy('position')])
+            </div>
         @else
             <span class="m-link-list__item o-accordion__panel-content">
                 <a class="m-link-list__trigger f-secondary" href="{{ $item->url }}"{!! (isset($item->gtmAttributes)) ? ' '.$item->gtmAttributes.'' : '' !!}>