@nutui/nutui-react 4.0.0-beta.1 → 4.0.0-beta.3

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 (259) hide show
  1. package/CHANGELOG.md +33 -18
  2. package/dist/cjs/packages/actionsheet/style/style.css +1 -5
  3. package/dist/cjs/packages/address/style/style.css +2 -6
  4. package/dist/cjs/packages/animate/style/style.css +0 -4
  5. package/dist/cjs/packages/animatingnumbers/style/style.css +1 -6
  6. package/dist/cjs/packages/audio/style/style.css +2 -6
  7. package/dist/cjs/packages/avatar/style/style.css +0 -4
  8. package/dist/cjs/packages/avatarcropper/style/style.css +0 -4
  9. package/dist/cjs/packages/avatargroup/style/style.css +0 -4
  10. package/dist/cjs/packages/backtop/style/style.css +0 -4
  11. package/dist/cjs/packages/badge/style/style.css +5 -9
  12. package/dist/cjs/packages/barrage/style/style.css +0 -4
  13. package/dist/cjs/packages/button/style/style.css +21 -25
  14. package/dist/cjs/packages/calendar/style/style.css +8 -12
  15. package/dist/cjs/packages/calendarcard/style/style.css +4 -8
  16. package/dist/cjs/packages/calendaritem/style/style.css +1 -6
  17. package/dist/cjs/packages/card/style/style.css +0 -4
  18. package/dist/cjs/packages/cascader/style/style.css +0 -4
  19. package/dist/cjs/packages/cell/style/style.css +0 -4
  20. package/dist/cjs/packages/cellgroup/style/style.css +0 -4
  21. package/dist/cjs/packages/checkbox/style/style.css +6 -10
  22. package/dist/cjs/packages/checkboxgroup/style/style.css +0 -4
  23. package/dist/cjs/packages/circleprogress/style/style.css +0 -4
  24. package/dist/cjs/packages/col/style/style.css +0 -4
  25. package/dist/cjs/packages/collapse/style/style.css +1 -6
  26. package/dist/cjs/packages/collapseitem/style/style.css +3 -7
  27. package/dist/cjs/packages/configprovider/style/style.css +1 -6
  28. package/dist/cjs/packages/configprovider/types.d.ts +1 -1
  29. package/dist/cjs/packages/countdown/style/style.css +1 -5
  30. package/dist/cjs/packages/countup/style/style.css +0 -4
  31. package/dist/cjs/packages/datepicker/style/style.css +1 -6
  32. package/dist/cjs/packages/datepickerview/style/style.css +0 -4
  33. package/dist/cjs/packages/dialog/style/style.css +1 -5
  34. package/dist/cjs/packages/divider/style/style.css +0 -4
  35. package/dist/cjs/packages/drag/style/style.css +0 -4
  36. package/dist/cjs/packages/elevator/style/style.css +1 -5
  37. package/dist/cjs/packages/ellipsis/style/style.css +0 -4
  38. package/dist/cjs/packages/empty/style/style.css +0 -4
  39. package/dist/cjs/packages/fixednav/style/style.css +0 -4
  40. package/dist/cjs/packages/form/style/style.css +1 -6
  41. package/dist/cjs/packages/formitem/style/style.css +0 -4
  42. package/dist/cjs/packages/grid/style/style.css +0 -4
  43. package/dist/cjs/packages/griditem/style/style.css +0 -4
  44. package/dist/cjs/packages/hoverbutton/style/style.css +0 -4
  45. package/dist/cjs/packages/hoverbuttonitem/style/style.css +0 -4
  46. package/dist/cjs/packages/image/style/style.css +0 -4
  47. package/dist/cjs/packages/imagepreview/style/style.css +0 -4
  48. package/dist/cjs/packages/indicator/indicator.js +6 -7
  49. package/dist/cjs/packages/indicator/style/indicator.scss +85 -37
  50. package/dist/cjs/packages/indicator/style/style.css +71 -36
  51. package/dist/cjs/packages/indicator/style-jmapp/indicator.scss +85 -37
  52. package/dist/cjs/packages/indicator/style-jmapp/style.css +65 -26
  53. package/dist/cjs/packages/indicator/style-jrkf/indicator.scss +85 -37
  54. package/dist/cjs/packages/indicator/style-jrkf/style.css +65 -26
  55. package/dist/cjs/packages/infiniteloading/style/style.css +0 -4
  56. package/dist/cjs/packages/input/style/style.css +4 -8
  57. package/dist/cjs/packages/inputnumber/style/style.css +3 -7
  58. package/dist/cjs/packages/layout/style/style.css +1 -6
  59. package/dist/cjs/packages/loading/style/style.css +0 -4
  60. package/dist/cjs/packages/lottie/style/style.css +1 -6
  61. package/dist/cjs/packages/menu/style/style.css +1 -5
  62. package/dist/cjs/packages/menuitem/style/style.css +0 -4
  63. package/dist/cjs/packages/navbar/style/style.css +0 -4
  64. package/dist/cjs/packages/noticebar/style/style.css +0 -4
  65. package/dist/cjs/packages/notify/style/style.css +0 -4
  66. package/dist/cjs/packages/numberkeyboard/style/style.css +0 -4
  67. package/dist/cjs/packages/overlay/style/style.css +0 -4
  68. package/dist/cjs/packages/pagination/style/style.css +2 -6
  69. package/dist/cjs/packages/picker/style/style.css +0 -4
  70. package/dist/cjs/packages/pickerview/style/style.css +0 -4
  71. package/dist/cjs/packages/popover/style/style.css +1 -5
  72. package/dist/cjs/packages/popup/style/style.css +0 -4
  73. package/dist/cjs/packages/price/style/style.css +0 -4
  74. package/dist/cjs/packages/progress/style/style.css +0 -4
  75. package/dist/cjs/packages/pulltorefresh/style/style.css +0 -4
  76. package/dist/cjs/packages/quickenter/style/style.css +0 -4
  77. package/dist/cjs/packages/radio/style/style.css +6 -10
  78. package/dist/cjs/packages/radiogroup/style/style.css +2 -6
  79. package/dist/cjs/packages/range/style/style.css +1 -5
  80. package/dist/cjs/packages/rate/style/style.css +0 -4
  81. package/dist/cjs/packages/resultpage/style/style.css +0 -4
  82. package/dist/cjs/packages/row/style/style.css +0 -4
  83. package/dist/cjs/packages/safearea/style/style.css +0 -4
  84. package/dist/cjs/packages/searchbar/style/style.css +1 -5
  85. package/dist/cjs/packages/segmented/style/style.css +1 -5
  86. package/dist/cjs/packages/shortpassword/style/style.css +1 -5
  87. package/dist/cjs/packages/sidebar/style/style.css +1 -5
  88. package/dist/cjs/packages/sidebaritem/style/style.css +0 -4
  89. package/dist/cjs/packages/signature/style/style.css +0 -4
  90. package/dist/cjs/packages/skeleton/style/style.css +0 -4
  91. package/dist/cjs/packages/space/style/style.css +0 -4
  92. package/dist/cjs/packages/step/style/style.css +1 -5
  93. package/dist/cjs/packages/steps/style/style.css +0 -4
  94. package/dist/cjs/packages/sticky/style/style.css +0 -4
  95. package/dist/cjs/packages/swipe/style/style.css +0 -4
  96. package/dist/cjs/packages/swiper/style/style.css +0 -4
  97. package/dist/cjs/packages/swiperitem/style/style.css +0 -4
  98. package/dist/cjs/packages/switch/style/style.css +35 -34
  99. package/dist/cjs/packages/switch/style/switch.scss +31 -18
  100. package/dist/cjs/packages/switch/style-jmapp/style.css +22 -17
  101. package/dist/cjs/packages/switch/style-jmapp/switch.scss +31 -18
  102. package/dist/cjs/packages/switch/style-jrkf/style.css +22 -17
  103. package/dist/cjs/packages/switch/style-jrkf/switch.scss +31 -18
  104. package/dist/cjs/packages/tabbar/style/style.css +0 -4
  105. package/dist/cjs/packages/tabbaritem/style/style.css +0 -4
  106. package/dist/cjs/packages/table/style/style.css +0 -4
  107. package/dist/cjs/packages/tabpane/style/style.css +0 -4
  108. package/dist/cjs/packages/tabs/style/style.css +3 -7
  109. package/dist/cjs/packages/tag/style/style.css +0 -4
  110. package/dist/cjs/packages/textarea/style/style.css +5 -9
  111. package/dist/cjs/packages/timedetail/style/style.css +0 -4
  112. package/dist/cjs/packages/timeselect/style/style.css +0 -4
  113. package/dist/cjs/packages/toast/style/style.css +0 -4
  114. package/dist/cjs/packages/tour/style/style.css +1 -5
  115. package/dist/cjs/packages/trendarrow/style/style.css +0 -4
  116. package/dist/cjs/packages/uploader/style/style.css +2 -6
  117. package/dist/cjs/packages/video/style/style.css +0 -4
  118. package/dist/cjs/packages/virtuallist/style/style.css +0 -4
  119. package/dist/cjs/packages/watermark/style/style.css +0 -4
  120. package/dist/cjs/types/spec/indicator/base.d.ts +2 -0
  121. package/dist/cjs/utils/scale-f.d.ts +0 -17
  122. package/dist/cjs/utils/scale-f.js +14 -105
  123. package/dist/es/packages/actionsheet/style/style.css +1 -5
  124. package/dist/es/packages/address/style/style.css +2 -6
  125. package/dist/es/packages/animate/style/style.css +0 -4
  126. package/dist/es/packages/animatingnumbers/style/style.css +1 -6
  127. package/dist/es/packages/audio/style/style.css +2 -6
  128. package/dist/es/packages/avatar/style/style.css +0 -4
  129. package/dist/es/packages/avatarcropper/style/style.css +0 -4
  130. package/dist/es/packages/avatargroup/style/style.css +0 -4
  131. package/dist/es/packages/backtop/style/style.css +0 -4
  132. package/dist/es/packages/badge/style/style.css +5 -9
  133. package/dist/es/packages/barrage/style/style.css +0 -4
  134. package/dist/es/packages/button/style/style.css +21 -25
  135. package/dist/es/packages/calendar/style/style.css +8 -12
  136. package/dist/es/packages/calendarcard/style/style.css +4 -8
  137. package/dist/es/packages/calendaritem/style/style.css +1 -6
  138. package/dist/es/packages/card/style/style.css +0 -4
  139. package/dist/es/packages/cascader/style/style.css +0 -4
  140. package/dist/es/packages/cell/style/style.css +0 -4
  141. package/dist/es/packages/cellgroup/style/style.css +0 -4
  142. package/dist/es/packages/checkbox/style/style.css +6 -10
  143. package/dist/es/packages/checkboxgroup/style/style.css +0 -4
  144. package/dist/es/packages/circleprogress/style/style.css +0 -4
  145. package/dist/es/packages/col/style/style.css +0 -4
  146. package/dist/es/packages/collapse/style/style.css +1 -6
  147. package/dist/es/packages/collapseitem/style/style.css +3 -7
  148. package/dist/es/packages/configprovider/style/style.css +1 -6
  149. package/dist/es/packages/configprovider/types.d.ts +1 -1
  150. package/dist/es/packages/countdown/style/style.css +1 -5
  151. package/dist/es/packages/countup/style/style.css +0 -4
  152. package/dist/es/packages/datepicker/style/style.css +1 -6
  153. package/dist/es/packages/datepickerview/style/style.css +0 -4
  154. package/dist/es/packages/dialog/style/style.css +1 -5
  155. package/dist/es/packages/divider/style/style.css +0 -4
  156. package/dist/es/packages/drag/style/style.css +0 -4
  157. package/dist/es/packages/elevator/style/style.css +1 -5
  158. package/dist/es/packages/ellipsis/style/style.css +0 -4
  159. package/dist/es/packages/empty/style/style.css +0 -4
  160. package/dist/es/packages/fixednav/style/style.css +0 -4
  161. package/dist/es/packages/form/style/style.css +1 -6
  162. package/dist/es/packages/formitem/style/style.css +0 -4
  163. package/dist/es/packages/grid/style/style.css +0 -4
  164. package/dist/es/packages/griditem/style/style.css +0 -4
  165. package/dist/es/packages/hoverbutton/style/style.css +0 -4
  166. package/dist/es/packages/hoverbuttonitem/style/style.css +0 -4
  167. package/dist/es/packages/image/style/style.css +0 -4
  168. package/dist/es/packages/imagepreview/style/style.css +0 -4
  169. package/dist/es/packages/indicator/indicator.js +6 -7
  170. package/dist/es/packages/indicator/style/indicator.scss +85 -37
  171. package/dist/es/packages/indicator/style/style.css +71 -36
  172. package/dist/es/packages/indicator/style-jmapp/indicator.scss +85 -37
  173. package/dist/es/packages/indicator/style-jmapp/style.css +65 -26
  174. package/dist/es/packages/indicator/style-jrkf/indicator.scss +85 -37
  175. package/dist/es/packages/indicator/style-jrkf/style.css +65 -26
  176. package/dist/es/packages/infiniteloading/style/style.css +0 -4
  177. package/dist/es/packages/input/style/style.css +4 -8
  178. package/dist/es/packages/inputnumber/style/style.css +3 -7
  179. package/dist/es/packages/layout/style/style.css +1 -6
  180. package/dist/es/packages/loading/style/style.css +0 -4
  181. package/dist/es/packages/lottie/style/style.css +1 -6
  182. package/dist/es/packages/menu/style/style.css +1 -5
  183. package/dist/es/packages/menuitem/style/style.css +0 -4
  184. package/dist/es/packages/navbar/style/style.css +0 -4
  185. package/dist/es/packages/noticebar/style/style.css +0 -4
  186. package/dist/es/packages/notify/style/style.css +0 -4
  187. package/dist/es/packages/numberkeyboard/style/style.css +0 -4
  188. package/dist/es/packages/overlay/style/style.css +0 -4
  189. package/dist/es/packages/pagination/style/style.css +2 -6
  190. package/dist/es/packages/picker/style/style.css +0 -4
  191. package/dist/es/packages/pickerview/style/style.css +0 -4
  192. package/dist/es/packages/popover/style/style.css +1 -5
  193. package/dist/es/packages/popup/style/style.css +0 -4
  194. package/dist/es/packages/price/style/style.css +0 -4
  195. package/dist/es/packages/progress/style/style.css +0 -4
  196. package/dist/es/packages/pulltorefresh/style/style.css +0 -4
  197. package/dist/es/packages/quickenter/style/style.css +0 -4
  198. package/dist/es/packages/radio/style/style.css +6 -10
  199. package/dist/es/packages/radiogroup/style/style.css +2 -6
  200. package/dist/es/packages/range/style/style.css +1 -5
  201. package/dist/es/packages/rate/style/style.css +0 -4
  202. package/dist/es/packages/resultpage/style/style.css +0 -4
  203. package/dist/es/packages/row/style/style.css +0 -4
  204. package/dist/es/packages/safearea/style/style.css +0 -4
  205. package/dist/es/packages/searchbar/style/style.css +1 -5
  206. package/dist/es/packages/segmented/style/style.css +1 -5
  207. package/dist/es/packages/shortpassword/style/style.css +1 -5
  208. package/dist/es/packages/sidebar/style/style.css +1 -5
  209. package/dist/es/packages/sidebaritem/style/style.css +0 -4
  210. package/dist/es/packages/signature/style/style.css +0 -4
  211. package/dist/es/packages/skeleton/style/style.css +0 -4
  212. package/dist/es/packages/space/style/style.css +0 -4
  213. package/dist/es/packages/step/style/style.css +1 -5
  214. package/dist/es/packages/steps/style/style.css +0 -4
  215. package/dist/es/packages/sticky/style/style.css +0 -4
  216. package/dist/es/packages/swipe/style/style.css +0 -4
  217. package/dist/es/packages/swiper/style/style.css +0 -4
  218. package/dist/es/packages/swiperitem/style/style.css +0 -4
  219. package/dist/es/packages/switch/style/style.css +35 -34
  220. package/dist/es/packages/switch/style/switch.scss +31 -18
  221. package/dist/es/packages/switch/style-jmapp/style.css +22 -17
  222. package/dist/es/packages/switch/style-jmapp/switch.scss +31 -18
  223. package/dist/es/packages/switch/style-jrkf/style.css +22 -17
  224. package/dist/es/packages/switch/style-jrkf/switch.scss +31 -18
  225. package/dist/es/packages/tabbar/style/style.css +0 -4
  226. package/dist/es/packages/tabbaritem/style/style.css +0 -4
  227. package/dist/es/packages/table/style/style.css +0 -4
  228. package/dist/es/packages/tabpane/style/style.css +0 -4
  229. package/dist/es/packages/tabs/style/style.css +3 -7
  230. package/dist/es/packages/tag/style/style.css +0 -4
  231. package/dist/es/packages/textarea/style/style.css +5 -9
  232. package/dist/es/packages/timedetail/style/style.css +0 -4
  233. package/dist/es/packages/timeselect/style/style.css +0 -4
  234. package/dist/es/packages/toast/style/style.css +0 -4
  235. package/dist/es/packages/tour/style/style.css +1 -5
  236. package/dist/es/packages/trendarrow/style/style.css +0 -4
  237. package/dist/es/packages/uploader/style/style.css +2 -6
  238. package/dist/es/packages/video/style/style.css +0 -4
  239. package/dist/es/packages/virtuallist/style/style.css +0 -4
  240. package/dist/es/packages/watermark/style/style.css +0 -4
  241. package/dist/es/types/spec/indicator/base.d.ts +5 -0
  242. package/dist/es/utils/scale-f.d.ts +0 -17
  243. package/dist/es/utils/scale-f.js +15 -106
  244. package/dist/nutui.react.umd.js +12 -102
  245. package/dist/style-jmapp.css +1 -1
  246. package/dist/style-jmapp.scss +33 -33
  247. package/dist/style-jrkf.css +1 -1
  248. package/dist/style-jrkf.scss +34 -34
  249. package/dist/style.css +1 -1
  250. package/dist/style.scss +42 -42
  251. package/dist/styles/theme-dark.scss +5 -2
  252. package/dist/styles/theme-default.scss +4 -1
  253. package/dist/styles/themes/dark.css +1 -1
  254. package/dist/styles/themes/default.css +1 -1
  255. package/dist/styles/variables-daojia.scss +28 -0
  256. package/dist/styles/variables-jmapp.scss +28 -0
  257. package/dist/styles/variables-jrkf.scss +28 -0
  258. package/dist/styles/variables.scss +41 -22
  259. package/package.json +1 -1
@@ -9,10 +9,6 @@ page {
9
9
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
10
10
  }
11
11
 
12
- /* #ifdef harmony */
13
- /* #endif */
14
- /* #ifndef harmony */
15
- /* #endif */
16
12
  .nut-popup {
17
13
  position: fixed;
18
14
  min-height: 26%;
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-price {
16
12
  direction: ltr;
17
13
  font-size: var(--nutui-font-size-l, calc(15px * var(--nut-scale-font, var(--nut-scale-f, 1))));
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-progress {
16
12
  display: flex;
17
13
  align-items: center;
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-pulltorefresh-head {
16
12
  overflow: hidden;
17
13
  position: relative;
@@ -9,10 +9,6 @@ page {
9
9
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
10
10
  }
11
11
 
12
- /* #ifdef harmony */
13
- /* #endif */
14
- /* #ifndef harmony */
15
- /* #endif */
16
12
  .nut-quickenter {
17
13
  width: 100%;
18
14
  /* 限制弹层最大高度,包含安全区 */
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-radio {
16
12
  display: flex;
17
13
  align-items: center;
@@ -35,10 +31,10 @@ page {
35
31
  color: var(--nutui-radio-label-color, var(--nutui-color-title, #1a1a1a));
36
32
  }
37
33
  .nut-radio-label-disabled {
38
- color: var(--nutui-radio-label-disable-color, var(--nutui-color-text-disabled, #c2c4cc));
34
+ color: var(--nutui-radio-label-disable-color, var(--nutui-color-text-disabled, #b4b8bf));
39
35
  }
40
36
  .nut-radio-icon {
41
- color: var(--nutui-color-text-disabled, #c2c4cc);
37
+ color: var(--nutui-color-text-disabled, #b4b8bf);
42
38
  background-color: var(--nutui-color-background-overlay, #ffffff);
43
39
  transition-duration: 0.3s;
44
40
  transition-property: color, border-color, background-color;
@@ -58,7 +54,7 @@ page {
58
54
  border-radius: 50%;
59
55
  }
60
56
  .nut-radio-icon-disabled {
61
- color: var(--nutui-color-text-disabled, #c2c4cc);
57
+ color: var(--nutui-color-text-disabled, #b4b8bf);
62
58
  }
63
59
  .nut-radio-button {
64
60
  /* #ifdef dynamic*/
@@ -83,13 +79,13 @@ page {
83
79
  border: var(--nutui-radio-button-active-border, calc(1px * var(--nut-scale-f, 1)) solid var(--nutui-color-primary, #ff0f23));
84
80
  }
85
81
  .nut-radio-button-disabled {
86
- color: var(--nutui-color-text-disabled, #c2c4cc);
82
+ color: var(--nutui-color-text-disabled, #b4b8bf);
87
83
  border: calc(1px * var(--nut-scale-f, 1)) solid var(--nutui-radio-button-background, rgba(250, 44, 25, 0.05));
88
84
  }
89
85
  .nut-radio .nut-radio-button-active.nut-radio-button-disabled {
90
- background: var(--nutui-color-text-disabled, #c2c4cc);
86
+ background: var(--nutui-color-text-disabled, #b4b8bf);
91
87
  color: #ffffff;
92
- border: calc(1px * var(--nut-scale-f, 1)) solid var(--nutui-color-text-disabled, #c2c4cc);
88
+ border: calc(1px * var(--nut-scale-f, 1)) solid var(--nutui-color-text-disabled, #b4b8bf);
93
89
  }
94
90
 
95
91
  [dir=rtl] .nut-radio:last-child,
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-radiogroup .nut-radio {
16
12
  margin: 0 var(--nutui-radiogroup-radio-margin, calc(20px * var(--nut-scale-f, 1))) var(--nutui-radiogroup-radio-margin-bottom, calc(5px * var(--nut-scale-f, 1))) 0;
17
13
  }
@@ -49,9 +45,9 @@ page {
49
45
  margin: 0 var(--nutui-radiogroup-radio-margin, calc(20px * var(--nut-scale-f, 1))) var(--nutui-radiogroup-radio-margin-bottom, calc(5px * var(--nut-scale-f, 1))) 0;
50
46
  }
51
47
  .nut-radiogroup .nut-radio-button-active.nut-radio-button-disabled {
52
- background: var(--nutui-color-text-disabled, #c2c4cc);
48
+ background: var(--nutui-color-text-disabled, #b4b8bf);
53
49
  color: #ffffff;
54
- border: calc(1px * var(--nut-scale-f, 1)) solid var(--nutui-color-text-disabled, #c2c4cc);
50
+ border: calc(1px * var(--nut-scale-f, 1)) solid var(--nutui-color-text-disabled, #b4b8bf);
55
51
  }
56
52
 
57
53
  [dir=rtl] .nut-radiogroup .nut-radio,
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-range-container {
16
12
  display: flex;
17
13
  flex-direction: row;
@@ -64,7 +60,7 @@ page {
64
60
  display: flex;
65
61
  width: var(--nutui-range-button-width, calc(24px * var(--nut-scale-f, 1)));
66
62
  height: var(--nutui-range-button-height, calc(24px * var(--nut-scale-f, 1)));
67
- background: var(--nutui-range-button-background, #ffffff);
63
+ background: var(--nutui-range-button-background, var(--nutui-color-primary-text, #ffffff));
68
64
  border-radius: 50%;
69
65
  box-shadow: 0 calc(1px * var(--nut-scale-f, 1)) calc(2px * var(--nut-scale-f, 1)) 0 rgba(0, 0, 0, 0.15);
70
66
  border: var(--nutui-range-button-border, calc(1px * var(--nut-scale-f, 1)) solid var(--nutui-color-primary, #ff0f23));
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-rate {
16
12
  display: flex;
17
13
  touch-action: pan-x;
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-resultpage {
16
12
  width: 100%;
17
13
  display: flex;
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-row {
16
12
  display: flex;
17
13
  flex-direction: row;
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-safe-area {
16
12
  display: flex;
17
13
  width: 100%;
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-searchbar {
16
12
  display: flex;
17
13
  align-items: center;
@@ -115,7 +111,7 @@ page {
115
111
  width: var(--nutui-icon-size-6, calc(6px * var(--nut-scale-icon, var(--nut-scale-f, 1))));
116
112
  height: var(--nutui-icon-size-6, calc(6px * var(--nut-scale-icon, var(--nut-scale-f, 1))));
117
113
  font-size: var(--nutui-icon-size-6, calc(6px * var(--nut-scale-icon, var(--nut-scale-f, 1))));
118
- color: var(--nutui-color-text-disabled, #c2c4cc);
114
+ color: var(--nutui-color-text-disabled, #b4b8bf);
119
115
  margin-left: calc(4px * var(--nut-scale-f, 1));
120
116
  }
121
117
  .nut-searchbar-left, .nut-searchbar-right {
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-segmented {
16
12
  /* #ifdef dynamic*/
17
13
  display: flex;
@@ -35,7 +31,7 @@ page {
35
31
  justify-content: center;
36
32
  padding: var(--nutui-segmented-item-padding, 0 var(--nutui-spacing-xs, calc(6px * var(--nut-scale-f, 1))));
37
33
  border-radius: var(--nutui-segmented-item-radius, var(--nutui-radius-xs, calc(4px * var(--nut-scale-f, 1))));
38
- color: var(--nutui-segmented-item-color, #ffffff);
34
+ color: var(--nutui-segmented-item-color, var(--nutui-color-primary-text, #ffffff));
39
35
  font-size: var(--nutui-segmented-item-fontsize, var(--nutui-font-size-s, calc(12px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
40
36
  line-height: var(--nutui-line-height-s, var(--nutui-font-size-s, calc(12px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
41
37
  box-sizing: border-box;
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-shortpassword-popup {
16
12
  padding: calc(32px * var(--nut-scale-f, 1)) calc(24px * var(--nut-scale-f, 1)) calc(28px * var(--nut-scale-f, 1)) calc(24px * var(--nut-scale-f, 1));
17
13
  border-radius: calc(12px * var(--nut-scale-f, 1));
@@ -125,7 +121,7 @@ page {
125
121
  padding: calc(8px * var(--nut-scale-f, 1)) calc(38px * var(--nut-scale-f, 1));
126
122
  line-height: var(--nutui-line-height-base, var(--nutui-font-size-base, calc(14px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
127
123
  font-size: var(--nutui-font-size-base, calc(14px * var(--nut-scale-font, var(--nut-scale-f, 1))));
128
- color: #ffffff;
124
+ color: var(--nutui-color-primary-text, #ffffff);
129
125
  }
130
126
 
131
127
  [dir=rtl] .nut-shortpassword-input-real,
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-sidebar {
16
12
  display: flex;
17
13
  }
@@ -68,6 +64,6 @@ page {
68
64
  font-size: var(--nutui-sidebar-active-font-size, var(--nutui-font-size-l, calc(15px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
69
65
  }
70
66
  .nut-sidebar-titles-item-disabled {
71
- color: var(--nutui-color-text-disabled, #c2c4cc);
67
+ color: var(--nutui-color-text-disabled, #b4b8bf);
72
68
  cursor: not-allowed;
73
69
  }
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-sidebaritem {
16
12
  width: 100%;
17
13
  height: 100%;
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-signature .spcanvas_WEAPP {
16
12
  width: 100%;
17
13
  height: 100%;
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-skeleton {
16
12
  line-height: 0;
17
13
  font-size: 0px;
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-space {
16
12
  display: flex;
17
13
  }
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-step {
16
12
  position: relative;
17
13
  display: flex;
@@ -45,7 +41,7 @@ page {
45
41
  .nut-step-head-dot {
46
42
  height: var(--nutui-steps-base-head-dot-size, var(--nutui-icon-size-6, calc(6px * var(--nut-scale-icon, var(--nut-scale-f, 1)))));
47
43
  width: var(--nutui-steps-base-head-dot-size, var(--nutui-icon-size-6, calc(6px * var(--nut-scale-icon, var(--nut-scale-f, 1)))));
48
- background-color: var(--nutui-steps-base-head-dot-background-color, var(--nutui-color-text-disabled, #c2c4cc));
44
+ background-color: var(--nutui-steps-base-head-dot-background-color, var(--nutui-color-text-disabled, #b4b8bf));
49
45
  }
50
46
  .nut-step-head-dot, .nut-step-head-icon, .nut-step-head-text {
51
47
  display: flex;
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-steps {
16
12
  display: flex;
17
13
  }
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-sticky-fixed {
16
12
  position: fixed;
17
13
  }
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-swipe {
16
12
  display: flex;
17
13
  flex-direction: row;
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-swiper {
16
12
  width: 100%;
17
13
  height: 100%;
@@ -8,10 +8,6 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-swiper-item {
16
12
  height: 100%;
17
13
  }
@@ -8,11 +8,13 @@ page {
8
8
  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
9
9
  }
10
10
 
11
- /* #ifdef harmony */
12
- /* #endif */
13
- /* #ifndef harmony */
14
- /* #endif */
15
11
  .nut-switch {
12
+ --nut-switch-height: var(--nutui-switch-height, calc(24px * var(--nut-scale-f, 1)));
13
+ --nut-switch-inside-width: var(--nutui-switch-inside-width, calc(32px * var(--nut-scale-f, 1)));
14
+ --nut-switch-border-width: var(--nutui-switch-border-width, calc(2px * var(--nut-scale-f, 1)));
15
+ --nut-switch-label-margin-offset: calc(
16
+ var(--nut-switch-inside-width) + var(--nut-switch-border-width) + 3px
17
+ );
16
18
  cursor: pointer;
17
19
  position: relative;
18
20
  /* #ifdef dynamic*/
@@ -23,9 +25,8 @@ page {
23
25
  /* #endif */
24
26
  flex-direction: row;
25
27
  align-items: center;
26
- min-width: var(--nutui-switch-width, calc(46px * var(--nut-scale-f, 1)));
27
- height: var(--nutui-switch-height, calc(28px * var(--nut-scale-f, 1)));
28
- line-height: var(--nutui-switch-line-height, calc(28px * var(--nut-scale-f, 1)));
28
+ min-width: var(--nutui-switch-width, calc(56px * var(--nut-scale-f, 1)));
29
+ height: var(--nutui-switch-height, calc(24px * var(--nut-scale-f, 1)));
29
30
  background-color: var(--nutui-switch-active-background-color, var(--nutui-color-primary, #ff0f23));
30
31
  border-radius: var(--nutui-switch-border-radius, calc(50px * var(--nut-scale-f, 1)));
31
32
  background-size: 100% 100%;
@@ -41,39 +42,39 @@ page {
41
42
  flex-direction: row;
42
43
  align-items: center;
43
44
  justify-content: center;
44
- height: calc(var(--nutui-switch-height, calc(28px * var(--nut-scale-f, 1))) - var(--nutui-switch-border-width, calc(2px * var(--nut-scale-f, 1))) * 2);
45
- width: calc(var(--nutui-switch-height, calc(28px * var(--nut-scale-f, 1))) - var(--nutui-switch-border-width, calc(2px * var(--nut-scale-f, 1))) * 2);
46
- border-radius: var(--nutui-switch-inside-border-radius, 50%);
47
- background: #ffffff;
45
+ height: var(--nutui-switch-inside-height, calc(20px * var(--nut-scale-f, 1)));
46
+ width: var(--nutui-switch-inside-width, calc(32px * var(--nut-scale-f, 1)));
47
+ border-radius: var(--nutui-switch-inside-border-radius, calc(50px * var(--nut-scale-f, 1)));
48
+ background: var(--nutui-color-primary-text, #ffffff);
48
49
  transition: left 0.3s linear;
49
- box-shadow: var(--nutui-switch-inside-box-shadow, 0px calc(2px * var(--nut-scale-f, 1)) calc(6px * var(--nut-scale-f, 1)) 0px rgba(0, 0, 0, 0.1));
50
+ box-shadow: var(--nutui-switch-inside-box-shadow, 0px calc(4px * var(--nut-scale-f, 1)) calc(8px * var(--nut-scale-f, 1)) 0px rgba(0, 0, 0, 0.12));
50
51
  }
51
52
  .nut-switch-button-open {
52
- left: calc(100% - var(--nutui-switch-height, calc(28px * var(--nut-scale-f, 1))) + var(--nutui-switch-border-width, calc(2px * var(--nut-scale-f, 1))));
53
+ left: calc(100% - var(--nut-switch-inside-width) - var(--nut-switch-border-width));
53
54
  }
54
55
  .nut-switch-button-open-rtl {
55
- left: var(--nutui-switch-border-width, calc(2px * var(--nut-scale-f, 1)));
56
+ left: var(--nut-switch-border-width);
56
57
  }
57
58
  .nut-switch-button-close {
58
- left: var(--nutui-switch-border-width, calc(2px * var(--nut-scale-f, 1)));
59
+ left: var(--nut-switch-border-width);
59
60
  }
60
61
  .nut-switch-button-close-rtl {
61
- left: calc(100% - var(--nutui-switch-height, calc(28px * var(--nut-scale-f, 1))) + var(--nutui-switch-border-width, calc(2px * var(--nut-scale-f, 1))));
62
- }
63
- .nut-switch-button .nut-icon {
64
- width: calc((var(--nutui-switch-height, calc(28px * var(--nut-scale-f, 1))) - var(--nutui-switch-border-width, calc(2px * var(--nut-scale-f, 1))) * 2) / 2);
65
- height: calc((var(--nutui-switch-height, calc(28px * var(--nut-scale-f, 1))) - var(--nutui-switch-border-width, calc(2px * var(--nut-scale-f, 1))) * 2) / 2);
66
- color: var(--nutui-switch-active-disabled-background-color, var(--nutui-color-primary-disabled-special, #ff91a5));
62
+ left: calc(100% - var(--nut-switch-inside-width) - var(--nut-switch-border-width));
67
63
  }
68
64
  .nut-switch-close {
69
- background-color: var(--nutui-switch-inactive-background-color, var(--nutui-color-text-disabled, #c2c4cc));
65
+ background-color: var(--nutui-switch-inactive-background-color, var(--nutui-color-text-disabled, #b4b8bf));
70
66
  }
71
67
  .nut-switch-close-line {
72
- width: calc((var(--nutui-switch-height, calc(28px * var(--nut-scale-f, 1))) - var(--nutui-switch-border-width, calc(2px * var(--nut-scale-f, 1))) * 2) / 2);
68
+ width: calc((var(--nut-switch-height) - var(--nut-switch-border-width) * 2) * 0.5);
73
69
  height: calc(2px * var(--nut-scale-f, 1));
74
- background: var(--nutui-switch-inactive-line-background-color, #ffffff);
70
+ background: var(--nutui-switch-inactive-line-background-color, var(--nutui-color-primary-text, #ffffff));
75
71
  border-radius: calc(2px * var(--nut-scale-f, 1));
76
72
  }
73
+ .nut-switch .nut-icon {
74
+ width: calc(var(--nut-switch-height) * 0.5);
75
+ height: calc(var(--nut-switch-height) * 0.5);
76
+ color: var(--nutui-switch-active-disabled-background-color, var(--nutui-color-primary-disabled-special, #ff91a5));
77
+ }
77
78
  .nut-switch-label {
78
79
  /* #ifdef dynamic*/
79
80
  display: flex;
@@ -84,33 +85,33 @@ page {
84
85
  align-items: center;
85
86
  height: 100%;
86
87
  white-space: nowrap;
87
- color: var(--nutui-switch-label-text-color, #ffffff);
88
- font-size: var(--nutui-switch-label-font-size, var(--nutui-font-size-s, calc(12px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
88
+ color: var(--nutui-switch-label-text-color, var(--nutui-color-primary-text, #ffffff));
89
+ font-size: var(--nutui-switch-label-font-size, var(--nutui-font-size-xs, calc(11px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
89
90
  }
90
91
  .nut-switch-label .nut-icon {
91
- color: var(--nutui-switch-label-text-color, #ffffff);
92
+ color: var(--nutui-switch-label-text-color, var(--nutui-color-primary-text, #ffffff));
92
93
  }
93
94
  .nut-switch-label-open {
94
- margin: 0 calc(var(--nutui-switch-height, calc(28px * var(--nut-scale-f, 1))) - var(--nutui-switch-border-width, calc(2px * var(--nut-scale-f, 1))) + 3px * var(--nut-scale-f, 1)) 0 calc(7px * var(--nut-scale-f, 1));
95
+ margin: 0 var(--nut-switch-label-margin-offset) 0 calc(7px * var(--nut-scale-f, 1));
95
96
  }
96
97
  .nut-switch-label-open-rtl {
97
- margin: 0 calc(7px * var(--nut-scale-f, 1)) 0 calc(var(--nutui-switch-height, calc(28px * var(--nut-scale-f, 1))) - var(--nutui-switch-border-width, calc(2px * var(--nut-scale-f, 1))) + 3px * var(--nut-scale-f, 1));
98
+ margin: 0 calc(7px * var(--nut-scale-f, 1)) 0 var(--nut-switch-label-margin-offset);
98
99
  }
99
100
  .nut-switch-label-close {
100
- margin: 0 calc(7px * var(--nut-scale-f, 1)) 0 calc(var(--nutui-switch-height, calc(28px * var(--nut-scale-f, 1))) - var(--nutui-switch-border-width, calc(2px * var(--nut-scale-f, 1))) + 3px * var(--nut-scale-f, 1));
101
+ margin: 0 calc(7px * var(--nut-scale-f, 1)) 0 var(--nut-switch-label-margin-offset);
101
102
  }
102
103
  .nut-switch-label-close-rtl {
103
- margin: 0 calc(var(--nutui-switch-height, calc(28px * var(--nut-scale-f, 1))) - var(--nutui-switch-border-width, calc(2px * var(--nut-scale-f, 1))) + 3px * var(--nut-scale-f, 1)) 0 calc(7px * var(--nut-scale-f, 1));
104
+ margin: 0 var(--nut-switch-label-margin-offset) 0 calc(7px * var(--nut-scale-f, 1));
104
105
  }
105
106
  .nut-switch-label-close-disabled {
106
- color: var(--nutui-switch-inactive-disabled-label-text-color, var(--nutui-color-text-disabled, #c2c4cc));
107
+ color: var(--nutui-switch-inactive-disabled-label-text-color, var(--nutui-color-text-disabled, #b4b8bf));
107
108
  }
108
109
  .nut-switch-label-close-disabled .nut-icon {
109
- color: var(--nutui-switch-inactive-disabled-label-text-color, var(--nutui-color-text-disabled, #c2c4cc));
110
+ color: var(--nutui-switch-inactive-disabled-label-text-color, var(--nutui-color-text-disabled, #b4b8bf));
110
111
  }
111
112
  .nut-switch-disabled {
112
113
  background-color: var(--nutui-switch-active-disabled-background-color, var(--nutui-color-primary-disabled-special, #ff91a5));
113
114
  }
114
115
  .nut-switch-disabled-close {
115
- background-color: var(--nutui-switch-inactive-disabled-background-color, var(--nutui-color-background, #f2f3f5));
116
+ background-color: var(--nutui-switch-inactive-disabled-background-color, var(--nutui-color-background-component));
116
117
  }
@@ -1,4 +1,11 @@
1
1
  .nut-switch {
2
+ --nut-switch-height: #{$switch-height};
3
+ --nut-switch-inside-width: #{$switch-inside-width};
4
+ --nut-switch-border-width: #{$switch-border-width};
5
+ --nut-switch-label-margin-offset: calc(
6
+ var(--nut-switch-inside-width) + var(--nut-switch-border-width) + 3px
7
+ );
8
+
2
9
  cursor: pointer;
3
10
  position: relative;
4
11
  /* #ifdef dynamic*/
@@ -11,13 +18,12 @@
11
18
  align-items: center;
12
19
  min-width: $switch-width;
13
20
  height: $switch-height;
14
- line-height: $switch-line-height;
15
21
  background-color: $switch-active-background-color;
16
22
  border-radius: $switch-border-radius;
17
23
  background-size: 100% 100%;
18
24
  background-repeat: no-repeat;
19
25
  background-position: center center;
20
- flex: 0 0 auto; // 防止被压缩
26
+ flex: 0 0 auto;
21
27
 
22
28
  &-button {
23
29
  position: absolute;
@@ -27,41 +33,48 @@
27
33
  flex-direction: row;
28
34
  align-items: center;
29
35
  justify-content: center;
30
- height: calc($switch-height - $switch-border-width * 2);
31
- width: calc($switch-height - $switch-border-width * 2);
36
+ height: $switch-inside-height;
37
+ width: $switch-inside-width;
32
38
  border-radius: $switch-inside-border-radius;
33
39
  background: $color-primary-text;
34
40
  transition: left 0.3s linear;
35
41
  box-shadow: $switch-inside-box-shadow;
36
42
  &-open {
37
- left: calc(100% - $switch-height + $switch-border-width);
43
+ left: calc(
44
+ 100% - var(--nut-switch-inside-width) - var(--nut-switch-border-width)
45
+ );
38
46
  &-rtl {
39
- left: $switch-border-width;
47
+ left: var(--nut-switch-border-width);
40
48
  }
41
49
  }
42
50
  &-close {
43
- left: $switch-border-width;
51
+ left: var(--nut-switch-border-width);
44
52
  &-rtl {
45
- left: calc(100% - $switch-height + $switch-border-width);
53
+ left: calc(
54
+ 100% - var(--nut-switch-inside-width) - var(--nut-switch-border-width)
55
+ );
46
56
  }
47
57
  }
48
- .nut-icon {
49
- width: calc(($switch-height - $switch-border-width * 2) / 2);
50
- height: calc(($switch-height - $switch-border-width * 2) / 2);
51
- color: $switch-active-disabled-background-color;
52
- }
53
58
  }
54
59
 
55
60
  &-close {
56
61
  background-color: $switch-inactive-background-color;
57
62
  &-line {
58
- width: calc(($switch-height - $switch-border-width * 2) / 2);
63
+ width: calc(
64
+ (var(--nut-switch-height) - var(--nut-switch-border-width) * 2) * 0.5
65
+ );
59
66
  height: scale-px(2px);
60
67
  background: $switch-inactive-line-background-color;
61
68
  border-radius: scale-px(2px);
62
69
  }
63
70
  }
64
71
 
72
+ .nut-icon {
73
+ width: calc(var(--nut-switch-height) * 0.5);
74
+ height: calc(var(--nut-switch-height) * 0.5);
75
+ color: $switch-active-disabled-background-color;
76
+ }
77
+
65
78
  &-label {
66
79
  /* #ifdef dynamic*/
67
80
  display: flex;
@@ -78,16 +91,16 @@
78
91
  color: $switch-label-text-color;
79
92
  }
80
93
  &-open {
81
- margin: 0 calc($switch-height - $switch-border-width + scale-px(3px)) 0 scale-px(7px);
94
+ margin: 0 var(--nut-switch-label-margin-offset) 0 scale-px(7px);
82
95
  &-rtl {
83
- margin: 0 scale-px(7px) 0 calc($switch-height - $switch-border-width + scale-px(3px));
96
+ margin: 0 scale-px(7px) 0 var(--nut-switch-label-margin-offset);
84
97
  }
85
98
  }
86
99
 
87
100
  &-close {
88
- margin: 0 scale-px(7px) 0 calc($switch-height - $switch-border-width + scale-px(3px));
101
+ margin: 0 scale-px(7px) 0 var(--nut-switch-label-margin-offset);
89
102
  &-rtl {
90
- margin: 0 calc($switch-height - $switch-border-width + scale-px(3px)) 0 scale-px(7px);
103
+ margin: 0 var(--nut-switch-label-margin-offset) 0 scale-px(7px);
91
104
  }
92
105
  }
93
106