matcha-theme 19.55.0 → 19.57.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.
@@ -112,7 +112,7 @@
112
112
  .mat-sort,
113
113
  .mat-expansion-panel {
114
114
  thead {
115
- background: map-get($background, card);
115
+ background: getSurface($theme);
116
116
 
117
117
  th {
118
118
  height: 64px;
@@ -123,7 +123,7 @@
123
123
  &.mat-row {
124
124
  // &:nth-child(even){background: map-get($background, card);}
125
125
  &:nth-child(odd) {
126
- background: map-get($background, background-alpha);
126
+ background: getBackgroundAlpha($theme);
127
127
  }
128
128
  }
129
129
 
@@ -188,7 +188,7 @@
188
188
  }
189
189
 
190
190
  .mat-header-cell {
191
- color: map-get($foreground, text);
191
+ color: getForeground($theme);
192
192
  font-family: "CircularStd";
193
193
  font-weight: 700;
194
194
  font-size: 16px;
@@ -198,7 +198,7 @@
198
198
  }
199
199
 
200
200
  .mat-cell {
201
- color: map-get($foreground, label);
201
+ color: getBlueGrey($theme);
202
202
  font-size: 14px;
203
203
  padding-left: 8px;
204
204
  padding-right: 8px;
package/main.scss CHANGED
@@ -42,6 +42,7 @@
42
42
  @import "./components/matcha-spin.scss"; // matcha-spin-theme($theme)
43
43
  @import "./components/matcha-hint-text.scss"; // matcha-hint-theme($theme)
44
44
  @import "./components/matcha-tabs.scss"; // matcha-tabs($theme)
45
+ @import "./components/matcha-modal.scss"; // matcha-modal($theme)
45
46
  // VENDORS
46
47
  @import "./vendors/angular-editor.scss";
47
48
  @import "./vendors/angular-material-fixes.scss";
@@ -143,4 +144,5 @@
143
144
  @include matcha-spin($theme);
144
145
  @include matcha-hint-text($theme);
145
146
  @include matcha-tabs($theme);
147
+ @include matcha-modal-theme($theme);
146
148
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "matcha-theme",
3
- "version": "19.55.0",
3
+ "version": "19.57.0",
4
4
  "description": "Themes for matcha-design-system",
5
5
  "main": "main.scss",
6
6
  "scripts": {
@@ -22,9 +22,7 @@ $color-base-red-a100: #ff8a80;
22
22
  $color-base-red-a200: #ff5252;
23
23
  $color-base-red-a400: #ff1744;
24
24
  $color-base-red-a700: #d50000;
25
- $color-base-red-200-alpha: #f29d9d33;
26
- $color-base-red-500-alpha: #e53a3a33;
27
- $color-base-red-900-alpha: #d3181833;
25
+
28
26
  $color-base-pink-50: #fce4ec;
29
27
  $color-base-pink-100: #f8bbd0;
30
28
  $color-base-pink-200: #f48fb1;
@@ -39,8 +37,7 @@ $color-base-pink-a100: #ff80ab;
39
37
  $color-base-pink-a200: #ff4081;
40
38
  $color-base-pink-a400: #f50057;
41
39
  $color-base-pink-a700: #c51162;
42
- $color-base-pink-200-alpha: #f48fb133;
43
- $color-base-pink-600-alpha: #d81b6033;
40
+
44
41
  $color-base-purple-50: #f3e6ff;
45
42
  $color-base-purple-100: #e1bee7;
46
43
  $color-base-purple-200: #ce93d8;
@@ -55,8 +52,7 @@ $color-base-purple-a100: #ea80fc;
55
52
  $color-base-purple-a200: #e040fb;
56
53
  $color-base-purple-a400: #d500f9;
57
54
  $color-base-purple-a700: #aa00ff;
58
- $color-base-purple-200-alpha: #ce93d833;
59
- $color-base-purple-500-alpha: #9c27b033;
55
+
60
56
  $color-base-deep-purple-50: #ede7f6;
61
57
  $color-base-deep-purple-100: #d1c4e9;
62
58
  $color-base-deep-purple-200: #b39ddb;
@@ -71,8 +67,7 @@ $color-base-deep-purple-a100: #cf97ff;
71
67
  $color-base-deep-purple-a200: #be73ff;
72
68
  $color-base-deep-purple-a400: #9f2eff;
73
69
  $color-base-deep-purple-a700: #7212ff;
74
- $color-base-deep-purple-200-alpha: #b39ddb33;
75
- $color-base-deep-purple-500-alpha: #673ab733;
70
+
76
71
  $color-base-indigo-50: #e8eaf6;
77
72
  $color-base-indigo-100: #c5cae9;
78
73
  $color-base-indigo-200: #9fa8da;
@@ -87,8 +82,7 @@ $color-base-indigo-a100: #8c9eff;
87
82
  $color-base-indigo-a200: #536dfe;
88
83
  $color-base-indigo-a400: #3d5afe;
89
84
  $color-base-indigo-a700: #304ffe;
90
- $color-base-indigo-200-alpha: #9fa8da33;
91
- $color-base-indigo-500-alpha: #3f51b533;
85
+
92
86
  $color-base-blue-50: #e4ebfb;
93
87
  $color-base-blue-100: #bccef4;
94
88
  $color-base-blue-200: #8faded;
@@ -103,8 +97,7 @@ $color-base-blue-a100: #82b1ff;
103
97
  $color-base-blue-a200: #448aff;
104
98
  $color-base-blue-a400: #2979ff;
105
99
  $color-base-blue-a700: #2962ff;
106
- $color-base-blue-200-alpha: #8faded33;
107
- $color-base-blue-500-alpha: #1e5bda33;
100
+
108
101
  $color-base-light-blue-50: #e1f5fe;
109
102
  $color-base-light-blue-100: #b3e5fc;
110
103
  $color-base-light-blue-200: #81d4fa;
@@ -119,8 +112,7 @@ $color-base-light-blue-a100: #80d8ff;
119
112
  $color-base-light-blue-a200: #40c4ff;
120
113
  $color-base-light-blue-a400: #33b6ff;
121
114
  $color-base-light-blue-a700: #0091ea;
122
- $color-base-light-blue-200-alpha: #81d4fa33;
123
- $color-base-light-blue-500-alpha: #03a9f433;
115
+
124
116
  $color-base-cyan-50: #e0f7fa;
125
117
  $color-base-cyan-100: #b2ebf2;
126
118
  $color-base-cyan-200: #84e1eb;
@@ -135,8 +127,7 @@ $color-base-cyan-a100: #84ffff;
135
127
  $color-base-cyan-a200: #18ffff;
136
128
  $color-base-cyan-a400: #00e5ff;
137
129
  $color-base-cyan-a700: #00b8d4;
138
- $color-base-cyan-200-alpha: #84e1eb33;
139
- $color-base-cyan-500-alpha: #00bcd433;
130
+
140
131
  $color-base-teal-50: #e0f2f1;
141
132
  $color-base-teal-100: #b2dfdb;
142
133
  $color-base-teal-200: #80cbc4;
@@ -151,8 +142,7 @@ $color-base-teal-a100: #a7ffeb;
151
142
  $color-base-teal-a200: #64ffda;
152
143
  $color-base-teal-a400: #1de9b6;
153
144
  $color-base-teal-a700: #00bfa5;
154
- $color-base-teal-200-alpha: #80cbc433;
155
- $color-base-teal-500-alpha: #00968833;
145
+
156
146
  $color-base-green-50: #e2f2e9;
157
147
  $color-base-green-100: #b8dec8;
158
148
  $color-base-green-200: #88c8a3;
@@ -167,8 +157,7 @@ $color-base-green-a100: #b9f6ca;
167
157
  $color-base-green-a200: #69f0ae;
168
158
  $color-base-green-a400: #2cff5b;
169
159
  $color-base-green-a700: #13ff48;
170
- $color-base-green-200-alpha: #88c8a333;
171
- $color-base-green-500-alpha: #11904633;
160
+
172
161
  $color-base-light-green-50: #f1f8e9;
173
162
  $color-base-light-green-100: #dcedc8;
174
163
  $color-base-light-green-200: #c5e1a5;
@@ -183,8 +172,7 @@ $color-base-light-green-a100: #ccff90;
183
172
  $color-base-light-green-a200: #b2ff59;
184
173
  $color-base-light-green-a400: #76ff03;
185
174
  $color-base-light-green-a700: #64dd17;
186
- $color-base-light-green-200-alpha: #c5e1a533;
187
- $color-base-light-green-700-alpha: #689f3833;
175
+
188
176
  $color-base-lime-50: #f0f7e0;
189
177
  $color-base-lime-100: #dbebb3;
190
178
  $color-base-lime-200: #c3de80;
@@ -199,8 +187,7 @@ $color-base-lime-a100: #f4ff81;
199
187
  $color-base-lime-a200: #eeff41;
200
188
  $color-base-lime-a400: #c6ff00;
201
189
  $color-base-lime-a700: #aeea00;
202
- $color-base-lime-200-alpha: #c3de8033;
203
- $color-base-lime-500-alpha: #86bd0033;
190
+
204
191
  $color-base-yellow-50: #fcf8e0;
205
192
  $color-base-yellow-100: #f8edb3;
206
193
  $color-base-yellow-200: #f4e180;
@@ -215,8 +202,7 @@ $color-base-yellow-a100: #ffff8d;
215
202
  $color-base-yellow-a200: #ffff00;
216
203
  $color-base-yellow-a400: #ffea00;
217
204
  $color-base-yellow-a700: #ffd600;
218
- $color-base-yellow-200-alpha: #f4e18033;
219
- $color-base-yellow-500-alpha: #e8c30033;
205
+
220
206
  $color-base-amber-50: #fef4e4;
221
207
  $color-base-amber-100: #fee4ba;
222
208
  $color-base-amber-200: #fdd38d;
@@ -231,8 +217,7 @@ $color-base-amber-a100: #ffe57f;
231
217
  $color-base-amber-a200: #ffd740;
232
218
  $color-base-amber-a400: #ffc400;
233
219
  $color-base-amber-a700: #ffab00;
234
- $color-base-amber-200-alpha: #fdd38d33;
235
- $color-base-amber-500-alpha: #faa61a33;
220
+
236
221
  $color-base-orange-50: #feefe3;
237
222
  $color-base-orange-100: #fdd7b9;
238
223
  $color-base-orange-200: #fbbc8a;
@@ -247,8 +232,7 @@ $color-base-orange-a100: #ffd180;
247
232
  $color-base-orange-a200: #ffab40;
248
233
  $color-base-orange-a400: #ff9100;
249
234
  $color-base-orange-a700: #ff6d00;
250
- $color-base-orange-200-alpha: #fbbc8a33;
251
- $color-base-orange-500-alpha: #f7781433;
235
+
252
236
  $color-base-deep-orange-50: #fbe9e7;
253
237
  $color-base-deep-orange-100: #ffccbc;
254
238
  $color-base-deep-orange-200: #ffab91;
@@ -263,8 +247,7 @@ $color-base-deep-orange-a100: #ff9e80;
263
247
  $color-base-deep-orange-a200: #ff6e40;
264
248
  $color-base-deep-orange-a400: #ff3d00;
265
249
  $color-base-deep-orange-a700: #dd2c00;
266
- $color-base-deep-orange-200-alpha: #ffab9133;
267
- $color-base-deep-orange-500-alpha: #ff572233;
250
+
268
251
  $color-base-brown-50: #efebe9;
269
252
  $color-base-brown-100: #d7ccc8;
270
253
  $color-base-brown-200: #bcaaa4;
@@ -279,8 +262,7 @@ $color-base-brown-a100: $color-base-brown-100;
279
262
  $color-base-brown-a200: $color-base-brown-200;
280
263
  $color-base-brown-a400: $color-base-brown-400;
281
264
  $color-base-brown-a700: $color-base-brown-700;
282
- $color-base-brown-200-alpha: #bcaaa433;
283
- $color-base-brown-500-alpha: #79554833;
265
+
284
266
  $color-base-grey-50: #EFF1F2;
285
267
  $color-base-grey-100: #DEE3E6;
286
268
  $color-base-grey-200: #C8D0D5;
@@ -295,88 +277,51 @@ $color-base-grey-a100: #FFFFFF;
295
277
  $color-base-grey-a200: #E7EDF1;
296
278
  $color-base-grey-a400: #C0CEDA;
297
279
  $color-base-grey-a700: #98AFC2;
298
- $color-base-grey-200-alpha: #C8D0D533;
299
- $color-base-grey-500-alpha: #91A0AA33;
300
- $color-base-blue-grey-50: #f5f7fa;
301
- $color-base-blue-grey-100: #d4dde3;
302
- $color-base-blue-grey-200: #b5c1c8;
303
- $color-base-blue-grey-300: #a3b1b9;
304
- $color-base-blue-grey-400: #91a0aa;
305
- $color-base-blue-grey-500: #636f78;
306
- $color-base-blue-grey-600: #4c545a;
307
- $color-base-blue-grey-700: #3c4044;
308
- $color-base-blue-grey-800: #2b2c2d;
309
- $color-base-blue-grey-900: #1b1c1d;
310
- $color-base-blue-grey-a100: #acb4ba;
311
- $color-base-blue-grey-a200: #707f88;
312
- $color-base-blue-grey-a400: #435560;
313
- $color-base-blue-grey-a700: #223744;
314
- $color-base-blue-grey-200-alpha: #b5c1c833;
315
- $color-base-blue-grey-500-alpha: #636f7833;
316
- $color-base-light-grey-50: #fbfbfb;
317
- $color-base-light-grey-100: #f8f8f8;
318
- $color-base-light-grey-200: #f6f6f6;
319
- $color-base-light-grey-300: #f4f4f4;
320
- $color-base-light-grey-400: #f2f2f2;
321
- $color-base-light-grey-500: #f0f0f0;
322
- $color-base-light-grey-600: #efefef;
323
- $color-base-light-grey-700: #eeeeee;
324
- $color-base-light-grey-800: #ededed;
325
- $color-base-light-grey-900: #ececec;
280
+
281
+ $color-base-blue-grey-50: #FFFFFF;
282
+ $color-base-blue-grey-100: #E2E7E9; // disabled - light-theme
283
+ $color-base-blue-grey-200: #C4CFD4;
284
+ $color-base-blue-grey-300: #A7B6BE;
285
+ $color-base-blue-grey-400: #8A9EA8;
286
+ $color-base-blue-grey-500: #7E8E95;
287
+ $color-base-blue-grey-600: #5A6A72;
288
+ $color-base-blue-grey-700: #435056;
289
+ $color-base-blue-grey-800: #2B363B;
290
+ $color-base-blue-grey-900: #21282C;
291
+ $color-base-blue-grey-a100: $color-base-blue-grey-100;
292
+ $color-base-blue-grey-a200: $color-base-blue-grey-200;
293
+ $color-base-blue-grey-a400: $color-base-blue-grey-400;
294
+ $color-base-blue-grey-a700: $color-base-blue-grey-700;
295
+
296
+ $color-base-light-grey-50:#FFFFFF;
297
+ $color-base-light-grey-100:#F8F9FC;
298
+ $color-base-light-grey-200:#F2F3F8; // background - light-theme
299
+ $color-base-light-grey-300:#EAECF6;
300
+ $color-base-light-grey-400:#E2E5F3;
301
+ $color-base-light-grey-500:#DBDFF0;
302
+ $color-base-light-grey-600:#D4D8ED;
303
+ $color-base-light-grey-700:#CDD2EA;
304
+ $color-base-light-grey-800:#C6CBE7;
305
+ $color-base-light-grey-900:#BFC5E3;
326
306
  $color-base-light-grey-a100: $color-base-light-grey-100;
327
307
  $color-base-light-grey-a200: $color-base-light-grey-200;
328
308
  $color-base-light-grey-a400: $color-base-light-grey-400;
329
309
  $color-base-light-grey-a700: $color-base-light-grey-700;
330
- $color-base-light-grey-200-alpha: #f6f6f633;
331
- $color-base-light-grey-500-alpha: #f0f0f033;
332
- $color-base-dark-grey-50: #464646;
333
- $color-base-dark-grey-100: #3b3b3b;
334
- $color-base-dark-grey-200: #383838;
335
- $color-base-dark-grey-300: #303030;
336
- $color-base-dark-grey-400: #2b2b2b;
337
- $color-base-dark-grey-500: #282828;
338
- $color-base-dark-grey-600: #262626;
339
- $color-base-dark-grey-700: #1b1b1b;
340
- $color-base-dark-grey-800: #181818;
341
- $color-base-dark-grey-900: #161616;
310
+
311
+ $color-base-dark-grey-50: #2E2E2E;
312
+ $color-base-dark-grey-100: #292929;
313
+ $color-base-dark-grey-200: #242424;
314
+ $color-base-dark-grey-300: #1F1F1F;
315
+ $color-base-dark-grey-400: #1A1A1A;
316
+ $color-base-dark-grey-500: #141414;
317
+ $color-base-dark-grey-600: #0F0F0F;
318
+ $color-base-dark-grey-700: #0A0A0A;
319
+ $color-base-dark-grey-800: #050505;
320
+ $color-base-dark-grey-900: #000000;
342
321
  $color-base-dark-grey-a100: $color-base-dark-grey-100;
343
322
  $color-base-dark-grey-a200: $color-base-dark-grey-200;
344
323
  $color-base-dark-grey-a400: $color-base-dark-grey-400;
345
324
  $color-base-dark-grey-a700: $color-base-dark-grey-700;
346
- $color-base-dark-grey-200-alpha: #38383833;
347
- $color-base-dark-grey-500-alpha: #28282833;
348
- $color-base-white: #ffffff;
349
- $color-base-black: #000000;
350
- $color-brand-primary: #86bd00;
351
- $color-brand-primary-wl: #1e5bda;
352
- $color-feedback-error: #e53a3a;
353
- $color-feedback-error-light: #f29d9d;
354
- $color-feedback-error-dark: #d31818;
355
- $color-feedback-warning: #e8c300;
356
- $color-feedback-warning-light: #f4e180;
357
- $color-feedback-warning-dark: #d8a100;
358
- $color-feedback-success: #35a162;
359
- $color-feedback-success-light: #b8dec8;
360
- $color-feedback-success-dark: #0f883f;
361
- $color-graphic-blue: #1e5bda;
362
- $color-graphic-blue-light: #628ce5;
363
- $color-graphic-blue-dark: #1649d0;
364
- $color-graphic-cyan: #00bcd4;
365
- $color-graphic-cyan-light: #4dd0e1;
366
- $color-graphic-cyan-dark: #02a1bc;
367
- $color-graphic-purple: #9c27b0;
368
- $color-graphic-purple-light: #ba68c8;
369
- $color-graphic-purple-dark: #7b1fa2;
370
- $color-graphic-orange: #f77814;
371
- $color-graphic-orange-light: #f9a15b;
372
- $color-graphic-orange-dark: #f5650e;
373
- $color-font-base: #1b1c1d;
374
- $color-font-inverse: #ffffff;
375
- $color-font-primary: #86bd00;
376
- $color-font-primary-wl: #1e5bda;
377
- $color-font-label: #4c545a;
378
- $color-font-placeholder: #91a0aa;
379
- $color-font-disabled: #b5c1c8;
380
325
 
381
326
  // -------------------------------------------------------------------------------------------------------------------
382
327
  // @ Color maps
@@ -1124,41 +1069,43 @@ $dark-grey: $mat-dark-grey;
1124
1069
  // --------------------------------------------------------------------------------------------------------------------
1125
1070
 
1126
1071
  $light-theme-background-palette: (
1127
- background: $color-base-blue-grey-50,
1072
+ background: $color-base-light-grey-200,
1128
1073
  background-inverse: $color-base-dark-grey-700,
1129
- background-alpha: #f5f7fa8c,
1130
- background-alpha-inverse: #1b1b1b80,
1131
- card: white,
1132
- card-inverse: $color-base-blue-grey-800,
1133
- card-alpha: #ffffff80,
1134
- card-alpha-inverse: #2b2c2d80,
1074
+ // background-alpha: rgba($color-base-light-grey-200, 0.5),
1075
+ // background-alpha-inverse: rgba($color-base-dark-grey-700, 0.5),
1076
+
1077
+ card: $color-base-light-grey-50,
1078
+ card-inverse: $color-base-dark-grey-500,
1079
+ // card-alpha: rgba($color-base-light-grey-50, 0.5),
1080
+ // card-alpha-inverse: rgba($color-base-dark-grey-500, 0.5),
1135
1081
 
1136
1082
  sidebar: $color-base-blue-grey-50,
1137
- sidebar-hover: white,
1138
- table-row-hover: #788cb412,
1139
- disabled: #d4dde3,
1083
+ sidebar-hover: $color-base-blue-grey-100,
1084
+ table-row-hover: $color-base-blue-grey-400,
1085
+ disabled: $color-base-blue-grey-100,
1140
1086
  );
1141
1087
 
1142
1088
  // Background palette for dark themes.
1143
1089
  $dark-theme-background-palette: (
1144
1090
  background: $color-base-dark-grey-700,
1145
1091
  background-inverse: $color-base-blue-grey-50,
1146
- background-alpha: #1b1b1b80,
1147
- background-alpha-inverse: #f5f7fa80,
1148
- card: $color-base-blue-grey-800,
1149
- card-inverse: white,
1150
- card-alpha: #2b2c2d80,
1151
- card-alpha-inverse: #ffffff80,
1092
+ // background-alpha: rgba($color-base-dark-grey-700, 0.5),
1093
+ // background-alpha-inverse: rgba($color-base-blue-grey-50, 0.5),
1094
+
1095
+ card: $color-base-dark-grey-500,
1096
+ card-inverse: $color-base-blue-grey-50,
1097
+ // card-alpha: rgba($color-base-dark-grey-500, 0.5),
1098
+ // card-alpha-inverse: rgba($color-base-blue-grey-50, 0.5),
1152
1099
 
1153
1100
  sidebar: $color-base-dark-grey-700,
1154
1101
  sidebar-hover: $color-base-blue-grey-800,
1155
- table-row-hover: #0000002b,
1156
- disabled: rgba(15, 15, 15, 0.3),
1102
+ table-row-hover: $color-base-dark-grey-700,
1103
+ disabled: $color-base-dark-grey-700,
1157
1104
  );
1158
1105
 
1159
1106
  // Foreground palette for light themes.
1160
1107
  $light-theme-foreground-palette: (
1161
- base: $color-base-blue-grey-a700,
1108
+ base: $color-base-blue-grey-900,
1162
1109
  divider: rgba(0, 0, 0, 0.12),
1163
1110
  dividers: rgba(0, 0, 0, 0.12),
1164
1111
  disabled: rgba(0, 0, 0, 0.26),
@@ -1169,16 +1116,16 @@ $light-theme-foreground-palette: (
1169
1116
  hint-text: $color-base-blue-grey-400,
1170
1117
  secondary-text: rgba(0, 0, 0, 0.54),
1171
1118
  icon: $color-base-blue-grey-400,
1172
- icon-active: $color-base-blue-grey-a700,
1119
+ icon-active: $color-base-blue-grey-900,
1173
1120
  icons: rgba(0, 0, 0, 0.54),
1174
1121
  slider-min: rgba(0, 0, 0, 0.87),
1175
1122
  slider-off: rgba(0, 0, 0, 0.26),
1176
1123
  slider-off-active: rgba(0, 0, 0, 0.38),
1177
1124
  // helper classes
1178
- text: $color-base-blue-grey-a700,
1125
+ text: $color-base-blue-grey-900,
1179
1126
  text-inverse: $color-base-blue-grey-50,
1180
1127
  static-light-text: $color-base-blue-grey-50,
1181
- static-dark-text: $color-base-blue-grey-a700,
1128
+ static-dark-text: $color-base-blue-grey-900,
1182
1129
 
1183
1130
  placeholder: $color-base-blue-grey-400,
1184
1131
  label: $color-base-blue-grey-500,
@@ -1204,11 +1151,23 @@ $dark-theme-foreground-palette: (
1204
1151
  slider-off-active: rgba(255, 255, 255, 0.3),
1205
1152
  // helper classes
1206
1153
  text: $color-base-blue-grey-50,
1207
- text-inverse: $color-base-blue-grey-a700,
1154
+ text-inverse: $color-base-blue-grey-900,
1208
1155
  static-light-text: $color-base-blue-grey-50,
1209
- static-dark-text: $color-base-blue-grey-a700,
1156
+ static-dark-text: $color-base-blue-grey-900,
1210
1157
 
1211
1158
  disabled-icon: $color-base-blue-grey-400,
1212
1159
  placeholder: $color-base-blue-grey-200,
1213
1160
  label: $color-base-blue-grey-100,
1214
1161
  );
1162
+
1163
+
1164
+
1165
+
1166
+
1167
+
1168
+
1169
+
1170
+
1171
+
1172
+
1173
+