@zohodesk/components 1.6.29 → 1.6.31

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.
Files changed (30) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/es/Button/css/Button.module.css +1 -2
  3. package/es/CheckBox/CheckBox.module.css +2 -2
  4. package/es/DividerLine/css/DividerLine.module.css +1 -2
  5. package/es/ListItem/ListItem.module.css +1 -2
  6. package/es/Radio/Radio.module.css +1 -1
  7. package/es/Tab/Tab.module.css +1 -2
  8. package/es/Tooltip/Tooltip.module.css +1 -1
  9. package/es/Typography/css/Typography.module.css +1 -1
  10. package/es/common/basic.module.css +5 -5
  11. package/es/common/common.module.css +2 -6
  12. package/es/common/transition.module.css +2 -0
  13. package/es/semantic/Button/semanticButton.module.css +1 -2
  14. package/es/v1/Button/css/Button_v1.module.css +0 -1
  15. package/es/v1/Switch/css/Switch_v1.module.css +2 -3
  16. package/lib/Button/css/Button.module.css +1 -2
  17. package/lib/CheckBox/CheckBox.module.css +2 -2
  18. package/lib/DividerLine/css/DividerLine.module.css +1 -2
  19. package/lib/ListItem/ListItem.module.css +1 -2
  20. package/lib/Radio/Radio.module.css +1 -1
  21. package/lib/Tab/Tab.module.css +1 -2
  22. package/lib/Tooltip/Tooltip.module.css +1 -1
  23. package/lib/Typography/css/Typography.module.css +1 -1
  24. package/lib/common/basic.module.css +5 -5
  25. package/lib/common/common.module.css +2 -6
  26. package/lib/common/transition.module.css +2 -0
  27. package/lib/semantic/Button/semanticButton.module.css +1 -2
  28. package/lib/v1/Button/css/Button_v1.module.css +0 -1
  29. package/lib/v1/Switch/css/Switch_v1.module.css +2 -3
  30. package/package.json +14 -13
package/CHANGELOG.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # Changelog
2
2
 
3
+ ## 1.6.31
4
+
5
+ - `@dot-system/css-utility` classes adopted
6
+
7
+ ## 1.6.30
8
+
9
+ - Updated the semibold font-weight CSS variable from 600 to 500 to avoid font-family conflicts across applications in Lato @font-face.
10
+
3
11
  ## 1.6.29
4
12
 
5
13
  - Static CSS utility classes have been adopted across all CSS files using global composes.
package/es/Button/css/Button.module.css CHANGED
@@ -272,10 +272,9 @@
272
272
  }
273
273
 
274
274
  .overlay {
275
- composes: d-absolute from global;
275
+ composes: d-absolute d-bg-inherit from global;
276
276
  top: 0 ;
277
277
  bottom: 0 ;
278
- background-color: inherit;
279
278
  border-radius: inherit;
280
279
  }
281
280
 
package/es/CheckBox/CheckBox.module.css CHANGED
@@ -53,7 +53,7 @@
53
53
  font-size: 0 ;
54
54
  }
55
55
  .tick {
56
- position: absolute;
56
+ composes: d-absolute from global;
57
57
  left: 0 ;
58
58
  }
59
59
  .mediumtick {
@@ -144,7 +144,7 @@
144
144
 
145
145
  .labelContainer {
146
146
  composes: dflex flexcolumn from '../common/common.module.css';
147
- gap: var(--zd_size4) ;
147
+ composes: d-gap-[4px] from global;
148
148
  margin-inline-start:var(--zd_size6) ;
149
149
  }
150
150
  @keyframes tickAnimate {
package/es/DividerLine/css/DividerLine.module.css CHANGED
@@ -1,7 +1,6 @@
1
1
  .wrapper {
2
- flex-shrink: 0;
2
+ composes: d-flex-shrink-0 d-m-0 from global;
3
3
  border: none;
4
- margin: 0 ;
5
4
  }
6
5
 
7
6
  .horizontal {
package/es/ListItem/ListItem.module.css CHANGED
@@ -28,13 +28,12 @@
28
28
  }
29
29
  .list {
30
30
  composes: varClass;
31
- composes: d-relative d-border-solid d-cursor-pointer from global;
31
+ composes: d-relative d-border-solid d-cursor-pointer d-no-underline from global;
32
32
  list-style: none;
33
33
  color: var(--listitem_text_color);
34
34
  font-size: var(--listitem_font_size);
35
35
  height: var(--listitem_height);
36
36
  min-height: var(--listitem_min_height);
37
- text-decoration: none;
38
37
  padding: var(--listitem_padding);
39
38
  border-width: var(--listitem_border_width);
40
39
  border-color: var(--listitem_border_color);
package/es/Radio/Radio.module.css CHANGED
@@ -133,7 +133,7 @@
133
133
 
134
134
  .labelContainer {
135
135
  composes: dflex flexcolumn from '../common/common.module.css';
136
- gap: var(--zd_size4) ;
136
+ composes: d-gap-[4px] from global;
137
137
  margin: var(--radio_label_margin);
138
138
  }
139
139
 
package/es/Tab/Tab.module.css CHANGED
@@ -1,7 +1,6 @@
1
1
  .tab {
2
- composes: d-uppercase d-cursor-pointer from global;
2
+ composes: d-uppercase d-cursor-pointer d-no-underline from global;
3
3
  letter-spacing: 0.6px;
4
- text-decoration: none;
5
4
  }
6
5
  .vertical {
7
6
  composes: d-h-full from global;
package/es/Tooltip/Tooltip.module.css CHANGED
@@ -26,7 +26,7 @@
26
26
  }
27
27
  .tooltiparrow {
28
28
  content: '';
29
- position: absolute;
29
+ composes: d-absolute from global;
30
30
  top: 0 ;
31
31
  border-top-left-radius: 3px;
32
32
  }
package/es/Typography/css/Typography.module.css CHANGED
@@ -51,7 +51,7 @@
51
51
  }
52
52
 
53
53
  .decoration_default {
54
- text-decoration: none;
54
+ composes: d-no-underline from global;
55
55
  }
56
56
 
57
57
  .decoration_underline {
package/es/common/basic.module.css CHANGED
@@ -2,7 +2,7 @@
2
2
  @font-face {
3
3
  font-family: Regular;
4
4
  src: url('https://static.zohocdn.com/webfonts/lato2light/font.woff2') format('woff2');
5
- font-weight: 300;
5
+ font-weight: 100 300;
6
6
  font-style: normal;
7
7
  font-display: swap;
8
8
  }
@@ -18,7 +18,7 @@
18
18
  @font-face {
19
19
  font-family: Regular;
20
20
  src: url('https://static.zohocdn.com/webfonts/lato2semibold/font.woff2') format('woff2');
21
- font-weight: 600;
21
+ font-weight: 500;
22
22
  font-style: normal;
23
23
  font-display: swap;
24
24
  }
@@ -26,7 +26,7 @@
26
26
  @font-face {
27
27
  font-family: Regular;
28
28
  src: url('https://static.zohocdn.com/webfonts/lato2bold/font.woff2') format('woff2');
29
- font-weight: 700;
29
+ font-weight: 600 900;
30
30
  font-style: normal;
31
31
  font-display: swap;
32
32
  }
@@ -51,7 +51,7 @@
51
51
  @font-face {
52
52
  font-family: Lato;
53
53
  src: url('https://static.zohocdn.com/webfonts/lato2semibold/font.woff2') format('woff2');
54
- font-weight: 500 600;
54
+ font-weight: 500;
55
55
  font-style: normal;
56
56
  font-display: swap;
57
57
  }
@@ -59,7 +59,7 @@
59
59
  @font-face {
60
60
  font-family: Lato;
61
61
  src: url('https://static.zohocdn.com/webfonts/lato2bold/font.woff2') format('woff2');
62
- font-weight: 700 900;
62
+ font-weight: 600 900;
63
63
  font-style: normal;
64
64
  font-display: swap;
65
65
  }
package/es/common/common.module.css CHANGED
@@ -1,7 +1,6 @@
1
1
  /*Font-smooth*/
2
2
  .ftsmooth {
3
- -moz-osx-font-smoothing: grayscale;
4
- -webkit-font-smoothing: antialiased;
3
+ composes: d-antialiased from global;
5
4
  }
6
5
 
7
6
  /* --Overflow Props-- */
@@ -427,6 +426,7 @@
427
426
  word-wrap: normal;
428
427
  }
429
428
 
429
+ /* stylelint-disable-next-line @zohodesk/use-common-class -- display:-webkit-box is required for -webkit-line-clamp, not d-flex */
430
430
  .clamp {
431
431
  composes: d-overflow-hidden from global;
432
432
  -webkit-line-clamp: 2;
@@ -440,8 +440,6 @@
440
440
 
441
441
  .offSelection {
442
442
  composes: d-select-none from global;
443
- -moz-user-select: none;
444
- -ms-user-select: none;
445
443
  }
446
444
 
447
445
  .disableFocus a,
@@ -458,12 +456,10 @@
458
456
 
459
457
  .fitContWidth {
460
458
  composes: d-w-fit from global;
461
- width: undefined ;
462
459
  }
463
460
 
464
461
  .fitContHeight {
465
462
  composes: d-h-fit from global;
466
- height: undefined ;
467
463
  }
468
464
 
469
465
  .whiteSpace_normal {
package/es/common/transition.module.css CHANGED
@@ -144,3 +144,5 @@
144
144
  .defaultLeave {
145
145
  display: block;
146
146
  }
147
+
148
+ /* stylelint-disable-next-line block-no-empty -- intentional empty transition class stubs */
package/es/semantic/Button/semanticButton.module.css CHANGED
@@ -1,6 +1,5 @@
1
1
  .buttonReset {
2
- composes: d-p-0 d-bg-inherit d-text-inherit d-outline-0 from global;
2
+ composes: d-p-0 d-bg-inherit d-text-inherit d-outline-0 d-text-align-inherit from global;
3
3
  font: inherit;
4
4
  border: inherit;
5
- text-align: inherit;
6
5
  }
package/es/v1/Button/css/Button_v1.module.css CHANGED
@@ -31,7 +31,6 @@
31
31
  transition-duration: var(--local-button-transition-duration);
32
32
  transition-timing-function: ease;
33
33
  cursor: var(--local-button-cursor);
34
- background-image: none;
35
34
  }
36
35
 
37
36
  .disabledPointer {
package/es/v1/Switch/css/Switch_v1.module.css CHANGED
@@ -1,7 +1,7 @@
1
1
  .container {
2
+ composes: d-gap-[6px] from global;
2
3
  --local-switch-cursor: pointer;
3
4
  --local-switch-offLabel-stroke: var(--zdt_v1_switch_offLabel);
4
- gap: var(--zd_size6) ;
5
5
  }
6
6
  .small {
7
7
  --local-switch-track-width: var(--zd_size22);
@@ -66,11 +66,10 @@
66
66
  opacity: 0.4;
67
67
  }
68
68
  .track {
69
- composes: d-block d-relative from global;
69
+ composes: d-block d-relative d-m-0 from global;
70
70
  appearance: none;
71
71
  height: var(--local-switch-track-height);
72
72
  width: var(--local-switch-track-width);
73
- margin: 0 ;
74
73
  border-radius: var(--local-switch-track-border-radius);
75
74
  background-color: var(--local-switch-track-background-color);
76
75
  cursor: var(--local-switch-cursor);
package/lib/Button/css/Button.module.css CHANGED
@@ -272,10 +272,9 @@
272
272
  }
273
273
 
274
274
  .overlay {
275
- composes: d-absolute from global;
275
+ composes: d-absolute d-bg-inherit from global;
276
276
  top: 0 ;
277
277
  bottom: 0 ;
278
- background-color: inherit;
279
278
  border-radius: inherit;
280
279
  }
281
280
 
package/lib/CheckBox/CheckBox.module.css CHANGED
@@ -53,7 +53,7 @@
53
53
  font-size: 0 ;
54
54
  }
55
55
  .tick {
56
- position: absolute;
56
+ composes: d-absolute from global;
57
57
  left: 0 ;
58
58
  }
59
59
  .mediumtick {
@@ -144,7 +144,7 @@
144
144
 
145
145
  .labelContainer {
146
146
  composes: dflex flexcolumn from '../common/common.module.css';
147
- gap: var(--zd_size4) ;
147
+ composes: d-gap-[4px] from global;
148
148
  margin-inline-start:var(--zd_size6) ;
149
149
  }
150
150
  @keyframes tickAnimate {
package/lib/DividerLine/css/DividerLine.module.css CHANGED
@@ -1,7 +1,6 @@
1
1
  .wrapper {
2
- flex-shrink: 0;
2
+ composes: d-flex-shrink-0 d-m-0 from global;
3
3
  border: none;
4
- margin: 0 ;
5
4
  }
6
5
 
7
6
  .horizontal {
package/lib/ListItem/ListItem.module.css CHANGED
@@ -28,13 +28,12 @@
28
28
  }
29
29
  .list {
30
30
  composes: varClass;
31
- composes: d-relative d-border-solid d-cursor-pointer from global;
31
+ composes: d-relative d-border-solid d-cursor-pointer d-no-underline from global;
32
32
  list-style: none;
33
33
  color: var(--listitem_text_color);
34
34
  font-size: var(--listitem_font_size);
35
35
  height: var(--listitem_height);
36
36
  min-height: var(--listitem_min_height);
37
- text-decoration: none;
38
37
  padding: var(--listitem_padding);
39
38
  border-width: var(--listitem_border_width);
40
39
  border-color: var(--listitem_border_color);
package/lib/Radio/Radio.module.css CHANGED
@@ -133,7 +133,7 @@
133
133
 
134
134
  .labelContainer {
135
135
  composes: dflex flexcolumn from '../common/common.module.css';
136
- gap: var(--zd_size4) ;
136
+ composes: d-gap-[4px] from global;
137
137
  margin: var(--radio_label_margin);
138
138
  }
139
139
 
package/lib/Tab/Tab.module.css CHANGED
@@ -1,7 +1,6 @@
1
1
  .tab {
2
- composes: d-uppercase d-cursor-pointer from global;
2
+ composes: d-uppercase d-cursor-pointer d-no-underline from global;
3
3
  letter-spacing: 0.6px;
4
- text-decoration: none;
5
4
  }
6
5
  .vertical {
7
6
  composes: d-h-full from global;
package/lib/Tooltip/Tooltip.module.css CHANGED
@@ -26,7 +26,7 @@
26
26
  }
27
27
  .tooltiparrow {
28
28
  content: '';
29
- position: absolute;
29
+ composes: d-absolute from global;
30
30
  top: 0 ;
31
31
  border-top-left-radius: 3px;
32
32
  }
package/lib/Typography/css/Typography.module.css CHANGED
@@ -51,7 +51,7 @@
51
51
  }
52
52
 
53
53
  .decoration_default {
54
- text-decoration: none;
54
+ composes: d-no-underline from global;
55
55
  }
56
56
 
57
57
  .decoration_underline {
package/lib/common/basic.module.css CHANGED
@@ -2,7 +2,7 @@
2
2
  @font-face {
3
3
  font-family: Regular;
4
4
  src: url('https://static.zohocdn.com/webfonts/lato2light/font.woff2') format('woff2');
5
- font-weight: 300;
5
+ font-weight: 100 300;
6
6
  font-style: normal;
7
7
  font-display: swap;
8
8
  }
@@ -18,7 +18,7 @@
18
18
  @font-face {
19
19
  font-family: Regular;
20
20
  src: url('https://static.zohocdn.com/webfonts/lato2semibold/font.woff2') format('woff2');
21
- font-weight: 600;
21
+ font-weight: 500;
22
22
  font-style: normal;
23
23
  font-display: swap;
24
24
  }
@@ -26,7 +26,7 @@
26
26
  @font-face {
27
27
  font-family: Regular;
28
28
  src: url('https://static.zohocdn.com/webfonts/lato2bold/font.woff2') format('woff2');
29
- font-weight: 700;
29
+ font-weight: 600 900;
30
30
  font-style: normal;
31
31
  font-display: swap;
32
32
  }
@@ -51,7 +51,7 @@
51
51
  @font-face {
52
52
  font-family: Lato;
53
53
  src: url('https://static.zohocdn.com/webfonts/lato2semibold/font.woff2') format('woff2');
54
- font-weight: 500 600;
54
+ font-weight: 500;
55
55
  font-style: normal;
56
56
  font-display: swap;
57
57
  }
@@ -59,7 +59,7 @@
59
59
  @font-face {
60
60
  font-family: Lato;
61
61
  src: url('https://static.zohocdn.com/webfonts/lato2bold/font.woff2') format('woff2');
62
- font-weight: 700 900;
62
+ font-weight: 600 900;
63
63
  font-style: normal;
64
64
  font-display: swap;
65
65
  }
package/lib/common/common.module.css CHANGED
@@ -1,7 +1,6 @@
1
1
  /*Font-smooth*/
2
2
  .ftsmooth {
3
- -moz-osx-font-smoothing: grayscale;
4
- -webkit-font-smoothing: antialiased;
3
+ composes: d-antialiased from global;
5
4
  }
6
5
 
7
6
  /* --Overflow Props-- */
@@ -427,6 +426,7 @@
427
426
  word-wrap: normal;
428
427
  }
429
428
 
429
+ /* stylelint-disable-next-line @zohodesk/use-common-class -- display:-webkit-box is required for -webkit-line-clamp, not d-flex */
430
430
  .clamp {
431
431
  composes: d-overflow-hidden from global;
432
432
  -webkit-line-clamp: 2;
@@ -440,8 +440,6 @@
440
440
 
441
441
  .offSelection {
442
442
  composes: d-select-none from global;
443
- -moz-user-select: none;
444
- -ms-user-select: none;
445
443
  }
446
444
 
447
445
  .disableFocus a,
@@ -458,12 +456,10 @@
458
456
 
459
457
  .fitContWidth {
460
458
  composes: d-w-fit from global;
461
- width: undefined ;
462
459
  }
463
460
 
464
461
  .fitContHeight {
465
462
  composes: d-h-fit from global;
466
- height: undefined ;
467
463
  }
468
464
 
469
465
  .whiteSpace_normal {
package/lib/common/transition.module.css CHANGED
@@ -144,3 +144,5 @@
144
144
  .defaultLeave {
145
145
  display: block;
146
146
  }
147
+
148
+ /* stylelint-disable-next-line block-no-empty -- intentional empty transition class stubs */
package/lib/semantic/Button/semanticButton.module.css CHANGED
@@ -1,6 +1,5 @@
1
1
  .buttonReset {
2
- composes: d-p-0 d-bg-inherit d-text-inherit d-outline-0 from global;
2
+ composes: d-p-0 d-bg-inherit d-text-inherit d-outline-0 d-text-align-inherit from global;
3
3
  font: inherit;
4
4
  border: inherit;
5
- text-align: inherit;
6
5
  }
package/lib/v1/Button/css/Button_v1.module.css CHANGED
@@ -31,7 +31,6 @@
31
31
  transition-duration: var(--local-button-transition-duration);
32
32
  transition-timing-function: ease;
33
33
  cursor: var(--local-button-cursor);
34
- background-image: none;
35
34
  }
36
35
 
37
36
  .disabledPointer {
package/lib/v1/Switch/css/Switch_v1.module.css CHANGED
@@ -1,7 +1,7 @@
1
1
  .container {
2
+ composes: d-gap-[6px] from global;
2
3
  --local-switch-cursor: pointer;
3
4
  --local-switch-offLabel-stroke: var(--zdt_v1_switch_offLabel);
4
- gap: var(--zd_size6) ;
5
5
  }
6
6
  .small {
7
7
  --local-switch-track-width: var(--zd_size22);
@@ -66,11 +66,10 @@
66
66
  opacity: 0.4;
67
67
  }
68
68
  .track {
69
- composes: d-block d-relative from global;
69
+ composes: d-block d-relative d-m-0 from global;
70
70
  appearance: none;
71
71
  height: var(--local-switch-track-height);
72
72
  width: var(--local-switch-track-width);
73
- margin: 0 ;
74
73
  border-radius: var(--local-switch-track-border-radius);
75
74
  background-color: var(--local-switch-track-background-color);
76
75
  cursor: var(--local-switch-cursor);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zohodesk/components",
3
- "version": "1.6.29",
3
+ "version": "1.6.31",
4
4
  "main": "lib/index.js",
5
5
  "module": "es/index.js",
6
6
  "private": false,
@@ -17,6 +17,7 @@
17
17
  "LIBRARY"
18
18
  ],
19
19
  "scripts": {
20
+ "lint:css": "cd ../ && npx stylelint components/src/**/*.css",
20
21
  "lintAllFix": "npm run lintAll --eslint:fix=true",
21
22
  "lint": "npx eslint ./src",
22
23
  "clean": "cdt clean build unittest test-slices coverage es lib assets && mkdir assets",
@@ -48,7 +49,7 @@
48
49
  "variable:addignore": "npx css-variable-migrator addignore ./src",
49
50
  "variable:convert": "npx css-variable-migrator convert ./src",
50
51
  "variable:check": "npx css-variable-migrator check ./src",
51
- "css:review": " npm run dubCheck && npm run css:lineheight:validate && npm run theme:validate ",
52
+ "css:review": " npm run lint:css && npm run dubCheck && npm run css:lineheight:validate && npm run theme:validate ",
52
53
  "theme:validate": "npx z-node-plugins theme:validate ./src ./.cli ./.cli/themeValidate/stringContains.js",
53
54
  "theme:addignore": "npx z-node-plugins theme:addignore ./src ./.cli ./.cli/themeValidate/stringContains.js",
54
55
  "theme:removeignore": "npx z-node-plugins theme:removeignore ./src ./.cli",
@@ -77,15 +78,15 @@
77
78
  "@zohodesk-private/css-variable-migrator": "1.0.12",
78
79
  "@zohodesk-private/node-plugins": "1.1.16",
79
80
  "@zohodesk-private/react-prop-validator": "1.2.4",
80
- "@zohodesk/a11y": "2.3.9",
81
+ "@zohodesk/a11y": "2.3.10",
81
82
  "@zohodesk/docstool": "1.0.0-alpha-2",
82
83
  "@zohodesk/dotkit": "1.0.10",
83
84
  "@zohodesk/hooks": "2.0.8",
84
- "@zohodesk/icons": "1.4.0",
85
- "@zohodesk/layout": "3.2.3",
85
+ "@zohodesk/icons": "1.4.1",
86
+ "@zohodesk/layout": "3.2.4",
86
87
  "@zohodesk/svg": "1.4.1",
87
88
  "@zohodesk/utils": "1.3.16",
88
- "@zohodesk/variables": "1.3.2",
89
+ "@zohodesk/variables": "1.3.3",
89
90
  "@zohodesk/virtualizer": "1.0.13",
90
91
  "react-sortable-hoc": "^0.8.3",
91
92
  "velocity-react": "1.4.3",
@@ -93,7 +94,7 @@
93
94
  "@zohodesk/client_build_tool": "0.0.23",
94
95
  "color": "4.2.3",
95
96
  "@zohodesk/jsx_attribute_wrapper": "1.0.0",
96
- "@dot-system/css-utility": "0.1.5",
97
+ "@dot-system/css-utility": "0.1.6",
97
98
  "@zohodesk-private/client_deployment_tool": "0.0.7",
98
99
  "@babel/preset-react": "7.29.7",
99
100
  "@zohodesk/testinglibrary": "4.1.16"
@@ -105,18 +106,18 @@
105
106
  "selectn": "1.1.2"
106
107
  },
107
108
  "peerDependencies": {
108
- "@zohodesk/icons": "1.4.0",
109
- "@zohodesk/variables": "1.3.2",
109
+ "@zohodesk/icons": "1.4.1",
110
+ "@zohodesk/variables": "1.3.3",
110
111
  "@zohodesk/svg": "1.4.1",
111
112
  "@zohodesk/virtualizer": "1.0.13",
112
113
  "velocity-react": "1.4.3",
113
114
  "react-sortable-hoc": "^0.8.3",
114
115
  "@zohodesk/hooks": "2.0.8",
115
116
  "@zohodesk/utils": "1.3.16",
116
- "@zohodesk/a11y": "2.3.9",
117
- "@zohodesk/layout": "3.2.3",
117
+ "@zohodesk/a11y": "2.3.10",
118
+ "@zohodesk/layout": "3.2.4",
118
119
  "@zohodesk/dotkit": "1.0.10",
119
120
  "color": "4.2.3",
120
- "@dot-system/css-utility": "0.1.5"
121
+ "@dot-system/css-utility": "0.1.6"
121
122
  }
122
- }
123
+ }