@asd20/ui 3.2.537 → 3.2.539

package/package.json

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

package/src/components/atoms/Asd20Button/index.vue

@@ -6,11 +6,7 @@
     :aria-label="hideLabel ? label : undefined"
     :title="hideLabel ? label : undefined"
     :target="
-      !link ||
-      link.startsWith('/') ||
-      link.startsWith('https://directory') ||
-      link.startsWith('https://calendar') ||
-      link.startsWith('https://school')
+      !link || link.startsWith('/') || link.includes('asd20.org')
         ? undefined
         : '_blank'
     "

package/src/components/organisms/Asd20PageHeader/index.vue

@@ -24,7 +24,7 @@
           <asd20-button
             class="back"
             v-if="!breadcrumbLinks.length"
-            :link="goBack()"
+            :link="returnURL"
             label="Back"
             icon="chevron"
             :iconAngle="-90"
@@ -175,6 +175,9 @@ export default {
     categories: { type: Array, default: () => [] },
     languageCode: { type: String, default: '' },
   },
+  data: () => ({
+    returnURL: '',
+  }),
   computed: {
     mq() {
       return this.$mq || 'sm'
@@ -210,10 +213,13 @@ export default {
       return modifiedDateTimeString > publishDateTimePlusOne ? true : false
     },
   },
+  mounted() {
+    this.goBack()
+  },
   methods: {
     goBack() {
       if (typeof window === 'undefined') return
-      return document.referrer
+      this.returnURL = document.referrer
       // window.history.back()
       // const url = window.location.href
       // return url.slice(0, url.lastIndexOf('/'))
@@ -234,11 +240,15 @@ export default {
   box-sizing: border-box;
   margin-bottom: space(1.5);
   .back {
-    padding: space(0.5) 0;
+    padding: 0;
+    margin-top: space(1);
     font-family: var(--website-typography__font-family-body);
     line-height: 1.2;
     font-size: 14px !important;
     font-weight: normal;
+    &::v-deep span {
+      padding-right: space(0.5);
+    }
   }
 
   &::after {
@@ -460,6 +470,7 @@ export default {
   .asd20-page-header {
     .back {
       padding: 0;
+      margin: 0;
     }
     &::after {
       top: space(6);