@asd20/ui 3.2.1030 → 3.2.1031
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 +1 -2
- package/src/components/organisms/Asd20NotificationGroup/index.vue +48 -53
- package/src/components/organisms/Asd20PageHeader/index.vue +1 -2
- package/src/components/templates/Asd20ArticleDigestCompactTemplate/index.vue +2 -1
- package/src/components/templates/Asd20ArticleDigestTemplate/index.vue +2 -1
- package/src/components/templates/Asd20ArticleListTemplate/index.vue +3 -2
- package/src/components/templates/Asd20ArticleTemplate/index.vue +2 -1
- package/src/components/templates/Asd20ClubsTemplate/index.vue +3 -2
- package/src/components/templates/Asd20DetailImageFullTemplate/index.vue +1 -0
- package/src/components/templates/Asd20DetailImageTemplate/index.vue +1 -0
- package/src/components/templates/Asd20DetailTemplate/index.vue +2 -1
- package/src/components/templates/Asd20LoginsTemplate/index.vue +2 -2
- package/src/components/templates/Asd20WayfindingAccessibilityTemplate/index.vue +2 -1
- package/src/components/templates/Asd20WayfindingAlternateTemplate/index.vue +2 -1
- package/src/components/templates/Asd20WayfindingImageTemplate/index.vue +2 -1
- package/src/components/templates/Asd20WayfindingTemplate/index.vue +2 -1
package/package.json
CHANGED
|
@@ -324,7 +324,6 @@ export default {
|
|
|
324
324
|
width: max-content;
|
|
325
325
|
background: rgba(255, 255, 255, 0.9);
|
|
326
326
|
border-radius: 3rem;
|
|
327
|
-
padding: 0 1em 0 0.5em;
|
|
328
327
|
&::v-deep .asd20-select-input {
|
|
329
328
|
color: var(--website-page__foreground-color) !important;
|
|
330
329
|
}
|
|
@@ -369,7 +368,7 @@ export default {
|
|
|
369
368
|
z-index: 1;
|
|
370
369
|
position: relative;
|
|
371
370
|
color: var(--website-header__foreground-color);
|
|
372
|
-
padding: space(1.5) space(
|
|
371
|
+
padding: space(1.5) space(0.5) space(3) space(0.5);
|
|
373
372
|
background: var(--website-header__background-color)
|
|
374
373
|
var(--website-header__background-style);
|
|
375
374
|
// background: var(--website-header__background-color) var(--imageBackground)
|
|
@@ -41,7 +41,9 @@
|
|
|
41
41
|
"
|
|
42
42
|
@click.native="$emit('toggle-all')"
|
|
43
43
|
>
|
|
44
|
-
<span v-if="totalDismissedNotifications > 0" aria-hidden="true">{{
|
|
44
|
+
<span v-if="totalDismissedNotifications > 0" aria-hidden="true">{{
|
|
45
|
+
totalDismissedNotifications
|
|
46
|
+
}}</span>
|
|
45
47
|
</asd20-button>
|
|
46
48
|
|
|
47
49
|
<div
|
|
@@ -100,7 +102,7 @@ export default {
|
|
|
100
102
|
notificationsFromIndex: [],
|
|
101
103
|
enterActiveClass: 'fade-in',
|
|
102
104
|
leaveActiveClass: 'fade-out',
|
|
103
|
-
}
|
|
105
|
+
}
|
|
104
106
|
},
|
|
105
107
|
|
|
106
108
|
computed: {
|
|
@@ -112,29 +114,29 @@ export default {
|
|
|
112
114
|
]
|
|
113
115
|
},
|
|
114
116
|
showControls() {
|
|
115
|
-
return this.notifications.length > 1
|
|
117
|
+
return this.notifications.length > 1
|
|
116
118
|
},
|
|
117
|
-
nextTitle
|
|
119
|
+
nextTitle() {
|
|
118
120
|
return `Go to notification ${
|
|
119
121
|
this.index + 1 > this.notificationsFromIndex.length - 1
|
|
120
122
|
? 1
|
|
121
123
|
: this.index + 2
|
|
122
124
|
} of ${this.notificationsFromIndex.length}`
|
|
123
125
|
},
|
|
124
|
-
prevTitle
|
|
126
|
+
prevTitle() {
|
|
125
127
|
return `Go to notification ${
|
|
126
128
|
this.index - 1 < 0 ? this.notificationsFromIndex.length : this.index
|
|
127
129
|
} of ${this.notificationsFromIndex.length}`
|
|
128
|
-
}
|
|
130
|
+
},
|
|
129
131
|
},
|
|
130
132
|
created() {
|
|
131
|
-
this.initNotifications(this.notifications)
|
|
133
|
+
this.initNotifications(this.notifications)
|
|
132
134
|
},
|
|
133
135
|
|
|
134
136
|
watch: {
|
|
135
|
-
notifications: function(value) {
|
|
136
|
-
this.initNotifications(value)
|
|
137
|
-
}
|
|
137
|
+
notifications: function (value) {
|
|
138
|
+
this.initNotifications(value)
|
|
139
|
+
},
|
|
138
140
|
},
|
|
139
141
|
methods: {
|
|
140
142
|
initNotifications(incomingNotifications) {
|
|
@@ -146,24 +148,28 @@ export default {
|
|
|
146
148
|
const newNotifications = incomingNotifications
|
|
147
149
|
.filter(n => !this.notificationsFromIndex.find(n2 => n2.id === n.id))
|
|
148
150
|
.map(newN => ({
|
|
149
|
-
...newN,
|
|
151
|
+
...newN,
|
|
150
152
|
key: Math.random().toString(36).substr(2, 9),
|
|
151
|
-
ariaHidden: true
|
|
153
|
+
ariaHidden: true,
|
|
152
154
|
}))
|
|
153
155
|
// take care of notifications that match and keep their existing key value to prevent animations from occurring
|
|
154
156
|
for (const [oldIndex, oldNotification] of Object.entries(
|
|
155
157
|
this.notificationsFromIndex
|
|
156
158
|
)) {
|
|
157
|
-
const matchingUpdatedNotification = (incomingNotifications || []).find(
|
|
158
|
-
|
|
159
|
+
const matchingUpdatedNotification = (incomingNotifications || []).find(
|
|
160
|
+
n => n.id === oldNotification.id
|
|
161
|
+
)
|
|
162
|
+
if (matchingUpdatedNotification) {
|
|
159
163
|
this.notificationsFromIndex[oldIndex] = {
|
|
160
164
|
...matchingUpdatedNotification,
|
|
161
|
-
key: this.notificationsFromIndex[oldIndex].key
|
|
165
|
+
key: this.notificationsFromIndex[oldIndex].key,
|
|
162
166
|
}
|
|
163
167
|
}
|
|
164
168
|
}
|
|
165
169
|
// put new notifications at the beginning of the array
|
|
166
|
-
this.notificationsFromIndex = newNotifications.concat(
|
|
170
|
+
this.notificationsFromIndex = newNotifications.concat(
|
|
171
|
+
this.notificationsFromIndex
|
|
172
|
+
)
|
|
167
173
|
// if(this.index > this.notificationsFromIndex.length -1 )
|
|
168
174
|
if (
|
|
169
175
|
newNotifications.length > 0 ||
|
|
@@ -175,13 +181,11 @@ export default {
|
|
|
175
181
|
},
|
|
176
182
|
next() {
|
|
177
183
|
const newIndex =
|
|
178
|
-
this.index < this.notifications.length - 1 ? this.index + 1 : 0
|
|
184
|
+
this.index < this.notifications.length - 1 ? this.index + 1 : 0
|
|
179
185
|
|
|
180
|
-
const topItem = this.notificationsFromIndex[0]
|
|
186
|
+
const topItem = this.notificationsFromIndex[0]
|
|
181
187
|
|
|
182
|
-
topItem.key = Math.random()
|
|
183
|
-
.toString(36)
|
|
184
|
-
.substr(2, 9);
|
|
188
|
+
topItem.key = Math.random().toString(36).substr(2, 9)
|
|
185
189
|
|
|
186
190
|
if (this.groupType === 'banner') {
|
|
187
191
|
this.enterActiveClass = ''
|
|
@@ -192,13 +196,13 @@ export default {
|
|
|
192
196
|
}
|
|
193
197
|
|
|
194
198
|
// Remove top item
|
|
195
|
-
this.notificationsFromIndex.splice(0, 1)
|
|
199
|
+
this.notificationsFromIndex.splice(0, 1)
|
|
196
200
|
|
|
197
201
|
// Add top item to bottom
|
|
198
|
-
this.notificationsFromIndex.push(topItem)
|
|
202
|
+
this.notificationsFromIndex.push(topItem)
|
|
199
203
|
|
|
200
204
|
// Update the index
|
|
201
|
-
this.index = newIndex
|
|
205
|
+
this.index = newIndex
|
|
202
206
|
},
|
|
203
207
|
previous() {
|
|
204
208
|
if (this.groupType === 'banner') {
|
|
@@ -211,31 +215,29 @@ export default {
|
|
|
211
215
|
|
|
212
216
|
const notifications = this.notifications.map(n => ({
|
|
213
217
|
...n,
|
|
214
|
-
key: this.notificationsFromIndex.find(n2 => n2.title === n.title).key
|
|
215
|
-
}))
|
|
218
|
+
key: this.notificationsFromIndex.find(n2 => n2.title === n.title).key,
|
|
219
|
+
}))
|
|
216
220
|
const replacementIndex =
|
|
217
|
-
this.index > 0 ? this.index - 1 : this.notifications.length - 1
|
|
221
|
+
this.index > 0 ? this.index - 1 : this.notifications.length - 1
|
|
218
222
|
|
|
219
223
|
const newItem = {
|
|
220
224
|
...notifications[replacementIndex],
|
|
221
|
-
key: Math.random()
|
|
222
|
-
.toString(36)
|
|
223
|
-
.substr(2, 9)
|
|
225
|
+
key: Math.random().toString(36).substr(2, 9),
|
|
224
226
|
}
|
|
225
227
|
|
|
226
228
|
// Remove old item
|
|
227
|
-
notifications.splice(replacementIndex, 1)
|
|
229
|
+
notifications.splice(replacementIndex, 1)
|
|
228
230
|
|
|
229
231
|
// Add top item to top
|
|
230
|
-
notifications.unshift(newItem)
|
|
232
|
+
notifications.unshift(newItem)
|
|
231
233
|
|
|
232
|
-
this.notificationsFromIndex = notifications
|
|
234
|
+
this.notificationsFromIndex = notifications
|
|
233
235
|
|
|
234
236
|
// Update the index
|
|
235
|
-
this.index = replacementIndex
|
|
236
|
-
}
|
|
237
|
-
}
|
|
238
|
-
}
|
|
237
|
+
this.index = replacementIndex
|
|
238
|
+
},
|
|
239
|
+
},
|
|
240
|
+
}
|
|
239
241
|
</script>
|
|
240
242
|
|
|
241
243
|
<style lang="scss">
|
|
@@ -287,8 +289,8 @@ export default {
|
|
|
287
289
|
}
|
|
288
290
|
|
|
289
291
|
svg {
|
|
290
|
-
width:
|
|
291
|
-
height:
|
|
292
|
+
width: 32px;
|
|
293
|
+
height: 32px;
|
|
292
294
|
color: var(--website-icon__line-color) !important;
|
|
293
295
|
fill: var(--website-menu__icon-fill-color) !important;
|
|
294
296
|
}
|
|
@@ -381,7 +383,8 @@ export default {
|
|
|
381
383
|
border-radius: var(--website-shape__radius-m);
|
|
382
384
|
&:first-child {
|
|
383
385
|
z-index: 9;
|
|
384
|
-
.asd20-notification__content,
|
|
386
|
+
.asd20-notification__content,
|
|
387
|
+
g {
|
|
385
388
|
transition: all 0.5s;
|
|
386
389
|
opacity: 1;
|
|
387
390
|
align-self: initial !important;
|
|
@@ -398,7 +401,8 @@ export default {
|
|
|
398
401
|
overflow-y: hidden;
|
|
399
402
|
transform: translateY(#{0.75 * ($i - 1)}rem)
|
|
400
403
|
scale(#{1 - (($i - 1) * 0.05)});
|
|
401
|
-
.asd20-notification__content,
|
|
404
|
+
.asd20-notification__content,
|
|
405
|
+
g {
|
|
402
406
|
transition: all 0.5s;
|
|
403
407
|
opacity: 0.5;
|
|
404
408
|
}
|
|
@@ -441,7 +445,7 @@ export default {
|
|
|
441
445
|
left: 0.5rem;
|
|
442
446
|
}
|
|
443
447
|
|
|
444
|
-
|
|
448
|
+
&--top-left {
|
|
445
449
|
position: fixed;
|
|
446
450
|
top: 0.5rem;
|
|
447
451
|
left: 0.5rem;
|
|
@@ -458,15 +462,6 @@ export default {
|
|
|
458
462
|
fill: #ffffff;
|
|
459
463
|
}
|
|
460
464
|
}
|
|
461
|
-
&--banner .notifications {
|
|
462
|
-
// flex-direction: column;
|
|
463
|
-
// position: absolute;
|
|
464
|
-
// top: calc(100% + 0.5rem);
|
|
465
|
-
// right: 0;
|
|
466
|
-
// left: auto;
|
|
467
|
-
// width: 100%;
|
|
468
|
-
// display: flex;
|
|
469
|
-
}
|
|
470
465
|
&--banner .notification {
|
|
471
466
|
transition: all 0.25s;
|
|
472
467
|
top: 0;
|
|
@@ -631,11 +626,11 @@ export default {
|
|
|
631
626
|
|
|
632
627
|
@keyframes swoop-in {
|
|
633
628
|
0% {
|
|
634
|
-
transform: scale(0
|
|
629
|
+
transform: scale(0);
|
|
635
630
|
opacity: 0;
|
|
636
631
|
}
|
|
637
632
|
100% {
|
|
638
|
-
transform: scale(1
|
|
633
|
+
transform: scale(1);
|
|
639
634
|
opacity: 1;
|
|
640
635
|
}
|
|
641
636
|
}
|
|
@@ -354,7 +354,6 @@ export default {
|
|
|
354
354
|
width: max-content;
|
|
355
355
|
background: rgba(255, 255, 255, 0.9);
|
|
356
356
|
border-radius: 3rem;
|
|
357
|
-
padding: 0 1em 0 0.5em;
|
|
358
357
|
&::v-deep .asd20-select-input {
|
|
359
358
|
color: var(--website-page__foreground-color) !important;
|
|
360
359
|
}
|
|
@@ -404,7 +403,7 @@ export default {
|
|
|
404
403
|
background: var(--website-header__background-color)
|
|
405
404
|
var(--website-header__background-style);
|
|
406
405
|
color: var(--website-header__foreground-color);
|
|
407
|
-
padding: space(1) space(
|
|
406
|
+
padding: space(1) space(0.5);
|
|
408
407
|
z-index: 1;
|
|
409
408
|
&::v-deep .asd20-breadcrumb {
|
|
410
409
|
margin: space(1) 0;
|
|
@@ -410,7 +410,8 @@ export default {
|
|
|
410
410
|
margin-top: space(2.25);
|
|
411
411
|
.asd20-notification-group--floating {
|
|
412
412
|
position: absolute;
|
|
413
|
-
top: space(2
|
|
413
|
+
top: space(2);
|
|
414
|
+
right: space(0.75);
|
|
414
415
|
}
|
|
415
416
|
.notification-group--inline {
|
|
416
417
|
margin: space(2) space(1) space(1) space(1);
|
|
@@ -423,7 +423,8 @@ export default {
|
|
|
423
423
|
margin-top: space(2.25);
|
|
424
424
|
.asd20-notification-group--floating {
|
|
425
425
|
position: absolute;
|
|
426
|
-
top: space(2
|
|
426
|
+
top: space(2);
|
|
427
|
+
right: space(0.75);
|
|
427
428
|
}
|
|
428
429
|
.notification-group--inline {
|
|
429
430
|
margin: space(2) space(1) space(1) space(1);
|
|
@@ -331,7 +331,7 @@ export default {
|
|
|
331
331
|
keywords: { type: String, default: '' },
|
|
332
332
|
selectedCategories: { type: Array, default: () => [] },
|
|
333
333
|
},
|
|
334
|
-
data: function() {
|
|
334
|
+
data: function () {
|
|
335
335
|
return {
|
|
336
336
|
numberToShow: 25,
|
|
337
337
|
counter: 1,
|
|
@@ -466,7 +466,8 @@ export default {
|
|
|
466
466
|
margin-top: space(2.25);
|
|
467
467
|
.asd20-notification-group--floating {
|
|
468
468
|
position: absolute;
|
|
469
|
-
top: space(2
|
|
469
|
+
top: space(2);
|
|
470
|
+
right: space(0.75);
|
|
470
471
|
}
|
|
471
472
|
.feed-title {
|
|
472
473
|
margin: space(1) 0 0 0;
|
|
@@ -314,7 +314,7 @@ export default {
|
|
|
314
314
|
selectedCategories: { type: Array, default: () => [] },
|
|
315
315
|
// categoryOptions: { type: Array, default: () => [] },
|
|
316
316
|
},
|
|
317
|
-
data: function() {
|
|
317
|
+
data: function () {
|
|
318
318
|
return {
|
|
319
319
|
numberToShow: 100,
|
|
320
320
|
counter: 1,
|
|
@@ -408,7 +408,8 @@ export default {
|
|
|
408
408
|
margin-top: space(2.25);
|
|
409
409
|
.asd20-notification-group--floating {
|
|
410
410
|
position: absolute;
|
|
411
|
-
top: space(2
|
|
411
|
+
top: space(2);
|
|
412
|
+
right: space(0.75);
|
|
412
413
|
}
|
|
413
414
|
.asd20-page-content {
|
|
414
415
|
display: block;
|
|
@@ -243,7 +243,8 @@ export default {
|
|
|
243
243
|
margin-top: space(2.25);
|
|
244
244
|
.asd20-notification-group--floating {
|
|
245
245
|
position: absolute;
|
|
246
|
-
top: space(2
|
|
246
|
+
top: space(2);
|
|
247
|
+
right: space(0.75);
|
|
247
248
|
}
|
|
248
249
|
.asd20-notification-group--inline {
|
|
249
250
|
margin-top: space(2) !important;
|
|
@@ -221,7 +221,8 @@ export default {
|
|
|
221
221
|
margin-top: space(2.25);
|
|
222
222
|
.asd20-notification-group--floating {
|
|
223
223
|
position: absolute;
|
|
224
|
-
top: space(2
|
|
224
|
+
top: space(2);
|
|
225
|
+
right: space(0.75);
|
|
225
226
|
}
|
|
226
227
|
.asd20-notification-group--inline {
|
|
227
228
|
margin-top: space(2) !important;
|
|
@@ -222,7 +222,8 @@ export default {
|
|
|
222
222
|
margin-top: space(2.25);
|
|
223
223
|
.asd20-notification-group--floating {
|
|
224
224
|
position: absolute;
|
|
225
|
-
top: space(2
|
|
225
|
+
top: space(2);
|
|
226
|
+
right: space(0.75);
|
|
226
227
|
}
|
|
227
228
|
.asd20-notification-group--inline {
|
|
228
229
|
margin-top: space(2) !important;
|
|
@@ -217,7 +217,8 @@ export default {
|
|
|
217
217
|
margin-top: space(2.25);
|
|
218
218
|
.asd20-notification-group--floating {
|
|
219
219
|
position: absolute;
|
|
220
|
-
top: space(2
|
|
220
|
+
top: space(2);
|
|
221
|
+
right: space(0.75);
|
|
221
222
|
}
|
|
222
223
|
.asd20-notification-group--inline {
|
|
223
224
|
margin-top: space(2) !important;
|