@asd20/ui 3.2.535 → 3.2.537
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/components/organisms/Asd20ImageHeader/index.vue +3 -2
- package/src/components/organisms/Asd20PageHeader/index.vue +7 -4
- package/src/components/organisms/Asd20PrimaryHeader/index.vue +1 -1
- package/src/components/templates/Asd20DistrictHomeTemplate/index.vue +17 -4
package/package.json
CHANGED
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
<asd20-button
|
|
25
25
|
class="back"
|
|
26
26
|
v-if="!breadcrumbLinks.length"
|
|
27
|
-
|
|
27
|
+
:link="goBack()"
|
|
28
28
|
label="Back"
|
|
29
29
|
icon="chevron"
|
|
30
30
|
:iconAngle="-90"
|
|
@@ -201,7 +201,8 @@ export default {
|
|
|
201
201
|
methods: {
|
|
202
202
|
goBack() {
|
|
203
203
|
if (typeof window === 'undefined') return
|
|
204
|
-
|
|
204
|
+
return document.referrer
|
|
205
|
+
// window.history.back()
|
|
205
206
|
},
|
|
206
207
|
},
|
|
207
208
|
}
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
<asd20-button
|
|
25
25
|
class="back"
|
|
26
26
|
v-if="!breadcrumbLinks.length"
|
|
27
|
-
|
|
27
|
+
:link="goBack()"
|
|
28
28
|
label="Back"
|
|
29
29
|
icon="chevron"
|
|
30
30
|
:iconAngle="-90"
|
|
@@ -203,17 +203,20 @@ export default {
|
|
|
203
203
|
showModifiedDateTime() {
|
|
204
204
|
const publishDateTimeString = new Date(this.publishDateTime)
|
|
205
205
|
const modifiedDateTimeString = new Date(this.modifiedDateTime)
|
|
206
|
-
console.log(publishDateTimeString, modifiedDateTimeString)
|
|
206
|
+
// console.log(publishDateTimeString, modifiedDateTimeString)
|
|
207
207
|
|
|
208
208
|
let publishDateTimePlusOne = new Date(publishDateTimeString.setDate(publishDateTimeString.getDate() + 1))
|
|
209
|
-
console.log(publishDateTimePlusOne, modifiedDateTimeString)
|
|
209
|
+
// console.log(publishDateTimePlusOne, modifiedDateTimeString)
|
|
210
210
|
return modifiedDateTimeString > publishDateTimePlusOne ? true : false
|
|
211
211
|
},
|
|
212
212
|
},
|
|
213
213
|
methods: {
|
|
214
214
|
goBack() {
|
|
215
215
|
if (typeof window === 'undefined') return
|
|
216
|
-
|
|
216
|
+
return document.referrer
|
|
217
|
+
// window.history.back()
|
|
218
|
+
// const url = window.location.href
|
|
219
|
+
// return url.slice(0, url.lastIndexOf('/'))
|
|
217
220
|
},
|
|
218
221
|
},
|
|
219
222
|
}
|
|
@@ -68,7 +68,13 @@
|
|
|
68
68
|
</client-only>
|
|
69
69
|
<slot name="top" />
|
|
70
70
|
<template>
|
|
71
|
-
<div
|
|
71
|
+
<div
|
|
72
|
+
:class="
|
|
73
|
+
activeNotificationsByType.floating.length > 0
|
|
74
|
+
? 'double-notification-wrapper'
|
|
75
|
+
: 'notification-wrapper'
|
|
76
|
+
"
|
|
77
|
+
>
|
|
72
78
|
<client-only>
|
|
73
79
|
<asd20-notification-group
|
|
74
80
|
:notifications="activeNotificationsByType.status"
|
|
@@ -322,10 +328,16 @@ export default {
|
|
|
322
328
|
// }
|
|
323
329
|
// }
|
|
324
330
|
}
|
|
325
|
-
.
|
|
331
|
+
.notification-wrapper {
|
|
326
332
|
display: flex;
|
|
333
|
+
flex-direction: row;
|
|
334
|
+
justify-content: center;
|
|
335
|
+
width: 100%;
|
|
336
|
+
}
|
|
337
|
+
.double-notification-wrapper {
|
|
338
|
+
display: flex;
|
|
339
|
+
flex-direction: row;
|
|
327
340
|
justify-content: space-between;
|
|
328
|
-
align-items: center;
|
|
329
341
|
width: 100%;
|
|
330
342
|
}
|
|
331
343
|
.asd20-header-content {
|
|
@@ -372,7 +384,8 @@ export default {
|
|
|
372
384
|
height: space(3) !important;
|
|
373
385
|
}
|
|
374
386
|
}
|
|
375
|
-
.
|
|
387
|
+
.notification-wrapper,
|
|
388
|
+
.double-notification-wrapper {
|
|
376
389
|
display: flex;
|
|
377
390
|
justify-content: flex-end;
|
|
378
391
|
align-items: center;
|