@zl-ui-kit/theme 0.14.0 → 0.14.1

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/README.md CHANGED
@@ -15,7 +15,7 @@ import 'element-plus/dist/index.css'
15
15
  import '@zl-ui-kit/theme/themes.css' // 5 套全量;只要默认一套可换成 '@zl-ui-kit/theme/light'
16
16
  ```
17
17
 
18
- 引入即得到内置 `light`:主色 `#3B82F6`、hover `#76a8f9`、按下 `#2f68c5`、控件圆角 `4px`;
18
+ 引入即得到内置 `light`:主色 `#3056D3`、hover `#6e89e0`、按下 `#2645a9`、控件圆角 `4px`;
19
19
  业务组件(`--zl-*`)与 Element Plus 控件(`--el-*`)共用同一组变量。
20
20
 
21
21
  **② 要覆盖默认主题:在宿主侧一个入口文件里于启动时调用。**
package/dist/index.js CHANGED
@@ -551,26 +551,26 @@ var themes_data_default = {
551
551
  "color-lime-7": "#6FA036",
552
552
  "color-lime-8": "#51841E",
553
553
  "color-lime-9": "#37680C",
554
- "color-modo-1": "#EFF5FE",
555
- "color-link-1": "#EFF5FE",
556
- "color-modo-10": "#183462",
557
- "color-link-10": "#183462",
558
- "color-modo-2": "#CCDFFD",
559
- "color-link-2": "#CCDFFD",
560
- "color-modo-3": "#A7C7FB",
561
- "color-link-3": "#A7C7FB",
562
- "color-modo-4": "#82AFF9",
563
- "color-link-4": "#82AFF9",
564
- "color-modo-5": "#5E99F8",
565
- "color-link-5": "#5E99F8",
566
- "color-modo-6": "#3B82F6",
567
- "color-link-6": "#3B82F6",
568
- "color-modo-7": "#306BCA",
569
- "color-link-7": "#306BCA",
570
- "color-modo-8": "#2858A7",
571
- "color-link-8": "#2858A7",
572
- "color-modo-9": "#204685",
573
- "color-link-9": "#204685",
554
+ "color-modo-1": "#ECF0FB",
555
+ "color-link-1": "#ECF0FB",
556
+ "color-modo-10": "#132254",
557
+ "color-link-10": "#132254",
558
+ "color-modo-2": "#C9D3F4",
559
+ "color-link-2": "#C9D3F4",
560
+ "color-modo-3": "#A2B3EB",
561
+ "color-link-3": "#A2B3EB",
562
+ "color-modo-4": "#7B93E3",
563
+ "color-link-4": "#7B93E3",
564
+ "color-modo-5": "#5574DB",
565
+ "color-link-5": "#5574DB",
566
+ "color-modo-6": "#3056D3",
567
+ "color-link-6": "#3056D3",
568
+ "color-modo-7": "#2746AD",
569
+ "color-link-7": "#2746AD",
570
+ "color-modo-8": "#213A8F",
571
+ "color-link-8": "#213A8F",
572
+ "color-modo-9": "#1A2E72",
573
+ "color-link-9": "#1A2E72",
574
574
  "color-magenta-1": "#FFE8F4",
575
575
  "color-magenta-10": "#4D0034",
576
576
  "color-magenta-2": "#F6C6E0",
@@ -617,16 +617,16 @@ var themes_data_default = {
617
617
  "color-pinkpurple-7": "#8727B0",
618
618
  "color-pinkpurple-8": "#66158F",
619
619
  "color-pinkpurple-9": "#48086E",
620
- "color-primary-1": "#EFF5FE",
621
- "color-primary-10": "#183462",
622
- "color-primary-2": "#CCDFFD",
623
- "color-primary-3": "#A7C7FB",
624
- "color-primary-4": "#82AFF9",
625
- "color-primary-5": "#5E99F8",
626
- "color-primary-6": "#3B82F6",
627
- "color-primary-7": "#306BCA",
628
- "color-primary-8": "#2858A7",
629
- "color-primary-9": "#204685",
620
+ "color-primary-1": "#ECF0FB",
621
+ "color-primary-10": "#132254",
622
+ "color-primary-2": "#C9D3F4",
623
+ "color-primary-3": "#A2B3EB",
624
+ "color-primary-4": "#7B93E3",
625
+ "color-primary-5": "#5574DB",
626
+ "color-primary-6": "#3056D3",
627
+ "color-primary-7": "#2746AD",
628
+ "color-primary-8": "#213A8F",
629
+ "color-primary-9": "#1A2E72",
630
630
  "color-purple-1": "#F3E8FF",
631
631
  "color-purple-10": "#0E004D",
632
632
  "color-purple-2": "#D9C4F3",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zl-ui-kit/theme",
3
- "version": "0.14.0",
3
+ "version": "0.14.1",
4
4
  "type": "module",
5
5
  "description": "ZL UI 主题引擎:内置 5 套主题(light/dark/red-light/red-dark/blue),--zl-* 业务变量 + --el-* Element Plus 变量三层体系,支持运行时自定义主题(defineTheme/setTheme)",
6
6
  "license": "MIT",
@@ -41,8 +41,8 @@
41
41
  "cross-env": "^7.0.3",
42
42
  "tsup": "^8.3.5",
43
43
  "typescript": "^5.7.3",
44
- "@jichuang/eslint-config": "1.0.0",
45
- "@jichuang/tsconfig": "1.0.0"
44
+ "@jichuang/tsconfig": "1.0.0",
45
+ "@jichuang/eslint-config": "1.0.0"
46
46
  },
47
47
  "repository": {
48
48
  "type": "git",
@@ -105,16 +105,16 @@
105
105
  "color-magenta-8": "#901C71",
106
106
  "color-magenta-9": "#6E0B57",
107
107
  "color-mask-bg": "rgba(36, 46, 67, 0.6)",
108
- "color-modo-1": "#EFF5FE",
109
- "color-modo-10": "#183462",
110
- "color-modo-2": "#CCDFFD",
111
- "color-modo-3": "#A7C7FB",
112
- "color-modo-4": "#82AFF9",
113
- "color-modo-5": "#5E99F8",
114
- "color-modo-6": "#3B82F6",
115
- "color-modo-7": "#306BCA",
116
- "color-modo-8": "#2858A7",
117
- "color-modo-9": "#204685",
108
+ "color-modo-1": "#ECF0FB",
109
+ "color-modo-10": "#132254",
110
+ "color-modo-2": "#C9D3F4",
111
+ "color-modo-3": "#A2B3EB",
112
+ "color-modo-4": "#7B93E3",
113
+ "color-modo-5": "#5574DB",
114
+ "color-modo-6": "#3056D3",
115
+ "color-modo-7": "#2746AD",
116
+ "color-modo-8": "#213A8F",
117
+ "color-modo-9": "#1A2E72",
118
118
  "color-neutral-1": "var(--color-gray-1)",
119
119
  "color-neutral-10": "var(--color-gray-10)",
120
120
  "color-neutral-2": "var(--color-gray-2)",
@@ -99,26 +99,26 @@ body {
99
99
  --zl-lime-7: #6fa036;
100
100
  --zl-lime-8: #51841e;
101
101
  --zl-lime-9: #37680c;
102
- --zl-modo-1: #eff5fe;
103
- --zl-link-1: #eff5fe;
104
- --zl-modo-10: #183462;
105
- --zl-link-10: #183462;
106
- --zl-modo-2: #ccdffd;
107
- --zl-link-2: #ccdffd;
108
- --zl-modo-3: #a7c7fb;
109
- --zl-link-3: #a7c7fb;
110
- --zl-modo-4: #82aff9;
111
- --zl-link-4: #82aff9;
112
- --zl-modo-5: #5e99f8;
113
- --zl-link-5: #5e99f8;
114
- --zl-modo-6: #3b82f6;
115
- --zl-link-6: #3b82f6;
116
- --zl-modo-7: #306bca;
117
- --zl-link-7: #306bca;
118
- --zl-modo-8: #2858a7;
119
- --zl-link-8: #2858a7;
120
- --zl-modo-9: #204685;
121
- --zl-link-9: #204685;
102
+ --zl-modo-1: #ecf0fb;
103
+ --zl-link-1: #ecf0fb;
104
+ --zl-modo-10: #132254;
105
+ --zl-link-10: #132254;
106
+ --zl-modo-2: #c9d3f4;
107
+ --zl-link-2: #c9d3f4;
108
+ --zl-modo-3: #a2b3eb;
109
+ --zl-link-3: #a2b3eb;
110
+ --zl-modo-4: #7b93e3;
111
+ --zl-link-4: #7b93e3;
112
+ --zl-modo-5: #5574db;
113
+ --zl-link-5: #5574db;
114
+ --zl-modo-6: #3056d3;
115
+ --zl-link-6: #3056d3;
116
+ --zl-modo-7: #2746ad;
117
+ --zl-link-7: #2746ad;
118
+ --zl-modo-8: #213a8f;
119
+ --zl-link-8: #213a8f;
120
+ --zl-modo-9: #1a2e72;
121
+ --zl-link-9: #1a2e72;
122
122
  --zl-magenta-1: #ffe8f4;
123
123
  --zl-magenta-10: #4d0034;
124
124
  --zl-magenta-2: #f6c6e0;
@@ -165,16 +165,16 @@ body {
165
165
  --zl-pinkpurple-7: #8727b0;
166
166
  --zl-pinkpurple-8: #66158f;
167
167
  --zl-pinkpurple-9: #48086e;
168
- --zl-primary-1: #eff5fe;
169
- --zl-primary-10: #183462;
170
- --zl-primary-2: #ccdffd;
171
- --zl-primary-3: #a7c7fb;
172
- --zl-primary-4: #82aff9;
173
- --zl-primary-5: #5e99f8;
174
- --zl-primary-6: #3b82f6;
175
- --zl-primary-7: #306bca;
176
- --zl-primary-8: #2858a7;
177
- --zl-primary-9: #204685;
168
+ --zl-primary-1: #ecf0fb;
169
+ --zl-primary-10: #132254;
170
+ --zl-primary-2: #c9d3f4;
171
+ --zl-primary-3: #a2b3eb;
172
+ --zl-primary-4: #7b93e3;
173
+ --zl-primary-5: #5574db;
174
+ --zl-primary-6: #3056d3;
175
+ --zl-primary-7: #2746ad;
176
+ --zl-primary-8: #213a8f;
177
+ --zl-primary-9: #1a2e72;
178
178
  --zl-purple-1: #f3e8ff;
179
179
  --zl-purple-10: #0e004d;
180
180
  --zl-purple-2: #d9c4f3;
@@ -222,37 +222,37 @@ body {
222
222
  --zl-yellow-7: #c7be41;
223
223
  --zl-yellow-8: #9e9222;
224
224
  --zl-yellow-9: #75670d;
225
- --zl-primary-1: #eff5fe;
226
- --zl-link-1: #eff5fe;
227
- --zl-primary-2: #ccdffd;
228
- --zl-link-2: #ccdffd;
229
- --zl-primary-3: #a7c7fb;
230
- --zl-link-3: #a7c7fb;
231
- --zl-primary-4: #82aff9;
232
- --zl-link-4: #82aff9;
233
- --zl-primary-5: #5e99f8;
234
- --zl-link-5: #5e99f8;
235
- --zl-primary-6: #3b82f6;
236
- --zl-link-6: #3b82f6;
237
- --zl-primary-7: #306bca;
238
- --zl-link-7: #306bca;
239
- --zl-primary-8: #2858a7;
240
- --zl-link-8: #2858a7;
241
- --zl-primary-9: #204685;
242
- --zl-link-9: #204685;
243
- --zl-primary-10: #183462;
244
- --zl-link-10: #183462;
245
- --el-color-primary: #3B82F6;
246
- --el-color-primary-light-1: #4f8ff7;
247
- --el-color-primary-light-2: #629bf8;
248
- --el-color-primary-light-3: #76a8f9;
249
- --el-color-primary-light-4: #89b4fa;
250
- --el-color-primary-light-5: #9dc1fb;
251
- --el-color-primary-light-6: #b1cdfb;
252
- --el-color-primary-light-7: #c4dafc;
253
- --el-color-primary-light-8: #d8e6fd;
254
- --el-color-primary-light-9: #ebf3fe;
255
- --el-color-primary-dark-2: #2f68c5;
225
+ --zl-primary-1: #ecf0fb;
226
+ --zl-link-1: #ecf0fb;
227
+ --zl-primary-2: #c9d3f4;
228
+ --zl-link-2: #c9d3f4;
229
+ --zl-primary-3: #a2b3eb;
230
+ --zl-link-3: #a2b3eb;
231
+ --zl-primary-4: #7b93e3;
232
+ --zl-link-4: #7b93e3;
233
+ --zl-primary-5: #5574db;
234
+ --zl-link-5: #5574db;
235
+ --zl-primary-6: #3056d3;
236
+ --zl-link-6: #3056d3;
237
+ --zl-primary-7: #2746ad;
238
+ --zl-link-7: #2746ad;
239
+ --zl-primary-8: #213a8f;
240
+ --zl-link-8: #213a8f;
241
+ --zl-primary-9: #1a2e72;
242
+ --zl-link-9: #1a2e72;
243
+ --zl-primary-10: #132254;
244
+ --zl-link-10: #132254;
245
+ --el-color-primary: #3056D3;
246
+ --el-color-primary-light-1: #4567d7;
247
+ --el-color-primary-light-2: #5978dc;
248
+ --el-color-primary-light-3: #6e89e0;
249
+ --el-color-primary-light-4: #839ae5;
250
+ --el-color-primary-light-5: #98abe9;
251
+ --el-color-primary-light-6: #acbbed;
252
+ --el-color-primary-light-7: #c1ccf2;
253
+ --el-color-primary-light-8: #d6ddf6;
254
+ --el-color-primary-light-9: #eaeefb;
255
+ --el-color-primary-dark-2: #2645a9;
256
256
  --el-color-success: #55BC8A;
257
257
  --el-color-success-light-1: #66c396;
258
258
  --el-color-success-light-2: #77c9a1;
@@ -547,26 +547,26 @@
547
547
  "color-lime-7": "#6FA036",
548
548
  "color-lime-8": "#51841E",
549
549
  "color-lime-9": "#37680C",
550
- "color-modo-1": "#EFF5FE",
551
- "color-link-1": "#EFF5FE",
552
- "color-modo-10": "#183462",
553
- "color-link-10": "#183462",
554
- "color-modo-2": "#CCDFFD",
555
- "color-link-2": "#CCDFFD",
556
- "color-modo-3": "#A7C7FB",
557
- "color-link-3": "#A7C7FB",
558
- "color-modo-4": "#82AFF9",
559
- "color-link-4": "#82AFF9",
560
- "color-modo-5": "#5E99F8",
561
- "color-link-5": "#5E99F8",
562
- "color-modo-6": "#3B82F6",
563
- "color-link-6": "#3B82F6",
564
- "color-modo-7": "#306BCA",
565
- "color-link-7": "#306BCA",
566
- "color-modo-8": "#2858A7",
567
- "color-link-8": "#2858A7",
568
- "color-modo-9": "#204685",
569
- "color-link-9": "#204685",
550
+ "color-modo-1": "#ECF0FB",
551
+ "color-link-1": "#ECF0FB",
552
+ "color-modo-10": "#132254",
553
+ "color-link-10": "#132254",
554
+ "color-modo-2": "#C9D3F4",
555
+ "color-link-2": "#C9D3F4",
556
+ "color-modo-3": "#A2B3EB",
557
+ "color-link-3": "#A2B3EB",
558
+ "color-modo-4": "#7B93E3",
559
+ "color-link-4": "#7B93E3",
560
+ "color-modo-5": "#5574DB",
561
+ "color-link-5": "#5574DB",
562
+ "color-modo-6": "#3056D3",
563
+ "color-link-6": "#3056D3",
564
+ "color-modo-7": "#2746AD",
565
+ "color-link-7": "#2746AD",
566
+ "color-modo-8": "#213A8F",
567
+ "color-link-8": "#213A8F",
568
+ "color-modo-9": "#1A2E72",
569
+ "color-link-9": "#1A2E72",
570
570
  "color-magenta-1": "#FFE8F4",
571
571
  "color-magenta-10": "#4D0034",
572
572
  "color-magenta-2": "#F6C6E0",
@@ -613,16 +613,16 @@
613
613
  "color-pinkpurple-7": "#8727B0",
614
614
  "color-pinkpurple-8": "#66158F",
615
615
  "color-pinkpurple-9": "#48086E",
616
- "color-primary-1": "#EFF5FE",
617
- "color-primary-10": "#183462",
618
- "color-primary-2": "#CCDFFD",
619
- "color-primary-3": "#A7C7FB",
620
- "color-primary-4": "#82AFF9",
621
- "color-primary-5": "#5E99F8",
622
- "color-primary-6": "#3B82F6",
623
- "color-primary-7": "#306BCA",
624
- "color-primary-8": "#2858A7",
625
- "color-primary-9": "#204685",
616
+ "color-primary-1": "#ECF0FB",
617
+ "color-primary-10": "#132254",
618
+ "color-primary-2": "#C9D3F4",
619
+ "color-primary-3": "#A2B3EB",
620
+ "color-primary-4": "#7B93E3",
621
+ "color-primary-5": "#5574DB",
622
+ "color-primary-6": "#3056D3",
623
+ "color-primary-7": "#2746AD",
624
+ "color-primary-8": "#213A8F",
625
+ "color-primary-9": "#1A2E72",
626
626
  "color-purple-1": "#F3E8FF",
627
627
  "color-purple-10": "#0E004D",
628
628
  "color-purple-2": "#D9C4F3",
@@ -803,26 +803,26 @@ body {
803
803
  --zl-lime-7: #6fa036;
804
804
  --zl-lime-8: #51841e;
805
805
  --zl-lime-9: #37680c;
806
- --zl-modo-1: #eff5fe;
807
- --zl-link-1: #eff5fe;
808
- --zl-modo-10: #183462;
809
- --zl-link-10: #183462;
810
- --zl-modo-2: #ccdffd;
811
- --zl-link-2: #ccdffd;
812
- --zl-modo-3: #a7c7fb;
813
- --zl-link-3: #a7c7fb;
814
- --zl-modo-4: #82aff9;
815
- --zl-link-4: #82aff9;
816
- --zl-modo-5: #5e99f8;
817
- --zl-link-5: #5e99f8;
818
- --zl-modo-6: #3b82f6;
819
- --zl-link-6: #3b82f6;
820
- --zl-modo-7: #306bca;
821
- --zl-link-7: #306bca;
822
- --zl-modo-8: #2858a7;
823
- --zl-link-8: #2858a7;
824
- --zl-modo-9: #204685;
825
- --zl-link-9: #204685;
806
+ --zl-modo-1: #ecf0fb;
807
+ --zl-link-1: #ecf0fb;
808
+ --zl-modo-10: #132254;
809
+ --zl-link-10: #132254;
810
+ --zl-modo-2: #c9d3f4;
811
+ --zl-link-2: #c9d3f4;
812
+ --zl-modo-3: #a2b3eb;
813
+ --zl-link-3: #a2b3eb;
814
+ --zl-modo-4: #7b93e3;
815
+ --zl-link-4: #7b93e3;
816
+ --zl-modo-5: #5574db;
817
+ --zl-link-5: #5574db;
818
+ --zl-modo-6: #3056d3;
819
+ --zl-link-6: #3056d3;
820
+ --zl-modo-7: #2746ad;
821
+ --zl-link-7: #2746ad;
822
+ --zl-modo-8: #213a8f;
823
+ --zl-link-8: #213a8f;
824
+ --zl-modo-9: #1a2e72;
825
+ --zl-link-9: #1a2e72;
826
826
  --zl-magenta-1: #ffe8f4;
827
827
  --zl-magenta-10: #4d0034;
828
828
  --zl-magenta-2: #f6c6e0;
@@ -869,16 +869,16 @@ body {
869
869
  --zl-pinkpurple-7: #8727b0;
870
870
  --zl-pinkpurple-8: #66158f;
871
871
  --zl-pinkpurple-9: #48086e;
872
- --zl-primary-1: #eff5fe;
873
- --zl-primary-10: #183462;
874
- --zl-primary-2: #ccdffd;
875
- --zl-primary-3: #a7c7fb;
876
- --zl-primary-4: #82aff9;
877
- --zl-primary-5: #5e99f8;
878
- --zl-primary-6: #3b82f6;
879
- --zl-primary-7: #306bca;
880
- --zl-primary-8: #2858a7;
881
- --zl-primary-9: #204685;
872
+ --zl-primary-1: #ecf0fb;
873
+ --zl-primary-10: #132254;
874
+ --zl-primary-2: #c9d3f4;
875
+ --zl-primary-3: #a2b3eb;
876
+ --zl-primary-4: #7b93e3;
877
+ --zl-primary-5: #5574db;
878
+ --zl-primary-6: #3056d3;
879
+ --zl-primary-7: #2746ad;
880
+ --zl-primary-8: #213a8f;
881
+ --zl-primary-9: #1a2e72;
882
882
  --zl-purple-1: #f3e8ff;
883
883
  --zl-purple-10: #0e004d;
884
884
  --zl-purple-2: #d9c4f3;
@@ -926,37 +926,37 @@ body {
926
926
  --zl-yellow-7: #c7be41;
927
927
  --zl-yellow-8: #9e9222;
928
928
  --zl-yellow-9: #75670d;
929
- --zl-primary-1: #eff5fe;
930
- --zl-link-1: #eff5fe;
931
- --zl-primary-2: #ccdffd;
932
- --zl-link-2: #ccdffd;
933
- --zl-primary-3: #a7c7fb;
934
- --zl-link-3: #a7c7fb;
935
- --zl-primary-4: #82aff9;
936
- --zl-link-4: #82aff9;
937
- --zl-primary-5: #5e99f8;
938
- --zl-link-5: #5e99f8;
939
- --zl-primary-6: #3b82f6;
940
- --zl-link-6: #3b82f6;
941
- --zl-primary-7: #306bca;
942
- --zl-link-7: #306bca;
943
- --zl-primary-8: #2858a7;
944
- --zl-link-8: #2858a7;
945
- --zl-primary-9: #204685;
946
- --zl-link-9: #204685;
947
- --zl-primary-10: #183462;
948
- --zl-link-10: #183462;
949
- --el-color-primary: #3B82F6;
950
- --el-color-primary-light-1: #4f8ff7;
951
- --el-color-primary-light-2: #629bf8;
952
- --el-color-primary-light-3: #76a8f9;
953
- --el-color-primary-light-4: #89b4fa;
954
- --el-color-primary-light-5: #9dc1fb;
955
- --el-color-primary-light-6: #b1cdfb;
956
- --el-color-primary-light-7: #c4dafc;
957
- --el-color-primary-light-8: #d8e6fd;
958
- --el-color-primary-light-9: #ebf3fe;
959
- --el-color-primary-dark-2: #2f68c5;
929
+ --zl-primary-1: #ecf0fb;
930
+ --zl-link-1: #ecf0fb;
931
+ --zl-primary-2: #c9d3f4;
932
+ --zl-link-2: #c9d3f4;
933
+ --zl-primary-3: #a2b3eb;
934
+ --zl-link-3: #a2b3eb;
935
+ --zl-primary-4: #7b93e3;
936
+ --zl-link-4: #7b93e3;
937
+ --zl-primary-5: #5574db;
938
+ --zl-link-5: #5574db;
939
+ --zl-primary-6: #3056d3;
940
+ --zl-link-6: #3056d3;
941
+ --zl-primary-7: #2746ad;
942
+ --zl-link-7: #2746ad;
943
+ --zl-primary-8: #213a8f;
944
+ --zl-link-8: #213a8f;
945
+ --zl-primary-9: #1a2e72;
946
+ --zl-link-9: #1a2e72;
947
+ --zl-primary-10: #132254;
948
+ --zl-link-10: #132254;
949
+ --el-color-primary: #3056D3;
950
+ --el-color-primary-light-1: #4567d7;
951
+ --el-color-primary-light-2: #5978dc;
952
+ --el-color-primary-light-3: #6e89e0;
953
+ --el-color-primary-light-4: #839ae5;
954
+ --el-color-primary-light-5: #98abe9;
955
+ --el-color-primary-light-6: #acbbed;
956
+ --el-color-primary-light-7: #c1ccf2;
957
+ --el-color-primary-light-8: #d6ddf6;
958
+ --el-color-primary-light-9: #eaeefb;
959
+ --el-color-primary-dark-2: #2645a9;
960
960
  --el-color-success: #55BC8A;
961
961
  --el-color-success-light-1: #66c396;
962
962
  --el-color-success-light-2: #77c9a1;