cx 26.0.6 → 26.0.9

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 (134) hide show
  1. package/build/charts/Bar.scss +29 -0
  2. package/build/charts/BarGraph.scss +29 -0
  3. package/build/charts/BubbleGraph.scss +32 -0
  4. package/build/charts/Column.scss +29 -0
  5. package/build/charts/ColumnGraph.scss +30 -0
  6. package/build/charts/Gridlines.scss +25 -0
  7. package/build/charts/Legend.scss +50 -0
  8. package/build/charts/LegendEntry.scss +29 -0
  9. package/build/charts/LineGraph.d.ts +11 -0
  10. package/build/charts/LineGraph.js +1 -0
  11. package/build/charts/LineGraph.scss +25 -0
  12. package/build/charts/Marker.scss +44 -0
  13. package/build/charts/MarkerLine.scss +20 -0
  14. package/build/charts/PieChart.scss +29 -0
  15. package/build/charts/Range.scss +20 -0
  16. package/build/charts/RangeMarker.scss +17 -0
  17. package/build/charts/ScatterGraph.scss +24 -0
  18. package/build/charts/Swimlane.scss +16 -0
  19. package/build/charts/Swimlanes.scss +16 -0
  20. package/build/charts/axis/Axis.scss +23 -0
  21. package/build/charts/axis/CategoryAxis.scss +35 -0
  22. package/build/charts/axis/NumericAxis.scss +35 -0
  23. package/build/charts/axis/TimeAxis.scss +34 -0
  24. package/build/charts/axis/index.scss +5 -0
  25. package/build/charts/axis/variables.scss +3 -0
  26. package/build/charts/index.scss +22 -0
  27. package/build/charts/palette.scss +97 -0
  28. package/build/charts/variables.scss +22 -0
  29. package/build/global.scss +14 -0
  30. package/build/index.scss +6 -0
  31. package/build/jsx-runtime.d.ts +3 -2
  32. package/build/svg/Svg.scss +28 -0
  33. package/build/svg/index.scss +9 -0
  34. package/build/ui/index.scss +2 -0
  35. package/build/ui/layout/LabelsLeftLayout.scss +47 -0
  36. package/build/ui/layout/LabelsTopLayout.scss +65 -0
  37. package/build/ui/layout/index.scss +3 -0
  38. package/build/ui/layout/variables.scss +2 -0
  39. package/build/ui/variables.scss +2 -0
  40. package/build/util/addEventListenerWithOptions.d.ts +2 -2
  41. package/build/util/call-once.scss +7 -0
  42. package/build/util/index.scss +11 -0
  43. package/build/util/scss/add-rules.scss +40 -0
  44. package/build/util/scss/calc.scss +45 -0
  45. package/build/util/scss/call-once.scss +13 -0
  46. package/build/util/scss/clockwise.scss +49 -0
  47. package/build/util/scss/colors.scss +10 -0
  48. package/build/util/scss/deep-get.scss +12 -0
  49. package/build/util/scss/deep-merge.scss +21 -0
  50. package/build/util/scss/divide.scss +3 -0
  51. package/build/util/scss/include.scss +48 -0
  52. package/build/util/scss/index.scss +9 -0
  53. package/build/variables.scss +217 -0
  54. package/build/widgets/Button.scss +119 -0
  55. package/build/widgets/Button.variables.scss +117 -0
  56. package/build/widgets/CxCredit.scss +39 -0
  57. package/build/widgets/FlexBox.scss +148 -0
  58. package/build/widgets/Heading.scss +40 -0
  59. package/build/widgets/HighlightedSearchText.scss +20 -0
  60. package/build/widgets/Icon.scss +22 -0
  61. package/build/widgets/List.scss +93 -0
  62. package/build/widgets/ProgressBar.scss +51 -0
  63. package/build/widgets/Resizer.scss +44 -0
  64. package/build/widgets/Section.scss +56 -0
  65. package/build/widgets/animations.scss +11 -0
  66. package/build/widgets/drag-drop/DragClone.scss +36 -0
  67. package/build/widgets/drag-drop/DragHandle.scss +19 -0
  68. package/build/widgets/drag-drop/DragSource.scss +27 -0
  69. package/build/widgets/drag-drop/DropZone.scss +77 -0
  70. package/build/widgets/drag-drop/index.scss +4 -0
  71. package/build/widgets/drag-drop/variables.scss +15 -0
  72. package/build/widgets/form/Calendar.scss +199 -0
  73. package/build/widgets/form/Calendar.variables.scss +64 -0
  74. package/build/widgets/form/Checkbox.scss +129 -0
  75. package/build/widgets/form/Checkbox.variables.scss +40 -0
  76. package/build/widgets/form/ColorField.scss +98 -0
  77. package/build/widgets/form/ColorPicker.scss +285 -0
  78. package/build/widgets/form/ColorPicker.variables.scss +22 -0
  79. package/build/widgets/form/DateTimeField.scss +92 -0
  80. package/build/widgets/form/DateTimePicker.scss +47 -0
  81. package/build/widgets/form/Field.scss +164 -0
  82. package/build/widgets/form/HelpText.scss +24 -0
  83. package/build/widgets/form/Label.scss +38 -0
  84. package/build/widgets/form/LookupField.scss +221 -0
  85. package/build/widgets/form/MonthField.scss +100 -0
  86. package/build/widgets/form/MonthPicker.scss +125 -0
  87. package/build/widgets/form/NumberField.scss +63 -0
  88. package/build/widgets/form/Radio.scss +123 -0
  89. package/build/widgets/form/Radio.variables.scss +46 -0
  90. package/build/widgets/form/Select.scss +101 -0
  91. package/build/widgets/form/Slider.scss +121 -0
  92. package/build/widgets/form/Switch.scss +142 -0
  93. package/build/widgets/form/TextArea.scss +45 -0
  94. package/build/widgets/form/TextField.scss +57 -0
  95. package/build/widgets/form/UploadButton.scss +49 -0
  96. package/build/widgets/form/ValidationError.scss +23 -0
  97. package/build/widgets/form/Wheel.scss +152 -0
  98. package/build/widgets/form/index.scss +24 -0
  99. package/build/widgets/form/variables.scss +355 -0
  100. package/build/widgets/grid/Grid.scss +640 -0
  101. package/build/widgets/grid/Pagination.scss +115 -0
  102. package/build/widgets/grid/TreeNode.scss +90 -0
  103. package/build/widgets/grid/index.scss +4 -0
  104. package/build/widgets/grid/variables.scss +137 -0
  105. package/build/widgets/index.scss +16 -0
  106. package/build/widgets/nav/Link.scss +20 -0
  107. package/build/widgets/nav/Menu.scss +76 -0
  108. package/build/widgets/nav/Menu.variables.scss +25 -0
  109. package/build/widgets/nav/MenuItem.d.ts +1 -0
  110. package/build/widgets/nav/MenuItem.scss +130 -0
  111. package/build/widgets/nav/Scroller.scss +148 -0
  112. package/build/widgets/nav/Tab.scss +82 -0
  113. package/build/widgets/nav/Tab.variables.scss +84 -0
  114. package/build/widgets/nav/cover.scss +22 -0
  115. package/build/widgets/nav/index.scss +6 -0
  116. package/build/widgets/nav/variables.scss +27 -0
  117. package/build/widgets/overlay/Dropdown.scss +186 -0
  118. package/build/widgets/overlay/Overlay.scss +68 -0
  119. package/build/widgets/overlay/Toast.scss +164 -0
  120. package/build/widgets/overlay/Tooltip.scss +177 -0
  121. package/build/widgets/overlay/Window.scss +129 -0
  122. package/build/widgets/overlay/Window.variables.scss +62 -0
  123. package/build/widgets/overlay/captureMouse.scss +13 -0
  124. package/build/widgets/overlay/index.scss +15 -0
  125. package/build/widgets/overlay/variables.scss +85 -0
  126. package/build/widgets/variables.scss +146 -0
  127. package/build.js +4 -0
  128. package/dist/charts.js +1 -0
  129. package/dist/manifest.js +876 -770
  130. package/package.json +4 -2
  131. package/src/charts/LineGraph.tsx +14 -0
  132. package/src/jsx-runtime.ts +8 -5
  133. package/src/util/addEventListenerWithOptions.ts +41 -41
  134. package/src/widgets/nav/MenuItem.tsx +1 -0
@@ -0,0 +1,142 @@
1
+ @use "sass:map";
2
+
3
+ @mixin cx-switch(
4
+ $name: "switch",
5
+ $state-style-map: $cx-input-state-style-map,
6
+ $styles: $cx-switch-handle-styles,
7
+ $width: $cx-default-switch-width,
8
+ $handle-size: $cx-default-switch-handle-size,
9
+ $axis-size: $cx-default-switch-axis-size,
10
+ $axis-background-color: $cx-default-switch-axis-background-color,
11
+ $range-background-color: $cx-default-switch-range-background-color,
12
+ $empty-text: $cx-empty-text,
13
+ $besm: $cx-besm
14
+ ) {
15
+ $block: map.get($besm, block);
16
+ $element: map.get($besm, element);
17
+ $state: map.get($besm, state);
18
+
19
+ $padding: cx-get-state-rule($state-style-map, default, padding);
20
+ $border-width: cx-get-state-rule($state-style-map, default, border-width);
21
+
22
+ $outer-styles: cx-deep-map-merge(
23
+ $state-style-map,
24
+ (
25
+ default: (
26
+ border-width: cx-top($border-width) 0 cx-bottom($border-width) 0,
27
+ padding: cx-top($padding) 0 cx-bottom($padding) 0,
28
+ ),
29
+ )
30
+ );
31
+
32
+ .#{$block}#{$name} {
33
+ cursor: pointer;
34
+ min-width: cx-calc($width, $handle-size);
35
+ -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
36
+
37
+ @include cxb-field($besm, $outer-styles, $input: false, $box: true);
38
+
39
+ &.#{$state}disabled {
40
+ pointer-events: none;
41
+ opacity: 0.5;
42
+ }
43
+
44
+ &:focus {
45
+ outline: none;
46
+ }
47
+ }
48
+
49
+ .#{$element}#{$name}-text {
50
+ display: inline-block;
51
+ margin-left: cx-calc($width, $handle-size);
52
+ padding: 0 cx-right($padding) 0 cx-left($padding);
53
+ }
54
+
55
+ .#{$element}#{$name}-empty-text {
56
+ @include cxe-field-empty-text($empty-text);
57
+ }
58
+
59
+ .#{$element}#{$name}-axis {
60
+ user-select: none;
61
+ position: absolute;
62
+ background-color: $axis-background-color;
63
+ border-radius: $axis-size * 0.5;
64
+ box-sizing: border-box;
65
+ width: $width;
66
+
67
+ left: $handle-size * 0.5;
68
+ right: $handle-size * 0.5;
69
+ top: calc(50% - #{$axis-size * 0.5});
70
+ height: $axis-size;
71
+ padding: 0 $axis-size * 0.5;
72
+ }
73
+
74
+ .#{$element}#{$name}-space {
75
+ position: relative;
76
+ box-sizing: border-box;
77
+ width: 100%;
78
+ height: 100%;
79
+ }
80
+
81
+ .#{$element}#{$name}-range {
82
+ position: absolute;
83
+ background-color: $range-background-color;
84
+ border-radius: $axis-size * 0.5;
85
+ height: 100%;
86
+ left: 0;
87
+ width: 0;
88
+ opacity: 0;
89
+ transform: scale(0);
90
+
91
+ transition: all 200ms;
92
+
93
+ .#{$state}on & {
94
+ width: 100%;
95
+ opacity: 1;
96
+ transform: none;
97
+ }
98
+ }
99
+
100
+ .#{$element}#{$name}-handle {
101
+ position: absolute;
102
+ box-sizing: border-box;
103
+ width: $handle-size;
104
+ height: $handle-size;
105
+ margin-left: -$handle-size * 0.5;
106
+ margin-top: -$handle-size * 0.5;
107
+ left: 0;
108
+ top: 50%;
109
+ transition: left 200ms;
110
+
111
+ @include cx-add-state-rules($styles, default);
112
+
113
+ .#{$state}on & {
114
+ left: 100%;
115
+ @include cx-add-state-rules($styles, on);
116
+ }
117
+
118
+ .#{$state}on:active & {
119
+ @include cx-add-state-rules($styles, on-active);
120
+ }
121
+
122
+ &:hover {
123
+ @include cx-add-state-rules($styles, hover);
124
+ }
125
+
126
+ .#{$block}#{$name}:focus & {
127
+ @include cx-add-state-rules($styles, focus);
128
+ }
129
+
130
+ .#{$block}#{$name}.#{$state}disabled & {
131
+ @include cx-add-state-rules($styles, disabled);
132
+ }
133
+
134
+ &:active {
135
+ @include cx-add-state-rules($styles, active);
136
+ }
137
+ }
138
+ }
139
+
140
+ @if (cx-should-include("cx/widgets/Switch")) {
141
+ @include cx-switch();
142
+ }
@@ -0,0 +1,45 @@
1
+ @use "sass:map";
2
+
3
+ @mixin cx-textarea(
4
+ $name: "textarea",
5
+ $state-style-map: $cx-textarea-state-style-map,
6
+ $placeholder: $cx-input-placeholder,
7
+ $empty-text: $cx-empty-text,
8
+ $tool-state-style-map: $cx-input-right-icon-state-style-map,
9
+ $icon-size: $cx-default-input-icon-size,
10
+ $width: $cx-default-textarea-width,
11
+ $besm: $cx-besm
12
+ ) {
13
+ $block: map.get($besm, block);
14
+ $element: map.get($besm, element);
15
+ $state: map.get($besm, state);
16
+ $mod: map.get($besm, mod);
17
+
18
+ .#{$block}#{$name} {
19
+ line-height: 0;
20
+ width: $width;
21
+ @include cxb-field($besm, $state-style-map, $input: false);
22
+ }
23
+
24
+ .#{$element}#{$name}-input {
25
+ width: 100%;
26
+ height: 100%;
27
+ @include cxe-field-input($besm, $state-style-map, $placeholder: $placeholder, $input: false);
28
+ }
29
+
30
+ .#{$element}#{$name}-tool {
31
+ @include cxe-field-button($besm, $tool-state-style-map);
32
+ }
33
+
34
+ .#{$element}#{$name}-icon {
35
+ @include cxe-field-button-icon($besm, $icon-size);
36
+ }
37
+
38
+ .#{$element}#{$name}-empty-text {
39
+ @include cxe-field-empty-text($empty-text);
40
+ }
41
+ }
42
+
43
+ @if (cx-should-include("cx/widgets/TextArea")) {
44
+ @include cx-textarea;
45
+ }
@@ -0,0 +1,57 @@
1
+ @use "sass:map";
2
+
3
+ @mixin cx-textfield(
4
+ $name: "textfield",
5
+ $state-style-map: $cx-std-field-state-style-map,
6
+ $placeholder: $cx-input-placeholder,
7
+ $empty-text: $cx-empty-text,
8
+ $left-icon-state-style-map: $cx-input-left-icon-state-style-map,
9
+ $clear-state-style-map: $cx-clear-state-style-map,
10
+ $icon-size: $cx-default-input-icon-size,
11
+ $width: $cx-default-input-width,
12
+ $besm: $cx-besm
13
+ ) {
14
+ $block: map.get($besm, block);
15
+ $element: map.get($besm, element);
16
+ $state: map.get($besm, state);
17
+ $mod: map.get($besm, mod);
18
+
19
+ .#{$block}#{$name} {
20
+ @include cxb-field($besm, $state-style-map, $width: $width, $input: true);
21
+ }
22
+
23
+ $padding: cx-get-state-rule($state-style-map, default, "padding");
24
+
25
+ .#{$element}#{$name}-input {
26
+ @include cxe-field-input($besm, $state-style-map, $placeholder: $placeholder);
27
+
28
+ .#{$state}icon > & {
29
+ padding-left: cx-calc(2 * cx-left($padding), $icon-size);
30
+ }
31
+
32
+ .#{$state}clear > & {
33
+ padding-right: cx-calc(cx-right($padding), $cx-default-clear-size, $cx-default-clear-spacing);
34
+ }
35
+ }
36
+
37
+ .#{$element}#{$name}-left-icon {
38
+ pointer-events: none;
39
+ @include cxe-field-button($besm, $left-icon-state-style-map);
40
+ }
41
+
42
+ .#{$element}#{$name}-clear {
43
+ @include cxe-field-button($besm, $clear-state-style-map);
44
+ }
45
+
46
+ .#{$element}#{$name}-icon {
47
+ @include cxe-field-button-icon($besm, $icon-size);
48
+ }
49
+
50
+ .#{$element}#{$name}-empty-text {
51
+ @include cxe-field-empty-text($empty-text);
52
+ }
53
+ }
54
+
55
+ @if (cx-should-include("cx/widgets/TextField")) {
56
+ @include cx-textfield();
57
+ }
@@ -0,0 +1,49 @@
1
+
2
+ @use "sass:map";
3
+
4
+ @import "../Button";
5
+
6
+ @mixin cx-uploadbutton(
7
+ $name: 'uploadbutton',
8
+ $state-style-map: $cx-button-state-style-map,
9
+ $mods: $cx-button-mods,
10
+ $besm: $cx-besm
11
+ ) {
12
+ $block: map.get($besm, block);
13
+ $element: map.get($besm, element);
14
+ $state: map.get($besm, state);
15
+
16
+ @include cx-button($name,
17
+ $mods: $mods,
18
+ $state-style-map: $state-style-map,
19
+ $besm: $besm
20
+ );
21
+
22
+ .#{$element}#{$name}-input {
23
+ position: absolute;
24
+ opacity: 0;
25
+ left: 0;
26
+ top: 0;
27
+ width: 100%;
28
+ height: 100%;
29
+ }
30
+
31
+ .#{$element}#{$name}-progress {
32
+ position: absolute;
33
+ left: 0;
34
+ top: 0;
35
+ bottom: 0;
36
+ width: 0;
37
+ background: rgba(8, 176, 255, 0.5);
38
+ outline: 1px solid rgba(8, 176, 255, 0.5);
39
+ transition: opacity 0.5s ease-in-out;
40
+
41
+ &.#{$state}done {
42
+ opacity: 0;
43
+ }
44
+ }
45
+ }
46
+
47
+ @if (cx-should-include('cx/widgets/UploadButton')) {
48
+ @include cx-uploadbutton();
49
+ }
@@ -0,0 +1,23 @@
1
+ @use "sass:map";
2
+
3
+ @mixin cx-validationerror(
4
+ $name: 'uploadbutton',
5
+ $besm: $cx-besm
6
+ ) {
7
+ $block: map.get($besm, block);
8
+ $element: map.get($besm, element);
9
+ $mod: map.get($besm, mod);
10
+
11
+ .#{$block}validationerror {
12
+ color: rgb(220, 0, 9);
13
+ font-size: smaller;
14
+
15
+ &.#{$mod}block {
16
+ display: block;
17
+ }
18
+ }
19
+ }
20
+
21
+ @if (cx-should-include('cx/widgets/ValidationError')) {
22
+ @include cx-validationerror();
23
+ }
@@ -0,0 +1,152 @@
1
+ @use "sass:map";
2
+
3
+ @mixin cx-wheel-elements(
4
+ $name: "wheel",
5
+ $tool-size: $cx-default-input-tool-size,
6
+ $icon-size: $cx-default-input-icon-size,
7
+ $besm: $cx-besm
8
+ ) {
9
+ $element: map.get($besm, element);
10
+ $state: map.get($besm, state);
11
+ $mod: map.get($besm, mod);
12
+
13
+ .#{$element}#{$name}-container {
14
+ position: relative;
15
+ display: inline-block;
16
+ padding: 30px 5px;
17
+ vertical-align: middle;
18
+ background: inherit;
19
+ text-align: center;
20
+ }
21
+
22
+ .#{$element}#{$name}-clip {
23
+ position: relative;
24
+ overflow: hidden;
25
+ background: inherit;
26
+ user-select: none;
27
+ background-color: $cx-default-wheel-clip-background-color;
28
+ border-style: solid;
29
+ border-width: $cx-default-wheel-clip-border-width;
30
+ border-radius: $cx-default-wheel-clip-border-radius;
31
+ border-color: $cx-default-wheel-clip-border-color;
32
+ }
33
+
34
+ .#{$element}#{$name}-mask {
35
+ position: absolute;
36
+ left: 0;
37
+ right: 0;
38
+ pointer-events: none;
39
+ background: inherit;
40
+ opacity: 0.6;
41
+ }
42
+
43
+ .#{$element}#{$name}-vscroll {
44
+ width: calc(100% + 20px);
45
+ display: flex;
46
+ overflow-y: auto;
47
+ overflow-x: hidden;
48
+ touch-action: pan-y;
49
+
50
+ &::-webkit-scrollbar {
51
+ display: none;
52
+ }
53
+ }
54
+
55
+ .#{$element}#{$name}-wheel {
56
+ }
57
+
58
+ .#{$element}#{$name}-option {
59
+ padding: 5px 15px;
60
+ flex: 0 0 auto;
61
+
62
+ &.cxs-dummy {
63
+ visibility: hidden;
64
+ }
65
+ }
66
+
67
+ .#{$element}#{$name}-selection {
68
+ position: absolute;
69
+ left: 0;
70
+ right: 0;
71
+ margin-top: -2px;
72
+ box-sizing: content-box;
73
+ pointer-events: none;
74
+ @include cx-add-state-rules($cx-wheel-selection-state-style-map, default);
75
+ }
76
+
77
+ .#{$element}#{$name}-container.#{$state}active .#{$element}#{$name}-selection {
78
+ @include cx-add-state-rules($cx-wheel-selection-state-style-map, active);
79
+ }
80
+
81
+ .#{$element}#{$name}-arrow-up,
82
+ .#{$element}#{$name}-arrow-down {
83
+ position: absolute;
84
+ left: 50%;
85
+ margin-left: -($tool-size * 0.5);
86
+ width: $tool-size;
87
+ height: $tool-size;
88
+ opacity: 0.5;
89
+ cursor: pointer;
90
+
91
+ &:hover {
92
+ opacity: 1;
93
+ }
94
+ }
95
+
96
+ .#{$element}#{$name}-arrow-down {
97
+ bottom: 5px;
98
+ }
99
+
100
+ .#{$element}#{$name}-arrow-up {
101
+ transform: rotate(180deg);
102
+ top: 5px;
103
+ }
104
+
105
+ .#{$element}#{$name}-arrow-icon {
106
+ position: absolute;
107
+ left: 50%;
108
+ top: 50%;
109
+ margin-left: -$icon-size * 0.5;
110
+ margin-top: -$icon-size * 0.5;
111
+ width: $icon-size;
112
+ height: $icon-size;
113
+ }
114
+ }
115
+
116
+ @mixin cx-wheel(
117
+ $name: "wheel",
118
+ $tool-size: $cx-default-input-tool-size,
119
+ $icon-size: $cx-default-input-icon-size,
120
+ $besm: $cx-besm
121
+ ) {
122
+ $block: map.get($besm, block);
123
+ $element: map.get($besm, element);
124
+ $state: map.get($besm, state);
125
+ $mod: map.get($besm, mod);
126
+
127
+ .#{$block}#{$name} {
128
+ display: inline-block;
129
+ text-align: center;
130
+ padding: 30px 5px;
131
+ vertical-align: middle;
132
+ background: inherit;
133
+ position: relative;
134
+ font-size: 14px;
135
+ user-select: none;
136
+
137
+ &:focus {
138
+ outline: 0;
139
+
140
+ .#{$element}#{$name}-selection {
141
+ border-color: #3c7eff;
142
+ background: rgba(#3c7eff, 0.1);
143
+ }
144
+ }
145
+ }
146
+
147
+ @include cx-wheel-elements($name, $tool-size, $icon-size, $besm);
148
+ }
149
+
150
+ @if (cx-should-include("cx/widgets/Wheel")) {
151
+ @include cx-wheel();
152
+ }
@@ -0,0 +1,24 @@
1
+
2
+ @import "Field";
3
+ @import "Label";
4
+ @import "TextField";
5
+ @import "NumberField";
6
+ @import "Calendar";
7
+ @import "LookupField";
8
+ @import "Select";
9
+ @import "TextArea";
10
+ @import "Checkbox";
11
+ @import "Radio";
12
+ @import "ColorPicker";
13
+ @import "ColorField";
14
+ @import "MonthPicker";
15
+ @import "MonthField";
16
+ @import "UploadButton";
17
+ @import "Slider";
18
+ @import "ValidationError";
19
+ @import "Switch";
20
+ @import "HelpText";
21
+ @import "Wheel";
22
+ @import "DateTimePicker";
23
+ @import "DateTimeField";
24
+