@telus-uds/theme-allium 3.4.2 → 3.5.0
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/build/schema.json +1043 -674
- package/build/theme.js +141 -5
- package/package.json +5 -5
- package/theme.json +179 -3
- package/CHANGELOG.json +0 -247
- package/CHANGELOG.md +0 -2181
package/build/theme.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/*
|
|
2
2
|
*
|
|
3
3
|
* Do not edit directly
|
|
4
|
-
* Generated on
|
|
4
|
+
* Generated on Fri, 12 Aug 2022 20:14:39 GMT
|
|
5
5
|
*
|
|
6
6
|
*/
|
|
7
7
|
|
|
@@ -487,7 +487,7 @@ module.exports = {
|
|
|
487
487
|
rules: [
|
|
488
488
|
{
|
|
489
489
|
if: { viewport: [ 'xs', 'sm' ] },
|
|
490
|
-
tokens: { showPreviousNextNavigation: false }
|
|
490
|
+
tokens: { showPreviousNextNavigation: false, thumbnailSize: 48 }
|
|
491
491
|
}
|
|
492
492
|
],
|
|
493
493
|
tokens: {
|
|
@@ -496,7 +496,112 @@ module.exports = {
|
|
|
496
496
|
showPanelNavigation: true,
|
|
497
497
|
showPreviousNextNavigation: true,
|
|
498
498
|
spaceBetweenSlideAndPanelNavigation: 32,
|
|
499
|
-
spaceBetweenSlideAndPreviousNextNavigation: 24
|
|
499
|
+
spaceBetweenSlideAndPreviousNextNavigation: 24,
|
|
500
|
+
thumbnailBorderColor: '#e3e6e8',
|
|
501
|
+
thumbnailBorderRadius: 4,
|
|
502
|
+
thumbnailBorderWidth: 1,
|
|
503
|
+
thumbnailContainerPaddingTop: 24,
|
|
504
|
+
thumbnailMargin: 4,
|
|
505
|
+
thumbnailPadding: 8,
|
|
506
|
+
thumbnailSelectedBorderColor: '#676e73',
|
|
507
|
+
thumbnailSelectedBorderWidth: 2,
|
|
508
|
+
thumbnailSize: 56
|
|
509
|
+
}
|
|
510
|
+
},
|
|
511
|
+
CarouselTabsPanelItem: {
|
|
512
|
+
appearances: {
|
|
513
|
+
focus: {
|
|
514
|
+
description: "Currently only web has good support for this. Applies when an interactive component's focus handler is triggered, such as keyboard tabbing or selection.",
|
|
515
|
+
type: 'state',
|
|
516
|
+
values: [ true ]
|
|
517
|
+
},
|
|
518
|
+
hover: {
|
|
519
|
+
description: "Currently web only. Applies when an interactive component's hover handler is triggered, such as on mouseover.",
|
|
520
|
+
type: 'state',
|
|
521
|
+
values: [ true ]
|
|
522
|
+
},
|
|
523
|
+
inactive: {
|
|
524
|
+
description: 'Prevents an interactive component from being interacted with and applies accessibility attributes to indicate to the user that this component cannot be used.',
|
|
525
|
+
type: 'state',
|
|
526
|
+
values: [ true ]
|
|
527
|
+
},
|
|
528
|
+
pressed: {
|
|
529
|
+
description: 'Applies while an interactive component is being physically pressed. Most visible on touchscreen taps; in React Native Web, this is visible on web mouse clicks only if the pressable is held down.',
|
|
530
|
+
type: 'state',
|
|
531
|
+
values: [ true ]
|
|
532
|
+
},
|
|
533
|
+
selected: {
|
|
534
|
+
description: 'Applies while an interactive component is the currently selected one in a set of states or components, for example a button in a `ButtonGroup`.',
|
|
535
|
+
type: 'state',
|
|
536
|
+
values: [ true ]
|
|
537
|
+
}
|
|
538
|
+
},
|
|
539
|
+
rules: [
|
|
540
|
+
{
|
|
541
|
+
if: { hover: true },
|
|
542
|
+
tokens: {
|
|
543
|
+
borderBottomColor: '#2b8000',
|
|
544
|
+
borderBottomWidth: 2,
|
|
545
|
+
color: '#2b8000'
|
|
546
|
+
}
|
|
547
|
+
},
|
|
548
|
+
{
|
|
549
|
+
if: { focus: true },
|
|
550
|
+
tokens: {
|
|
551
|
+
borderBottomColor: '#2b8000',
|
|
552
|
+
borderBottomWidth: 4,
|
|
553
|
+
color: '#2b8000'
|
|
554
|
+
}
|
|
555
|
+
},
|
|
556
|
+
{
|
|
557
|
+
if: { pressed: true },
|
|
558
|
+
tokens: {
|
|
559
|
+
borderBottomColor: '#1f5c09',
|
|
560
|
+
borderBottomWidth: 2,
|
|
561
|
+
color: '#1f5c09'
|
|
562
|
+
}
|
|
563
|
+
},
|
|
564
|
+
{
|
|
565
|
+
if: { focus: true, pressed: true },
|
|
566
|
+
tokens: { borderBottomWidth: 4 }
|
|
567
|
+
},
|
|
568
|
+
{
|
|
569
|
+
if: { inactive: true },
|
|
570
|
+
tokens: {
|
|
571
|
+
borderBottomColor: '#676e73',
|
|
572
|
+
borderBottomWidth: 4,
|
|
573
|
+
color: '#676e73'
|
|
574
|
+
}
|
|
575
|
+
},
|
|
576
|
+
{
|
|
577
|
+
if: { selected: true },
|
|
578
|
+
tokens: {
|
|
579
|
+
borderBottomColor: '#676e73',
|
|
580
|
+
borderBottomWidth: 2,
|
|
581
|
+
color: '#676e73',
|
|
582
|
+
fontName: 'HelveticaNow',
|
|
583
|
+
fontWeight: '400'
|
|
584
|
+
}
|
|
585
|
+
}
|
|
586
|
+
],
|
|
587
|
+
tokens: {
|
|
588
|
+
alignItems: 'flex-start',
|
|
589
|
+
borderBottomColor: 'transparent',
|
|
590
|
+
borderBottomStyle: 'solid',
|
|
591
|
+
borderBottomWidth: 1,
|
|
592
|
+
color: '#414547',
|
|
593
|
+
flex: 1,
|
|
594
|
+
fontName: 'HelveticaNow',
|
|
595
|
+
fontScaleCap: 64,
|
|
596
|
+
fontSize: 14,
|
|
597
|
+
fontWeight: '400',
|
|
598
|
+
justifyContent: 'flex-start',
|
|
599
|
+
letterSpacing: 0,
|
|
600
|
+
lineHeight: 1.125,
|
|
601
|
+
paddingBottom: 16,
|
|
602
|
+
paddingLeft: 0,
|
|
603
|
+
paddingRight: 0,
|
|
604
|
+
paddingTop: 0
|
|
500
605
|
}
|
|
501
606
|
},
|
|
502
607
|
Checkbox: {
|
|
@@ -772,6 +877,15 @@ module.exports = {
|
|
|
772
877
|
},
|
|
773
878
|
Icon: {
|
|
774
879
|
appearances: {
|
|
880
|
+
color: {
|
|
881
|
+
type: 'variant',
|
|
882
|
+
values: [
|
|
883
|
+
'brand', 'default',
|
|
884
|
+
'subtle', 'success',
|
|
885
|
+
'danger', 'warning',
|
|
886
|
+
'inverse'
|
|
887
|
+
]
|
|
888
|
+
},
|
|
775
889
|
rank: { type: 'variant', values: [ 'primary' ] },
|
|
776
890
|
size: {
|
|
777
891
|
type: 'variant',
|
|
@@ -782,6 +896,13 @@ module.exports = {
|
|
|
782
896
|
{ if: { size: 'micro' }, tokens: { size: 16 } },
|
|
783
897
|
{ if: { size: 'small' }, tokens: { size: 20 } },
|
|
784
898
|
{ if: { size: 'large' }, tokens: { size: 32 } },
|
|
899
|
+
{ if: { color: 'brand' }, tokens: { color: '#4b286d' } },
|
|
900
|
+
{ if: { color: 'default' }, tokens: { color: '#414547' } },
|
|
901
|
+
{ if: { color: 'subtle' }, tokens: { color: '#676e73' } },
|
|
902
|
+
{ if: { color: 'success' }, tokens: { color: '#66cc00' } },
|
|
903
|
+
{ if: { color: 'danger' }, tokens: { color: '#c12335' } },
|
|
904
|
+
{ if: { color: 'warning' }, tokens: { color: '#b4872c' } },
|
|
905
|
+
{ if: { color: 'inverse' }, tokens: { color: '#414547' } },
|
|
785
906
|
{ if: { size: 'extraLarge' }, tokens: { size: 48 } },
|
|
786
907
|
{ if: { rank: 'primary' }, tokens: { color: '#4b286d' } }
|
|
787
908
|
],
|
|
@@ -2153,6 +2274,21 @@ module.exports = {
|
|
|
2153
2274
|
squareRadius: 4
|
|
2154
2275
|
}
|
|
2155
2276
|
},
|
|
2277
|
+
SkipLink: {
|
|
2278
|
+
appearances: {},
|
|
2279
|
+
rules: [],
|
|
2280
|
+
tokens: {
|
|
2281
|
+
backgroundColor: '#7c53a5',
|
|
2282
|
+
borderRadius: 32,
|
|
2283
|
+
color: '#ffffff',
|
|
2284
|
+
outlineColor: '#7c53a5',
|
|
2285
|
+
outlineOffset: 2,
|
|
2286
|
+
outlineStyle: 'solid',
|
|
2287
|
+
outlineWidth: 1,
|
|
2288
|
+
paddingHorizontal: 8,
|
|
2289
|
+
paddingVertical: 8
|
|
2290
|
+
}
|
|
2291
|
+
},
|
|
2156
2292
|
StackView: {
|
|
2157
2293
|
appearances: {},
|
|
2158
2294
|
rules: [],
|
|
@@ -2938,7 +3074,7 @@ module.exports = {
|
|
|
2938
3074
|
tokens: {
|
|
2939
3075
|
fontName: 'HelveticaNow',
|
|
2940
3076
|
fontSize: 24,
|
|
2941
|
-
fontWeight: '
|
|
3077
|
+
fontWeight: '400',
|
|
2942
3078
|
lineHeight: 1.33333333333
|
|
2943
3079
|
}
|
|
2944
3080
|
},
|
|
@@ -3106,5 +3242,5 @@ module.exports = {
|
|
|
3106
3242
|
tokens: { size: 96 }
|
|
3107
3243
|
}
|
|
3108
3244
|
},
|
|
3109
|
-
metadata: { name: 'theme-allium', themeTokensVersion: '2.
|
|
3245
|
+
metadata: { name: 'theme-allium', themeTokensVersion: '2.2.0' }
|
|
3110
3246
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@telus-uds/theme-allium",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.5.0",
|
|
4
4
|
"description": "Allium theme",
|
|
5
5
|
"author": "TELUS Digital",
|
|
6
6
|
"homepage": "https://github.com/telus/allium-design-system#readme",
|
|
@@ -8,12 +8,12 @@
|
|
|
8
8
|
"main": "build/theme.js",
|
|
9
9
|
"dependencies": {},
|
|
10
10
|
"devDependencies": {
|
|
11
|
-
"@telus-uds/palette-allium": "^2.
|
|
12
|
-
"@telus-uds/system-theme-tokens": "^2.
|
|
11
|
+
"@telus-uds/palette-allium": "^2.4.0",
|
|
12
|
+
"@telus-uds/system-theme-tokens": "^2.2.0",
|
|
13
13
|
"@telus-uds/system-tokens": "^0.1.5"
|
|
14
14
|
},
|
|
15
15
|
"peerDependencies": {
|
|
16
|
-
"@telus-uds/palette-allium": "^2.
|
|
16
|
+
"@telus-uds/palette-allium": "^2.4.0"
|
|
17
17
|
},
|
|
18
18
|
"files": [
|
|
19
19
|
"build",
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
},
|
|
26
26
|
"scripts": {
|
|
27
27
|
"build": "UDS_PALETTE=@telus-uds/palette-allium system-tokens-build-theme",
|
|
28
|
-
"dev": "nodemon -w src -x '
|
|
28
|
+
"dev": "nodemon -w src -x 'npm run build'"
|
|
29
29
|
},
|
|
30
30
|
"bugs": {
|
|
31
31
|
"url": "https://github.com/telus/allium-design-system/issues"
|
package/theme.json
CHANGED
|
@@ -645,7 +645,8 @@
|
|
|
645
645
|
"viewport": ["xs", "sm"]
|
|
646
646
|
},
|
|
647
647
|
"tokens": {
|
|
648
|
-
"showPreviousNextNavigation": "{system.show.false}"
|
|
648
|
+
"showPreviousNextNavigation": "{system.show.false}",
|
|
649
|
+
"thumbnailSize": "{palette.size.size48}"
|
|
649
650
|
}
|
|
650
651
|
}
|
|
651
652
|
],
|
|
@@ -655,7 +656,107 @@
|
|
|
655
656
|
"showPanelNavigation": "{system.show.true}",
|
|
656
657
|
"showPreviousNextNavigation": "{system.show.true}",
|
|
657
658
|
"spaceBetweenSlideAndPanelNavigation": "{palette.size.size32}",
|
|
658
|
-
"spaceBetweenSlideAndPreviousNextNavigation": "{palette.size.size24}"
|
|
659
|
+
"spaceBetweenSlideAndPreviousNextNavigation": "{palette.size.size24}",
|
|
660
|
+
"thumbnailBorderColor": "{palette.color.greyMystic}",
|
|
661
|
+
"thumbnailBorderRadius": "{palette.radius.radius4}",
|
|
662
|
+
"thumbnailBorderWidth": "{palette.border.border1}",
|
|
663
|
+
"thumbnailContainerPaddingTop": "{palette.size.size24}",
|
|
664
|
+
"thumbnailMargin": "{palette.size.size4}",
|
|
665
|
+
"thumbnailPadding": "{palette.size.size8}",
|
|
666
|
+
"thumbnailSelectedBorderColor": "{palette.color.greyShuttle}",
|
|
667
|
+
"thumbnailSelectedBorderWidth": "{palette.border.border2}",
|
|
668
|
+
"thumbnailSize": "{palette.size.size56}"
|
|
669
|
+
}
|
|
670
|
+
},
|
|
671
|
+
"CarouselTabsPanelItem": {
|
|
672
|
+
"appearances": {
|
|
673
|
+
"focus": "{appearances.CarouselTabsPanelItem.focus}",
|
|
674
|
+
"hover": "{appearances.CarouselTabsPanelItem.hover}",
|
|
675
|
+
"inactive": "{appearances.CarouselTabsPanelItem.inactive}",
|
|
676
|
+
"pressed": "{appearances.CarouselTabsPanelItem.pressed}",
|
|
677
|
+
"selected": "{appearances.CarouselTabsPanelItem.selected}"
|
|
678
|
+
},
|
|
679
|
+
"rules": [
|
|
680
|
+
{
|
|
681
|
+
"if": {
|
|
682
|
+
"hover": true
|
|
683
|
+
},
|
|
684
|
+
"tokens": {
|
|
685
|
+
"borderBottomColor": "{palette.color.greenAccessible}",
|
|
686
|
+
"borderBottomWidth": "{palette.border.border2}",
|
|
687
|
+
"color": "{palette.color.greenAccessible}"
|
|
688
|
+
}
|
|
689
|
+
},
|
|
690
|
+
{
|
|
691
|
+
"if": {
|
|
692
|
+
"focus": true
|
|
693
|
+
},
|
|
694
|
+
"tokens": {
|
|
695
|
+
"borderBottomColor": "{palette.color.greenAccessible}",
|
|
696
|
+
"borderBottomWidth": "{palette.border.border4}",
|
|
697
|
+
"color": "{palette.color.greenAccessible}"
|
|
698
|
+
}
|
|
699
|
+
},
|
|
700
|
+
{
|
|
701
|
+
"if": {
|
|
702
|
+
"pressed": true
|
|
703
|
+
},
|
|
704
|
+
"tokens": {
|
|
705
|
+
"borderBottomColor": "{palette.color.greenSanFelix}",
|
|
706
|
+
"borderBottomWidth": "{palette.border.border2}",
|
|
707
|
+
"color": "{palette.color.greenSanFelix}"
|
|
708
|
+
}
|
|
709
|
+
},
|
|
710
|
+
{
|
|
711
|
+
"if": {
|
|
712
|
+
"focus": true,
|
|
713
|
+
"pressed": true
|
|
714
|
+
},
|
|
715
|
+
"tokens": {
|
|
716
|
+
"borderBottomWidth": "{palette.border.border4}"
|
|
717
|
+
}
|
|
718
|
+
},
|
|
719
|
+
{
|
|
720
|
+
"if": {
|
|
721
|
+
"inactive": true
|
|
722
|
+
},
|
|
723
|
+
"tokens": {
|
|
724
|
+
"borderBottomColor": "{palette.color.greyShuttle}",
|
|
725
|
+
"borderBottomWidth": "{palette.border.border4}",
|
|
726
|
+
"color": "{palette.color.greyShuttle}"
|
|
727
|
+
}
|
|
728
|
+
},
|
|
729
|
+
{
|
|
730
|
+
"if": {
|
|
731
|
+
"selected": true
|
|
732
|
+
},
|
|
733
|
+
"tokens": {
|
|
734
|
+
"borderBottomColor": "{palette.color.greyShuttle}",
|
|
735
|
+
"borderBottomWidth": "{palette.border.border2}",
|
|
736
|
+
"color": "{palette.color.greyShuttle}",
|
|
737
|
+
"fontName": "{palette.fontName.HelveticaNow}",
|
|
738
|
+
"fontWeight": "{palette.fontWeight.weight400}"
|
|
739
|
+
}
|
|
740
|
+
}
|
|
741
|
+
],
|
|
742
|
+
"tokens": {
|
|
743
|
+
"alignItems": "{system.flexAlign.flexStart}",
|
|
744
|
+
"borderBottomColor": "{system.color.transparent}",
|
|
745
|
+
"borderBottomStyle": "{system.borderStyle.solid}",
|
|
746
|
+
"borderBottomWidth": "{palette.border.border1}",
|
|
747
|
+
"color": "{palette.color.greyCharcoal}",
|
|
748
|
+
"flex": "{system.integer.1}",
|
|
749
|
+
"fontName": "{palette.fontName.HelveticaNow}",
|
|
750
|
+
"fontScaleCap": "{palette.fontSize.size64}",
|
|
751
|
+
"fontSize": "{palette.fontSize.size14}",
|
|
752
|
+
"fontWeight": "{palette.fontWeight.weight400}",
|
|
753
|
+
"justifyContent": "{system.flexJustifyContent.flexStart}",
|
|
754
|
+
"letterSpacing": "{system.letterSpacing.none}",
|
|
755
|
+
"lineHeight": "{palette.lineHeight.ratio9to8}",
|
|
756
|
+
"paddingBottom": "{palette.size.size16}",
|
|
757
|
+
"paddingLeft": "{system.size.zero}",
|
|
758
|
+
"paddingRight": "{system.size.zero}",
|
|
759
|
+
"paddingTop": "{system.size.zero}"
|
|
659
760
|
}
|
|
660
761
|
},
|
|
661
762
|
"Checkbox": {
|
|
@@ -983,6 +1084,10 @@
|
|
|
983
1084
|
},
|
|
984
1085
|
"Icon": {
|
|
985
1086
|
"appearances": {
|
|
1087
|
+
"color": {
|
|
1088
|
+
"type": "variant",
|
|
1089
|
+
"values": ["brand", "default", "subtle", "success", "danger", "warning", "inverse"]
|
|
1090
|
+
},
|
|
986
1091
|
"rank": {
|
|
987
1092
|
"type": "variant",
|
|
988
1093
|
"values": ["primary"]
|
|
@@ -1017,6 +1122,62 @@
|
|
|
1017
1122
|
"size": "{palette.size.size32}"
|
|
1018
1123
|
}
|
|
1019
1124
|
},
|
|
1125
|
+
{
|
|
1126
|
+
"if": {
|
|
1127
|
+
"color": "brand"
|
|
1128
|
+
},
|
|
1129
|
+
"tokens": {
|
|
1130
|
+
"color": "{palette.color.purpleTelus}"
|
|
1131
|
+
}
|
|
1132
|
+
},
|
|
1133
|
+
{
|
|
1134
|
+
"if": {
|
|
1135
|
+
"color": "default"
|
|
1136
|
+
},
|
|
1137
|
+
"tokens": {
|
|
1138
|
+
"color": "{palette.color.greyCharcoal}"
|
|
1139
|
+
}
|
|
1140
|
+
},
|
|
1141
|
+
{
|
|
1142
|
+
"if": {
|
|
1143
|
+
"color": "subtle"
|
|
1144
|
+
},
|
|
1145
|
+
"tokens": {
|
|
1146
|
+
"color": "{palette.color.greyShuttle}"
|
|
1147
|
+
}
|
|
1148
|
+
},
|
|
1149
|
+
{
|
|
1150
|
+
"if": {
|
|
1151
|
+
"color": "success"
|
|
1152
|
+
},
|
|
1153
|
+
"tokens": {
|
|
1154
|
+
"color": "{palette.color.greenTelus}"
|
|
1155
|
+
}
|
|
1156
|
+
},
|
|
1157
|
+
{
|
|
1158
|
+
"if": {
|
|
1159
|
+
"color": "danger"
|
|
1160
|
+
},
|
|
1161
|
+
"tokens": {
|
|
1162
|
+
"color": "{palette.color.redDark}"
|
|
1163
|
+
}
|
|
1164
|
+
},
|
|
1165
|
+
{
|
|
1166
|
+
"if": {
|
|
1167
|
+
"color": "warning"
|
|
1168
|
+
},
|
|
1169
|
+
"tokens": {
|
|
1170
|
+
"color": "{palette.color.amberDark}"
|
|
1171
|
+
}
|
|
1172
|
+
},
|
|
1173
|
+
{
|
|
1174
|
+
"if": {
|
|
1175
|
+
"color": "inverse"
|
|
1176
|
+
},
|
|
1177
|
+
"tokens": {
|
|
1178
|
+
"color": "{palette.color.greyCharcoal}"
|
|
1179
|
+
}
|
|
1180
|
+
},
|
|
1020
1181
|
{
|
|
1021
1182
|
"if": {
|
|
1022
1183
|
"size": "extraLarge"
|
|
@@ -2629,6 +2790,21 @@
|
|
|
2629
2790
|
"squareRadius": "{palette.radius.radius4}"
|
|
2630
2791
|
}
|
|
2631
2792
|
},
|
|
2793
|
+
"SkipLink": {
|
|
2794
|
+
"appearances": {},
|
|
2795
|
+
"rules": [],
|
|
2796
|
+
"tokens": {
|
|
2797
|
+
"backgroundColor": "{palette.color.purpleDeluge}",
|
|
2798
|
+
"borderRadius": "{palette.radius.pill32}",
|
|
2799
|
+
"color": "{palette.color.white}",
|
|
2800
|
+
"outlineColor": "{palette.color.purpleDeluge}",
|
|
2801
|
+
"outlineOffset": "{palette.border.border2}",
|
|
2802
|
+
"outlineStyle": "{system.borderStyle.solid}",
|
|
2803
|
+
"outlineWidth": "{palette.border.border1}",
|
|
2804
|
+
"paddingHorizontal": "{palette.size.size8}",
|
|
2805
|
+
"paddingVertical": "{palette.size.size8}"
|
|
2806
|
+
}
|
|
2807
|
+
},
|
|
2632
2808
|
"StackView": {
|
|
2633
2809
|
"appearances": {},
|
|
2634
2810
|
"rules": [],
|
|
@@ -3579,7 +3755,7 @@
|
|
|
3579
3755
|
"tokens": {
|
|
3580
3756
|
"fontName": "{palette.fontName.HelveticaNow}",
|
|
3581
3757
|
"fontSize": "{palette.fontSize.size24}",
|
|
3582
|
-
"fontWeight": "{palette.fontWeight.
|
|
3758
|
+
"fontWeight": "{palette.fontWeight.weight400}",
|
|
3583
3759
|
"lineHeight": "{palette.lineHeight.ratio4to3}"
|
|
3584
3760
|
}
|
|
3585
3761
|
},
|