@deque/cauldron-styles 4.7.0 → 5.0.0-canary.aaaf1d1d
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/dist/index.css +131 -39
- package/package.json +2 -2
package/dist/index.css
CHANGED
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
/* color palette */
|
|
9
9
|
--white: #ffffff;
|
|
10
10
|
--dark-workspace-color: #53636e;
|
|
11
|
+
--stroke-light: #b3bfc6;
|
|
11
12
|
--stroke-dark: #5d676f;
|
|
12
13
|
--gray-10: #fdfdfe;
|
|
13
14
|
--gray-20: #f2f2f2;
|
|
@@ -20,6 +21,7 @@
|
|
|
20
21
|
--accent-medium: #283640;
|
|
21
22
|
--accent-light: #d4dde0;
|
|
22
23
|
--accent-success: #a5db75;
|
|
24
|
+
--accent-success-high-contrast: #4fa630;
|
|
23
25
|
--accent-success-light: #d1ffa4;
|
|
24
26
|
--accent-success-dark: #57a711;
|
|
25
27
|
--accent-error: #d93251;
|
|
@@ -37,10 +39,10 @@
|
|
|
37
39
|
--accent-secondary-active: var(--gray-30);
|
|
38
40
|
--focus-light: #c11bde;
|
|
39
41
|
--focus-dark: #eb94ff;
|
|
40
|
-
--issue-critical:
|
|
41
|
-
--issue-serious:
|
|
42
|
-
--issue-moderate: #
|
|
43
|
-
--issue-minor:
|
|
42
|
+
--issue-critical: var(--accent-danger);
|
|
43
|
+
--issue-serious: var(--accent-warning);
|
|
44
|
+
--issue-moderate: #f0c4f8;
|
|
45
|
+
--issue-minor: var(--gray-20);
|
|
44
46
|
|
|
45
47
|
/* text colours */
|
|
46
48
|
--text-color-base: var(--gray-60);
|
|
@@ -49,6 +51,9 @@
|
|
|
49
51
|
--header-text-color: var(--gray-80);
|
|
50
52
|
--header-text-color-dark: var(--gray-90);
|
|
51
53
|
|
|
54
|
+
/* background colours */
|
|
55
|
+
--background-light: #f0f2f5;
|
|
56
|
+
|
|
52
57
|
/* accents */
|
|
53
58
|
--error: var(--accent-error);
|
|
54
59
|
--disabled: var(--gray-40);
|
|
@@ -65,10 +70,11 @@
|
|
|
65
70
|
|
|
66
71
|
/* spacing (padding/margin) */
|
|
67
72
|
--space-smallest: 8px;
|
|
73
|
+
--space-smaller: 12px;
|
|
68
74
|
--space-small: 16px;
|
|
69
75
|
--space-medium: 18px;
|
|
70
76
|
--space-large: 24px;
|
|
71
|
-
--space-largest:
|
|
77
|
+
--space-largest: 32px;
|
|
72
78
|
--space-half: 4px;
|
|
73
79
|
--space-three-quarters: 6px;
|
|
74
80
|
--space-quarter: 2px;
|
|
@@ -80,6 +86,7 @@
|
|
|
80
86
|
--text-size-larger: 56px;
|
|
81
87
|
--text-size-large: 45px;
|
|
82
88
|
--text-size-large-medium: 34px;
|
|
89
|
+
--text-size-medium-large: 32px;
|
|
83
90
|
--text-size-medium: 24px;
|
|
84
91
|
--text-small-medium: 20px;
|
|
85
92
|
--text-size-normal: 18px;
|
|
@@ -101,7 +108,7 @@
|
|
|
101
108
|
--content-max-width: 1000px;
|
|
102
109
|
|
|
103
110
|
/* z-index */
|
|
104
|
-
--z-index-tooltip:
|
|
111
|
+
--z-index-tooltip: 22;
|
|
105
112
|
--z-index-loader: 8;
|
|
106
113
|
--z-index-scrim: 7;
|
|
107
114
|
--z-index-dialog: 21;
|
|
@@ -661,7 +668,7 @@ button.Link {
|
|
|
661
668
|
--button-background-color-secondary-active
|
|
662
669
|
);
|
|
663
670
|
--icon-button-outline-color-secondary: var(--button-outline-color-secondary);
|
|
664
|
-
--icon-button-border-color-secondary:
|
|
671
|
+
--icon-button-border-color-secondary: var(--gray-40);
|
|
665
672
|
|
|
666
673
|
--icon-button-background-color-error: var(--button-background-color-error);
|
|
667
674
|
--icon-button-background-color-error-disabled: var(
|
|
@@ -689,6 +696,7 @@ button.Link {
|
|
|
689
696
|
display: inline-flex;
|
|
690
697
|
justify-content: center;
|
|
691
698
|
align-content: center;
|
|
699
|
+
align-items: center;
|
|
692
700
|
height: var(--button-thin-height);
|
|
693
701
|
width: var(--button-thin-height);
|
|
694
702
|
border-radius: 3px;
|
|
@@ -699,9 +707,16 @@ button.Link {
|
|
|
699
707
|
padding: 0;
|
|
700
708
|
}
|
|
701
709
|
|
|
710
|
+
/* Ensure both <a> and <button> IconButtons are aligned correctly. See #846. */
|
|
711
|
+
|
|
712
|
+
a.IconButton {
|
|
713
|
+
vertical-align: middle;
|
|
714
|
+
line-height: unset;
|
|
715
|
+
}
|
|
716
|
+
|
|
702
717
|
.IconButton .Icon {
|
|
703
|
-
|
|
704
|
-
|
|
718
|
+
height: var(--space-small);
|
|
719
|
+
width: var(--space-small);
|
|
705
720
|
pointer-events: none;
|
|
706
721
|
}
|
|
707
722
|
|
|
@@ -1488,9 +1503,10 @@ textarea:focus,
|
|
|
1488
1503
|
[role='listbox']:focus,
|
|
1489
1504
|
[role='spinbutton']:focus {
|
|
1490
1505
|
outline: 0;
|
|
1491
|
-
border:
|
|
1492
|
-
box-shadow:
|
|
1493
|
-
|
|
1506
|
+
border: 1px solid var(--field-border-color-focus);
|
|
1507
|
+
box-shadow: 0 0 0 2px var(--field-border-color-focus),
|
|
1508
|
+
0 0 5px var(--field-border-color-focus-glow),
|
|
1509
|
+
inset 0 1px 2px rgba(0, 0, 0, 0.05);
|
|
1494
1510
|
}
|
|
1495
1511
|
|
|
1496
1512
|
input:hover,
|
|
@@ -1514,7 +1530,7 @@ textarea:focus:hover,
|
|
|
1514
1530
|
[aria-haspopup='listbox']:focus:hover,
|
|
1515
1531
|
[role='listbox']:focus:hover,
|
|
1516
1532
|
[role='spinbutton']:focus:hover {
|
|
1517
|
-
border:
|
|
1533
|
+
border: 1px solid var(--field-border-color-focus-hover);
|
|
1518
1534
|
}
|
|
1519
1535
|
|
|
1520
1536
|
input.Field--has-error,
|
|
@@ -1554,9 +1570,10 @@ textarea.Field--has-error:focus,
|
|
|
1554
1570
|
[aria-haspopup='listbox'].Field--has-error:focus,
|
|
1555
1571
|
[role='listbox'].Field--has-error:focus,
|
|
1556
1572
|
[role='spinbutton'].Field--has-error:focus {
|
|
1557
|
-
border:
|
|
1558
|
-
box-shadow:
|
|
1559
|
-
|
|
1573
|
+
border: 1px solid var(--field-border-color-error);
|
|
1574
|
+
box-shadow: 0 0 0 1px var(--field-border-color-error-hover),
|
|
1575
|
+
inset 0 2px 3px 0 rgba(0, 0, 0, 0.05),
|
|
1576
|
+
0 0 5px 0 var(--field-border-color-error-focus-glow);
|
|
1560
1577
|
}
|
|
1561
1578
|
|
|
1562
1579
|
input.Field--has-error:focus:hover,
|
|
@@ -1833,7 +1850,7 @@ textarea.Field--has-error:focus:hover,
|
|
|
1833
1850
|
|
|
1834
1851
|
.Link:hover {
|
|
1835
1852
|
text-decoration: underline;
|
|
1836
|
-
color: var(--link-text-color);
|
|
1853
|
+
color: var(--link-text-color-hover);
|
|
1837
1854
|
}
|
|
1838
1855
|
|
|
1839
1856
|
.Link:focus {
|
|
@@ -1933,7 +1950,8 @@ p .Link {
|
|
|
1933
1950
|
}
|
|
1934
1951
|
|
|
1935
1952
|
.OptionsMenu__list-item:focus {
|
|
1936
|
-
box-shadow: inset 0 0 0
|
|
1953
|
+
box-shadow: inset 0 0 0 1px var(--options-menu-hover-background-color),
|
|
1954
|
+
inset 0 0 0 3px var(--focus);
|
|
1937
1955
|
}
|
|
1938
1956
|
|
|
1939
1957
|
.OptionsMenu__list-item[aria-disabled='true'] {
|
|
@@ -2257,7 +2275,12 @@ p .Link {
|
|
|
2257
2275
|
}
|
|
2258
2276
|
|
|
2259
2277
|
.RadioCardGroup__Icon.Icon svg {
|
|
2260
|
-
|
|
2278
|
+
/**
|
|
2279
|
+
* this is edge case to pass color-contrast when the radio-card is selected,
|
|
2280
|
+
* it is not a color we want to live in cauldron as a variable
|
|
2281
|
+
* @see https://github.com/dequelabs/cauldron/pull/736
|
|
2282
|
+
*/
|
|
2283
|
+
color: #4f990f;
|
|
2261
2284
|
height: 44px;
|
|
2262
2285
|
width: 44px;
|
|
2263
2286
|
}
|
|
@@ -2298,6 +2321,10 @@ p .Link {
|
|
|
2298
2321
|
justify-content: center;
|
|
2299
2322
|
}
|
|
2300
2323
|
|
|
2324
|
+
.cauldron--theme-dark .RadioCardGroup__Icon.Icon svg {
|
|
2325
|
+
color: var(--accent-success);
|
|
2326
|
+
}
|
|
2327
|
+
|
|
2301
2328
|
:root {
|
|
2302
2329
|
--tile-background-color: var(--white);
|
|
2303
2330
|
--list-separator: rgba(153, 153, 153, 0.15);
|
|
@@ -2523,16 +2550,18 @@ p .Link {
|
|
|
2523
2550
|
width: 0.1px;
|
|
2524
2551
|
}
|
|
2525
2552
|
|
|
2553
|
+
/* Adjust position to try to center the arrow in the tooltip's border */
|
|
2554
|
+
|
|
2526
2555
|
[class*='Tooltip--top'] .TooltipArrow {
|
|
2527
|
-
bottom:
|
|
2556
|
+
bottom: -1px;
|
|
2528
2557
|
}
|
|
2529
2558
|
|
|
2530
2559
|
[class*='Tooltip--bottom'] .TooltipArrow {
|
|
2531
|
-
top:
|
|
2560
|
+
top: -1px;
|
|
2532
2561
|
}
|
|
2533
2562
|
|
|
2534
2563
|
[class*='Tooltip--left'] .TooltipArrow {
|
|
2535
|
-
right:
|
|
2564
|
+
right: -1px;
|
|
2536
2565
|
}
|
|
2537
2566
|
|
|
2538
2567
|
[class*='Tooltip--right'] .TooltipArrow {
|
|
@@ -2593,15 +2622,14 @@ p .Link {
|
|
|
2593
2622
|
|
|
2594
2623
|
.TooltipHead {
|
|
2595
2624
|
background: var(--gray-20);
|
|
2596
|
-
font-size:
|
|
2625
|
+
font-size: var(--text-size-small);
|
|
2597
2626
|
color: var(--gray-90);
|
|
2598
|
-
padding:
|
|
2627
|
+
padding: var(--space-small) var(--space-large);
|
|
2599
2628
|
text-align: center;
|
|
2600
2629
|
}
|
|
2601
2630
|
|
|
2602
2631
|
.TooltipContent {
|
|
2603
2632
|
background: #fff;
|
|
2604
|
-
font-size: var(--font-size-smaller);
|
|
2605
2633
|
text-align: left;
|
|
2606
2634
|
}
|
|
2607
2635
|
|
|
@@ -2796,6 +2824,12 @@ button.TooltipTabstop {
|
|
|
2796
2824
|
background-color: var(--top-bar-text-color);
|
|
2797
2825
|
}
|
|
2798
2826
|
|
|
2827
|
+
@media (max-width: 71.25rem) {
|
|
2828
|
+
.TopBar > ul {
|
|
2829
|
+
border: 0;
|
|
2830
|
+
}
|
|
2831
|
+
}
|
|
2832
|
+
|
|
2799
2833
|
:root {
|
|
2800
2834
|
--skip-link-background-color: rgba(255, 255, 255, 0.95);
|
|
2801
2835
|
--skip-link-focus-color: var(--focus-light);
|
|
@@ -3386,6 +3420,7 @@ button.TooltipTabstop {
|
|
|
3386
3420
|
--table-row-border-color: var(--gray-40);
|
|
3387
3421
|
--table-space: 11px;
|
|
3388
3422
|
--table-header-sorting-border-color: var(--gray-90);
|
|
3423
|
+
--table-box-shadow: 0 2px 3px rgba(0, 0, 0, 0.15);
|
|
3389
3424
|
}
|
|
3390
3425
|
|
|
3391
3426
|
.cauldron--theme-dark {
|
|
@@ -3413,7 +3448,7 @@ button.TooltipTabstop {
|
|
|
3413
3448
|
background: var(--table-header-background-color);
|
|
3414
3449
|
font-weight: var(--font-weight-medium);
|
|
3415
3450
|
color: var(--table-header-text-color);
|
|
3416
|
-
border-bottom:
|
|
3451
|
+
border-bottom: 3px solid var(--table-row-border-color);
|
|
3417
3452
|
}
|
|
3418
3453
|
|
|
3419
3454
|
.TableHeader[aria-sort] {
|
|
@@ -3442,10 +3477,11 @@ button.TooltipTabstop {
|
|
|
3442
3477
|
outline-offset: unset;
|
|
3443
3478
|
}
|
|
3444
3479
|
|
|
3480
|
+
.TableHeader,
|
|
3445
3481
|
.TableHeader--sort-ascending,
|
|
3446
3482
|
.TableHeader--sort-descending {
|
|
3447
3483
|
background: var(--table-header-sorting-background-color);
|
|
3448
|
-
border-bottom:
|
|
3484
|
+
border-bottom: 3px solid var(--table-header-sorting-border-color);
|
|
3449
3485
|
}
|
|
3450
3486
|
|
|
3451
3487
|
.TableHeader--sort-ascending .TableHeader__sort-button,
|
|
@@ -3466,21 +3502,54 @@ button.TooltipTabstop {
|
|
|
3466
3502
|
}
|
|
3467
3503
|
|
|
3468
3504
|
.TableCell,
|
|
3469
|
-
.TableHeader
|
|
3505
|
+
.TableHeader,
|
|
3506
|
+
.TableFooter {
|
|
3470
3507
|
padding: var(--table-space) var(--space-smallest);
|
|
3471
3508
|
}
|
|
3472
3509
|
|
|
3473
|
-
.TableRow:last-child .TableCell {
|
|
3510
|
+
.Table:not(.Table--border) .TableRow:last-child .TableCell {
|
|
3474
3511
|
border: none;
|
|
3475
3512
|
}
|
|
3476
3513
|
|
|
3514
|
+
.Table--border {
|
|
3515
|
+
box-shadow: var(--table-box-shadow);
|
|
3516
|
+
}
|
|
3517
|
+
|
|
3518
|
+
.TableCell {
|
|
3519
|
+
color: var(--gray-90);
|
|
3520
|
+
}
|
|
3521
|
+
|
|
3522
|
+
.cauldron--theme-dark .TableCell {
|
|
3523
|
+
color: var(--white);
|
|
3524
|
+
}
|
|
3525
|
+
|
|
3526
|
+
.Table--border,
|
|
3527
|
+
.Table--border .TableHeader,
|
|
3528
|
+
.Table--border .TableFooter,
|
|
3529
|
+
.Table--border .TableCell {
|
|
3530
|
+
border: 1px solid var(--gray-40);
|
|
3531
|
+
}
|
|
3532
|
+
|
|
3533
|
+
.cauldron--theme-dark .Table--border,
|
|
3534
|
+
.cauldron--theme-dark .Table--border .TableHeader,
|
|
3535
|
+
.cauldron--theme-dark .Table--border .TableFooter,
|
|
3536
|
+
.cauldron--theme-dark .Table--border .TableCell {
|
|
3537
|
+
border-color: var(--stroke-dark);
|
|
3538
|
+
}
|
|
3539
|
+
|
|
3540
|
+
.TableFooter .TableCell {
|
|
3541
|
+
background: var(--table-header-background-color);
|
|
3542
|
+
font-weight: var(--font-weight-medium);
|
|
3543
|
+
color: var(--table-header-text-color);
|
|
3544
|
+
}
|
|
3545
|
+
|
|
3477
3546
|
:root {
|
|
3478
3547
|
--data-list-background-color: var(--gray-20);
|
|
3479
3548
|
--data-list-value-background-color: var(--white);
|
|
3480
3549
|
--data-list-border-color: var(--gray-40);
|
|
3481
3550
|
--data-list-text-color: var(--gray-90);
|
|
3482
|
-
--data-list-value-text-color: var(--gray-
|
|
3483
|
-
--data-list-space:
|
|
3551
|
+
--data-list-value-text-color: var(--gray-90);
|
|
3552
|
+
--data-list-space: var(--space-small);
|
|
3484
3553
|
--data-list-value-width: 187px;
|
|
3485
3554
|
}
|
|
3486
3555
|
|
|
@@ -3498,7 +3567,7 @@ button.TooltipTabstop {
|
|
|
3498
3567
|
border-radius: 3px;
|
|
3499
3568
|
border: 1px solid var(--data-list-border-color);
|
|
3500
3569
|
box-shadow: 0 2px 3px rgba(0, 0, 0, 0.15);
|
|
3501
|
-
margin-bottom: var(--space-small)
|
|
3570
|
+
margin-bottom: var(--space-small);
|
|
3502
3571
|
}
|
|
3503
3572
|
|
|
3504
3573
|
.DescriptionList.DescriptionList--collapsed {
|
|
@@ -3520,7 +3589,7 @@ button.TooltipTabstop {
|
|
|
3520
3589
|
|
|
3521
3590
|
.DescriptionList--collapsed .DescriptionList__item {
|
|
3522
3591
|
border: 0;
|
|
3523
|
-
margin-bottom:
|
|
3592
|
+
margin-bottom: 12px;
|
|
3524
3593
|
display: block;
|
|
3525
3594
|
background-color: var(--data-list-value-background-color);
|
|
3526
3595
|
}
|
|
@@ -3553,6 +3622,7 @@ button.TooltipTabstop {
|
|
|
3553
3622
|
background-color: transparent;
|
|
3554
3623
|
width: auto;
|
|
3555
3624
|
border-right: none;
|
|
3625
|
+
margin-bottom: 2px;
|
|
3556
3626
|
}
|
|
3557
3627
|
|
|
3558
3628
|
.DescriptionList__details {
|
|
@@ -3584,6 +3654,16 @@ button.TooltipTabstop {
|
|
|
3584
3654
|
color: var(--white);
|
|
3585
3655
|
}
|
|
3586
3656
|
|
|
3657
|
+
@media screen and (max-width: 32rem) {
|
|
3658
|
+
.DescriptionList {
|
|
3659
|
+
margin-bottom: 0;
|
|
3660
|
+
box-shadow: none;
|
|
3661
|
+
border-bottom: 0;
|
|
3662
|
+
border-left: 1px solid var(--gray-40);
|
|
3663
|
+
border-right: 1px solid var(--gray-40);
|
|
3664
|
+
}
|
|
3665
|
+
}
|
|
3666
|
+
|
|
3587
3667
|
.Stepper {
|
|
3588
3668
|
--step-indicator-size: 2em;
|
|
3589
3669
|
--step-line-height: 0.53em;
|
|
@@ -3711,7 +3791,7 @@ button.TooltipTabstop {
|
|
|
3711
3791
|
}
|
|
3712
3792
|
|
|
3713
3793
|
.Panel {
|
|
3714
|
-
padding: var(--space-
|
|
3794
|
+
padding: var(--space-small);
|
|
3715
3795
|
border: 1px solid var(--panel-border-color);
|
|
3716
3796
|
border-radius: 3px;
|
|
3717
3797
|
box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.15);
|
|
@@ -4030,6 +4110,7 @@ fieldset.Panel {
|
|
|
4030
4110
|
display: flex;
|
|
4031
4111
|
align-items: center;
|
|
4032
4112
|
font-size: var(--text-size-small);
|
|
4113
|
+
margin: 0;
|
|
4033
4114
|
}
|
|
4034
4115
|
|
|
4035
4116
|
.Pagination > ul > li:not(:last-child) {
|
|
@@ -4080,6 +4161,16 @@ fieldset.Panel {
|
|
|
4080
4161
|
color: var(--accent-light);
|
|
4081
4162
|
}
|
|
4082
4163
|
|
|
4164
|
+
@media (max-width: 28.125rem) {
|
|
4165
|
+
.Pagination [role='log'] {
|
|
4166
|
+
margin: 0;
|
|
4167
|
+
}
|
|
4168
|
+
|
|
4169
|
+
.Pagination--thin [role='log'] {
|
|
4170
|
+
margin: 0;
|
|
4171
|
+
}
|
|
4172
|
+
}
|
|
4173
|
+
|
|
4083
4174
|
.Breadcrumb ol {
|
|
4084
4175
|
display: flex;
|
|
4085
4176
|
align-items: center;
|
|
@@ -4418,8 +4509,9 @@ fieldset.Panel {
|
|
|
4418
4509
|
all: unset;
|
|
4419
4510
|
}
|
|
4420
4511
|
|
|
4421
|
-
.Accordion__trigger
|
|
4422
|
-
|
|
4512
|
+
.Accordion__trigger,
|
|
4513
|
+
button.Accordion__trigger {
|
|
4514
|
+
background-color: var(--accordion-trigger-background-color);
|
|
4423
4515
|
padding: calc(var(--space-small) - var(--space-half));
|
|
4424
4516
|
width: 100%;
|
|
4425
4517
|
display: flex;
|
|
@@ -4433,13 +4525,13 @@ fieldset.Panel {
|
|
|
4433
4525
|
text-decoration: underline solid var(--accordion-trigger-text-color);
|
|
4434
4526
|
}
|
|
4435
4527
|
|
|
4436
|
-
|
|
4528
|
+
.Accordion__trigger[aria-expanded='true'] {
|
|
4437
4529
|
border-bottom-right-radius: 0;
|
|
4438
4530
|
border-bottom-left-radius: 0;
|
|
4439
4531
|
background: var(--accordion-trigger-background-color-expanded);
|
|
4440
4532
|
}
|
|
4441
4533
|
|
|
4442
|
-
|
|
4534
|
+
.Accordion__trigger:hover {
|
|
4443
4535
|
box-shadow: inset 8px 0 0 -4px var(--accordion-trigger-box-shadow-hover);
|
|
4444
4536
|
color: var(--accordion-trigger-text-color-hover);
|
|
4445
4537
|
transition: all 0.2s ease-in-out;
|
|
@@ -4447,7 +4539,7 @@ button.Accordion__trigger:hover {
|
|
|
4447
4539
|
text-decoration: underline solid var(--accordion-trigger-text-color-hover);
|
|
4448
4540
|
}
|
|
4449
4541
|
|
|
4450
|
-
|
|
4542
|
+
.Accordion__trigger:hover .Icon {
|
|
4451
4543
|
color: var(--accordion-trigger-icon-color);
|
|
4452
4544
|
}
|
|
4453
4545
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@deque/cauldron-styles",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "5.0.0-canary.aaaf1d1d",
|
|
4
4
|
"license": "MPL-2.0",
|
|
5
5
|
"description": "deque cauldron pattern library styles",
|
|
6
6
|
"repository": "https://github.com/dequelabs/cauldron",
|
|
@@ -22,4 +22,4 @@
|
|
|
22
22
|
"postcss-cli": "^7.1.1",
|
|
23
23
|
"postcss-import": "^12.0.1"
|
|
24
24
|
}
|
|
25
|
-
}
|
|
25
|
+
}
|