@gm-mobile/c-react 3.9.3-beta.3 → 3.9.3-beta.33
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/package.json +5 -5
- package/src/component/button/button.tsx +3 -1
- package/src/component/calendar/index.ts +1 -0
- package/src/component/cell/cell.tsx +29 -27
- package/src/component/cell/style.less +8 -5
- package/src/component/custom_tabbar/custom_tabbar.weapp.tsx +6 -1
- package/src/component/dialog/common/base.less +3 -0
- package/src/component/dialog/common/base.tsx +8 -4
- package/src/component/dialog/common/choose.tsx +3 -0
- package/src/component/dialog/dialog.tsx +10 -2
- package/src/component/dialog/style.less +1 -1
- package/src/component/dialog/types.ts +11 -10
- package/src/component/digital_keyboard/Base.tsx +28 -21
- package/src/component/digital_keyboard/Btn.ts +3 -3
- package/src/component/digital_keyboard/base.less +36 -5
- package/src/component/digital_keyboard/index.tsx +30 -14
- package/src/component/digital_keyboard/stories.tsx +35 -41
- package/src/component/draggable/draggable.tsx +1 -0
- package/src/component/error/error.tsx +23 -0
- package/src/component/error/index.ts +1 -0
- package/src/component/error/style.less +42 -0
- package/src/component/error/types.ts +5 -0
- package/src/component/layout_root/layout_root.tsx +20 -4
- package/src/component/layout_root/layout_root_v1.tsx +18 -3
- package/src/component/page/style.less +8 -0
- package/src/component/popup/popup.tsx +4 -1
- package/src/component/popup/popup_v1.tsx +2 -1
- package/src/component/popup/style.less +1 -1
- package/src/component/popup/types.ts +4 -0
- package/src/component/text_field/TextField.tsx +25 -3
- package/src/component/text_field/stories.tsx +0 -1
- package/src/component/text_field/style.less +3 -0
- package/src/component/text_field/types.ts +3 -1
- package/src/component/v_list/v_list.tsx +1 -1
- package/src/index.less +4 -3
- package/src/index.ts +1 -0
- package/src/less/animation.less +9 -4
- package/src/less/bg.less +7 -0
- package/src/less/border.less +12 -3
- package/src/less/{btn.less → button.less} +3 -1
- package/src/less/distance.less +41 -45
- package/src/less/text.less +26 -24
- package/src/less/variable.less +0 -8
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
padding: 0 10px;
|
|
47
47
|
border-radius: 3px;
|
|
48
48
|
box-sizing: border-box;
|
|
49
|
-
line-height:
|
|
49
|
+
line-height: 2;
|
|
50
50
|
min-height: @button-normal;
|
|
51
51
|
cursor: pointer;
|
|
52
52
|
user-select: none;
|
|
@@ -68,6 +68,7 @@
|
|
|
68
68
|
}
|
|
69
69
|
.m-button {
|
|
70
70
|
.m-button-text();
|
|
71
|
+
line-height: 1;
|
|
71
72
|
background-color: @button-with-white-text[default];
|
|
72
73
|
}
|
|
73
74
|
|
|
@@ -112,6 +113,7 @@ each(@button-with-black-text,.(@value,@key,@index){
|
|
|
112
113
|
|
|
113
114
|
.m-button-icon {
|
|
114
115
|
.m-button-text();
|
|
116
|
+
line-height: 1;
|
|
115
117
|
min-width: @button-normal;
|
|
116
118
|
padding: 10px;
|
|
117
119
|
border-radius: 50%;
|
package/src/less/distance.less
CHANGED
|
@@ -17,76 +17,72 @@
|
|
|
17
17
|
.generate-gap-more-direction(@num, @name, @direction1, @direction2, (@i + 4));
|
|
18
18
|
}
|
|
19
19
|
|
|
20
|
-
@
|
|
21
|
-
|
|
22
|
-
5: 5px;
|
|
23
|
-
10: 10px;
|
|
24
|
-
15: 15px;
|
|
25
|
-
20: 20px;
|
|
26
|
-
};
|
|
27
|
-
|
|
28
|
-
each(@size, {
|
|
29
|
-
.m-gap-@{key} {
|
|
20
|
+
.generate-distances(@value) when (@value<=30) {
|
|
21
|
+
.m-gap-@{value} {
|
|
30
22
|
display: inline-block !important;
|
|
31
|
-
height: @value !important;
|
|
32
|
-
width: @value !important;
|
|
23
|
+
height: @value * 1px !important;
|
|
24
|
+
width: @value * 1px !important;
|
|
33
25
|
}
|
|
34
26
|
|
|
35
|
-
.m-padding-@{
|
|
36
|
-
padding: @value !important;
|
|
27
|
+
.m-padding-@{value} {
|
|
28
|
+
padding: @value * 1px !important;
|
|
37
29
|
}
|
|
38
30
|
|
|
39
|
-
.m-padding-top-@{
|
|
40
|
-
padding-top: @value !important;
|
|
31
|
+
.m-padding-top-@{value} {
|
|
32
|
+
padding-top: @value * 1px !important;
|
|
41
33
|
}
|
|
42
34
|
|
|
43
|
-
.m-padding-bottom-@{
|
|
44
|
-
padding-bottom: @value !important;
|
|
35
|
+
.m-padding-bottom-@{value} {
|
|
36
|
+
padding-bottom: @value * 1px !important;
|
|
45
37
|
}
|
|
46
|
-
.m-padding-left-@{
|
|
47
|
-
padding-left: @value !important;
|
|
38
|
+
.m-padding-left-@{value} {
|
|
39
|
+
padding-left: @value * 1px !important;
|
|
48
40
|
}
|
|
49
41
|
|
|
50
|
-
.m-padding-right-@{
|
|
51
|
-
padding-right: @value !important;
|
|
42
|
+
.m-padding-right-@{value} {
|
|
43
|
+
padding-right: @value * 1px !important;
|
|
52
44
|
}
|
|
53
45
|
|
|
54
|
-
.m-padding-lr-@{
|
|
55
|
-
padding-left: @value !important;
|
|
56
|
-
padding-right: @value !important;
|
|
46
|
+
.m-padding-lr-@{value} {
|
|
47
|
+
padding-left: @value * 1px !important;
|
|
48
|
+
padding-right: @value * 1px !important;
|
|
57
49
|
}
|
|
58
50
|
|
|
59
|
-
.m-padding-tb-@{
|
|
60
|
-
padding-top: @value !important;
|
|
61
|
-
padding-bottom: @value !important;
|
|
51
|
+
.m-padding-tb-@{value} {
|
|
52
|
+
padding-top: @value * 1px !important;
|
|
53
|
+
padding-bottom: @value * 1px !important;
|
|
62
54
|
}
|
|
63
55
|
|
|
64
|
-
.m-margin-@{
|
|
65
|
-
margin: @value !important;
|
|
56
|
+
.m-margin-@{value} {
|
|
57
|
+
margin: @value * 1px !important;
|
|
66
58
|
}
|
|
67
59
|
|
|
68
|
-
.m-margin-top-@{
|
|
69
|
-
margin-top: @value !important;
|
|
60
|
+
.m-margin-top-@{value} {
|
|
61
|
+
margin-top: @value * 1px !important;
|
|
70
62
|
}
|
|
71
63
|
|
|
72
|
-
.m-margin-bottom-@{
|
|
73
|
-
margin-bottom: @value !important;
|
|
64
|
+
.m-margin-bottom-@{value} {
|
|
65
|
+
margin-bottom: @value * 1px !important;
|
|
74
66
|
}
|
|
75
|
-
.m-margin-left-@{
|
|
76
|
-
margin-left: @value !important;
|
|
67
|
+
.m-margin-left-@{value} {
|
|
68
|
+
margin-left: @value * 1px !important;
|
|
77
69
|
}
|
|
78
70
|
|
|
79
|
-
.m-margin-right-@{
|
|
80
|
-
margin-right: @value !important;
|
|
71
|
+
.m-margin-right-@{value} {
|
|
72
|
+
margin-right: @value * 1px !important;
|
|
81
73
|
}
|
|
82
74
|
|
|
83
|
-
.m-margin-lr-@{
|
|
84
|
-
margin-left: @value !important;
|
|
85
|
-
margin-right: @value !important;
|
|
75
|
+
.m-margin-lr-@{value} {
|
|
76
|
+
margin-left: @value * 1px !important;
|
|
77
|
+
margin-right: @value * 1px !important;
|
|
86
78
|
}
|
|
87
79
|
|
|
88
|
-
.m-margin-tb-@{
|
|
89
|
-
margin-top: @value !important;
|
|
90
|
-
margin-bottom: @value !important;
|
|
80
|
+
.m-margin-tb-@{value} {
|
|
81
|
+
margin-top: @value * 1px !important;
|
|
82
|
+
margin-bottom: @value * 1px !important;
|
|
91
83
|
}
|
|
92
|
-
|
|
84
|
+
|
|
85
|
+
.generate-distances(@value + 1);
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
.generate-distances(0);
|
package/src/less/text.less
CHANGED
|
@@ -1,27 +1,3 @@
|
|
|
1
|
-
.m-text-20 {
|
|
2
|
-
font-size: var(--m-size-text-20) !important;
|
|
3
|
-
}
|
|
4
|
-
|
|
5
|
-
.m-text-18 {
|
|
6
|
-
font-size: var(--m-size-text-18) !important;
|
|
7
|
-
}
|
|
8
|
-
|
|
9
|
-
.m-text-16 {
|
|
10
|
-
font-size: var(--m-size-text-16) !important;
|
|
11
|
-
}
|
|
12
|
-
|
|
13
|
-
.m-text-14 {
|
|
14
|
-
font-size: var(--m-size-text-14) !important;
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
.m-text-12 {
|
|
18
|
-
font-size: var(--m-size-text-12) !important;
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
.m-text-10 {
|
|
22
|
-
font-size: var(--m-size-text-10) !important;
|
|
23
|
-
}
|
|
24
|
-
|
|
25
1
|
.m-text-center {
|
|
26
2
|
text-align: center !important;
|
|
27
3
|
}
|
|
@@ -90,6 +66,10 @@
|
|
|
90
66
|
text-decoration: line-through;
|
|
91
67
|
}
|
|
92
68
|
|
|
69
|
+
.m-text-normal {
|
|
70
|
+
font-weight: normal;
|
|
71
|
+
}
|
|
72
|
+
|
|
93
73
|
.m-text-bold {
|
|
94
74
|
font-weight: bold;
|
|
95
75
|
}
|
|
@@ -123,4 +103,26 @@ each(@colors,.(@color,@colorKey,@index){
|
|
|
123
103
|
.generate-colors(@opacity+1);
|
|
124
104
|
}
|
|
125
105
|
.generate-colors(0);
|
|
106
|
+
.m-text-@{colorKey}{
|
|
107
|
+
color: @color!important;
|
|
108
|
+
}
|
|
126
109
|
});
|
|
110
|
+
|
|
111
|
+
// 生成size, .m-text-{8-32}, --m-size-text-{8-32}
|
|
112
|
+
:root,
|
|
113
|
+
page {
|
|
114
|
+
.generate-text-variables(@size) when (@size<=32) {
|
|
115
|
+
.generate-text-variables(@size + 1);
|
|
116
|
+
--m-size-text-@{size}: ~'@{size}px';
|
|
117
|
+
}
|
|
118
|
+
.generate-text-variables(8);
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
.generate-text-size(@size) when (@size<=32) {
|
|
122
|
+
.m-text-@{size} {
|
|
123
|
+
// font-size: e(%('var(--m-size-text-%s)!important', @size));
|
|
124
|
+
font-size: @size * 1px;
|
|
125
|
+
}
|
|
126
|
+
.generate-text-size(@size + 1);
|
|
127
|
+
}
|
|
128
|
+
.generate-text-size(8);
|
package/src/less/variable.less
CHANGED
|
@@ -91,14 +91,6 @@ page {
|
|
|
91
91
|
// 非颜色
|
|
92
92
|
:root,
|
|
93
93
|
page {
|
|
94
|
-
// 字体尺寸
|
|
95
|
-
--m-size-text-10: 10px;
|
|
96
|
-
--m-size-text-12: 12px;
|
|
97
|
-
--m-size-text-14: 14px;
|
|
98
|
-
--m-size-text-16: 16px;
|
|
99
|
-
--m-size-text-18: 18px;
|
|
100
|
-
--m-size-text-20: 20px;
|
|
101
|
-
|
|
102
94
|
// line-height
|
|
103
95
|
--m-size-line-height: 1.6;
|
|
104
96
|
|