@gm-mobile/c-react 3.9.3-beta.21 → 3.9.3-beta.25

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 (4) hide show
  1. package/package.json +5 -5
  2. package/src/less/border.less +1 -1
  3. package/src/less/distance.less +41 -47
  4. package/src/less/text.less +12 -6
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gm-mobile/c-react",
3
- "version": "3.9.3-beta.21",
3
+ "version": "3.9.3-beta.25",
4
4
  "description": "> TODO: description",
5
5
  "author": "liyatang <liyatang@qq.com>",
6
6
  "homepage": "https://github.com/gmfe/gm-mobile#readme",
@@ -21,9 +21,9 @@
21
21
  "url": "https://github.com/gmfe/gm-mobile/issues"
22
22
  },
23
23
  "dependencies": {
24
- "@gm-mobile/c-font": "^3.9.3-beta.21",
25
- "@gm-mobile/c-tool": "^3.9.3-beta.21",
26
- "@gm-mobile/locales": "^3.9.3-beta.21"
24
+ "@gm-mobile/c-font": "^3.9.3-beta.25",
25
+ "@gm-mobile/c-tool": "^3.9.3-beta.25",
26
+ "@gm-mobile/locales": "^3.9.3-beta.25"
27
27
  },
28
28
  "peerDependencies": {
29
29
  "@tarojs/components": "3.0.18",
@@ -33,5 +33,5 @@
33
33
  "prop-types": "^15.7.2",
34
34
  "react": "^16.13.1"
35
35
  },
36
- "gitHead": "8edc84b5b284955934205557c2e4295c67dd1bde"
36
+ "gitHead": "4cce964e13b909c02194af1666bafc5f08ac4a93"
37
37
  }
package/src/less/border.less CHANGED
@@ -112,7 +112,7 @@
112
112
  // 生成圆角, .m-border-radius-{1-10}
113
113
  .generate-size(@size) when (@size<=10) {
114
114
  .m-border-radius-@{size} {
115
- border-radius: @size * 1px;
115
+ border-radius: @size * 1px !important;
116
116
  }
117
117
  .generate-size(@size + 1);
118
118
  }
package/src/less/distance.less CHANGED
@@ -17,78 +17,72 @@
17
17
  .generate-gap-more-direction(@num, @name, @direction1, @direction2, (@i + 4));
18
18
  }
19
19
 
20
- @size: {
21
- 0: 0;
22
- 5: 5px;
23
- 10: 10px;
24
- 15: 15px;
25
- 20: 20px;
26
- 25: 25px;
27
- 30: 30px;
28
- };
29
-
30
- each(@size, {
31
- .m-gap-@{key} {
20
+ .generate-distances(@value) when (@value<=30) {
21
+ .m-gap-@{value} {
32
22
  display: inline-block !important;
33
- height: @value !important;
34
- width: @value !important;
23
+ height: @value * 1px !important;
24
+ width: @value * 1px !important;
35
25
  }
36
26
 
37
- .m-padding-@{key} {
38
- padding: @value !important;
27
+ .m-padding-@{value} {
28
+ padding: @value * 1px !important;
39
29
  }
40
30
 
41
- .m-padding-top-@{key} {
42
- padding-top: @value !important;
31
+ .m-padding-top-@{value} {
32
+ padding-top: @value * 1px !important;
43
33
  }
44
34
 
45
- .m-padding-bottom-@{key} {
46
- padding-bottom: @value !important;
35
+ .m-padding-bottom-@{value} {
36
+ padding-bottom: @value * 1px !important;
47
37
  }
48
- .m-padding-left-@{key} {
49
- padding-left: @value !important;
38
+ .m-padding-left-@{value} {
39
+ padding-left: @value * 1px !important;
50
40
  }
51
41
 
52
- .m-padding-right-@{key} {
53
- padding-right: @value !important;
42
+ .m-padding-right-@{value} {
43
+ padding-right: @value * 1px !important;
54
44
  }
55
45
 
56
- .m-padding-lr-@{key} {
57
- padding-left: @value !important;
58
- padding-right: @value !important;
46
+ .m-padding-lr-@{value} {
47
+ padding-left: @value * 1px !important;
48
+ padding-right: @value * 1px !important;
59
49
  }
60
50
 
61
- .m-padding-tb-@{key} {
62
- padding-top: @value !important;
63
- padding-bottom: @value !important;
51
+ .m-padding-tb-@{value} {
52
+ padding-top: @value * 1px !important;
53
+ padding-bottom: @value * 1px !important;
64
54
  }
65
55
 
66
- .m-margin-@{key} {
67
- margin: @value !important;
56
+ .m-margin-@{value} {
57
+ margin: @value * 1px !important;
68
58
  }
69
59
 
70
- .m-margin-top-@{key} {
71
- margin-top: @value !important;
60
+ .m-margin-top-@{value} {
61
+ margin-top: @value * 1px !important;
72
62
  }
73
63
 
74
- .m-margin-bottom-@{key} {
75
- margin-bottom: @value !important;
64
+ .m-margin-bottom-@{value} {
65
+ margin-bottom: @value * 1px !important;
76
66
  }
77
- .m-margin-left-@{key} {
78
- margin-left: @value !important;
67
+ .m-margin-left-@{value} {
68
+ margin-left: @value * 1px !important;
79
69
  }
80
70
 
81
- .m-margin-right-@{key} {
82
- margin-right: @value !important;
71
+ .m-margin-right-@{value} {
72
+ margin-right: @value * 1px !important;
83
73
  }
84
74
 
85
- .m-margin-lr-@{key} {
86
- margin-left: @value !important;
87
- margin-right: @value !important;
75
+ .m-margin-lr-@{value} {
76
+ margin-left: @value * 1px !important;
77
+ margin-right: @value * 1px !important;
88
78
  }
89
79
 
90
- .m-margin-tb-@{key} {
91
- margin-top: @value !important;
92
- margin-bottom: @value !important;
80
+ .m-margin-tb-@{value} {
81
+ margin-top: @value * 1px !important;
82
+ margin-bottom: @value * 1px !important;
93
83
  }
94
- });
84
+
85
+ .generate-distances(@value + 1);
86
+ }
87
+
88
+ .generate-distances(0);
package/src/less/text.less CHANGED
@@ -109,14 +109,20 @@ each(@colors,.(@color,@colorKey,@index){
109
109
  });
110
110
 
111
111
  // 生成size, .m-text-{8-32}, --m-size-text-{8-32}
112
- .generate-size(@size) when (@size<=32) {
113
- :root,
114
- page {
112
+ :root,
113
+ page {
114
+ .generate-text-variables(@size) when (@size<=32) {
115
+ .generate-text-variables(@size + 1);
115
116
  --m-size-text-@{size}: ~'@{size}px';
116
117
  }
118
+ .generate-text-variables(8);
119
+ }
120
+
121
+ .generate-text-size(@size) when (@size<=32) {
117
122
  .m-text-@{size} {
118
- font-size: e(%('var(--m-size-text-%s)!important', @size));
123
+ // font-size: e(%('var(--m-size-text-%s)!important', @size));
124
+ font-size: @size * 1px;
119
125
  }
120
- .generate-size(@size + 2);
126
+ .generate-text-size(@size + 1);
121
127
  }
122
- .generate-size(8);
128
+ .generate-text-size(8);