@asd20/ui 3.2.428 → 3.2.429

package/package.json

@@ -5,7 +5,7 @@
     "*.scss",
     "*.vue"
   ],
-  "version": "3.2.428",
+  "version": "3.2.429",
   "private": false,
   "license": "MIT",
   "repository": {

package/src/components/templates/Asd20WayfindingImageTemplate/index.vue

@@ -52,13 +52,6 @@
       </template>
       <!-- <asd20-breadcrumb slot="top" :links="breadcrumbLinks"></asd20-breadcrumb> -->
     </asd20-image-header>
-
-    <asd20-feeds-section
-      :announcements="announcements"
-      :announcements-feed-props="announcementsFeedProps"
-      @announcements-in-view="$emit('announcements-in-view')"
-    ></asd20-feeds-section>
-
     <!-- Page Content -->
     <asd20-page-content
       :primary-messages="wayFindingPrimaryMessages"
@@ -77,19 +70,23 @@
           ></asd20-notification-group>
         </client-only>
       </template>
+      <template slot="before">
+        <asd20-feeds-section
+          :announcements="announcements"
+          :announcements-feed-props="announcementsFeedProps"
+          @announcements-in-view="$emit('announcements-in-view')"
+          :stories="stories"
+          :stories-feed-props="storiesFeedProps"
+          @stories-in-view="$emit('stories-in-view')"
+          :events="events"
+          :events-feed-props="eventsFeedProps"
+          @events-in-view="$emit('events-in-view')"
+        ></asd20-feeds-section>
+      </template>
 
       <slot></slot>
     </asd20-page-content>
 
-    <asd20-feeds-section
-      :stories="stories"
-      :stories-feed-props="storiesFeedProps"
-      @stories-in-view="$emit('stories-in-view')"
-      :events="events"
-      :events-feed-props="eventsFeedProps"
-      @events-in-view="$emit('events-in-view')"
-    ></asd20-feeds-section>
-
     <!-- Bottom Widgets -->
     <asd20-widgets-section
       v-if="
@@ -211,10 +208,35 @@ export default {
       }
     }
   }
+  .asd20-page-content {
+    .notification-group--inline {
+      margin-bottom: space(1);
+    }
+    .asd20-feeds-section {
+      margin-top: space(1);
+      .asd20-swiper-feed:first-child {
+        padding-top: space(2);
+        padding-bottom: space(1);
+        &::after {
+          top: space(1);
+        }
+      }
+      .asd20-swiper-feed:last-child {
+        // margin-top: space(-1);
+        padding-bottom: space(2);
+        &::after {
+          bottom: space(1);
+        }
+      }
+    }
+  }
 }
 
 @media (min-width: 1024px) {
   .asd20-template-wayfinding-image {
+    @include template-desktop;
+    margin-left: space(3);
+    margin-top: space(0);
     .asd20-notification-group--floating {
       position: absolute;
       top: space(1);
@@ -226,11 +248,15 @@ export default {
       //   }
       // }
     }
-    @include template-desktop;
-    margin-left: space(3);
-    margin-top: 0;
     .asd20-page-content {
-      margin-top: space(0);
+      .notification-group--inline {
+        flex-basis: 100%;
+        margin: space(2) space(3) space(0) space(3);
+
+        .notification:last-child {
+          margin-bottom: space(1);
+        }
+      }
     }
   }
 }

package/src/data/page-queries/landing-page-query-result.json

@@ -2292,7 +2292,7 @@
       "id": "f42b1984-29f1-419b-a23a-3245c6647b3e",
       "title": "Announcement Feed",
       "type": "text",
-      "value": null,
+      "value": "[{\"title\":\"District Announcements\",\"link\":\"/district-announcements\",\"keywords\":\"\",\"categories\":[],\"tags\":[\"District Homepage\"],\"organizations\":[\"26eaf390-d8ab-11e9-a3a8-5de5bba4f125\"]}]",
       "validationPattern": null,
       "required": false
     },