@nutui/nutui-react-taro 1.4.6 → 1.4.7-beta.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.
Files changed (116) hide show
  1. package/CHANGELOG.md +26 -0
  2. package/dist/esm/ActionSheet.js +3 -3
  3. package/dist/esm/Address.js +4 -4
  4. package/dist/esm/Audio.js +3 -3
  5. package/dist/esm/Avatar.js +3 -3
  6. package/dist/esm/Button.js +2 -2
  7. package/dist/esm/Calendar.js +3 -3
  8. package/dist/esm/Card.js +4 -4
  9. package/dist/esm/Cascader.js +3 -3
  10. package/dist/esm/DatePicker.js +4 -4
  11. package/dist/esm/Dialog.js +3 -3
  12. package/dist/esm/Elevator.js +2 -2
  13. package/dist/esm/ImagePreview.js +4 -4
  14. package/dist/esm/Notify.js +2 -2
  15. package/dist/esm/NumberKeyboard.js +3 -3
  16. package/dist/esm/Picker.js +3 -3
  17. package/dist/esm/Popup.js +2 -2
  18. package/dist/esm/Progress.js +3 -3
  19. package/dist/esm/Radio.js +1 -1
  20. package/dist/esm/RadioGroup.js +2 -2
  21. package/dist/esm/SearchBar.js +2 -2
  22. package/dist/esm/ShortPassword.js +3 -3
  23. package/dist/esm/SideNavBar.js +3 -3
  24. package/dist/esm/Signature.js +3 -3
  25. package/dist/esm/Skeleton.js +4 -4
  26. package/dist/esm/Swipe.js +2 -2
  27. package/dist/esm/Swiper.js +2 -2
  28. package/dist/esm/Tabbar.js +2 -2
  29. package/dist/esm/TabbarItem.js +2 -2
  30. package/dist/esm/Tag.js +3 -3
  31. package/dist/esm/TimeSelect.js +3 -3
  32. package/dist/esm/Uploader.js +4 -5
  33. package/dist/esm/{actionsheet.taro-27121a38.js → actionsheet.taro-166ce936.js} +1 -1
  34. package/dist/esm/{address.taro-1765a37c.js → address.taro-55f308f1.js} +2 -2
  35. package/dist/esm/{audio.taro-cf530b91.js → audio.taro-c2cdbe18.js} +1 -1
  36. package/dist/esm/{avatar.taro-1d2bf09a.js → avatar.taro-c17c3d15.js} +1 -1
  37. package/dist/esm/{button.taro-b7c5f5a7.js → button.taro-dc4795a3.js} +4 -2
  38. package/dist/esm/{calendar.taro-05c40d76.js → calendar.taro-02479e8b.js} +1 -1
  39. package/dist/esm/{card.taro-7e85c3da.js → card.taro-a03f0dfc.js} +1 -1
  40. package/dist/esm/{cascader.taro-66462c03.js → cascader.taro-e6610dd1.js} +1 -1
  41. package/dist/esm/{datepicker.taro-8507d826.js → datepicker.taro-c61c6586.js} +1 -1
  42. package/dist/esm/{dialog.taro-0f64e21a.js → dialog.taro-54df2e3f.js} +1 -1
  43. package/dist/esm/{elevator.taro-68cfaaee.js → elevator.taro-1d749ab0.js} +1 -0
  44. package/dist/esm/{imagepreview.taro-83481e13.js → imagepreview.taro-2d23d0ae.js} +2 -2
  45. package/dist/esm/{index.taro-cd52b23f.js → index.taro-84346556.js} +8 -4
  46. package/dist/esm/{notify.taro-308e5892.js → notify.taro-c9ea8d68.js} +1 -1
  47. package/dist/esm/{numberkeyboard.taro-d2ccbce5.js → numberkeyboard.taro-c6b5b0e1.js} +4 -3
  48. package/dist/esm/nutui-react.es.js +30 -30
  49. package/dist/esm/{picker.taro-6128297f.js → picker.taro-fa937ea1.js} +1 -1
  50. package/dist/esm/{popup.taro-89809b25.js → popup.taro-4c18f46c.js} +3 -2
  51. package/dist/esm/{progress.taro-18e015e4.js → progress.taro-773482ed.js} +4 -7
  52. package/dist/esm/{searchbar.taro-141827e2.js → searchbar.taro-6864f7bc.js} +3 -2
  53. package/dist/esm/{shortpassword.taro-e1f53ee7.js → shortpassword.taro-02ea4499.js} +1 -1
  54. package/dist/esm/{sidenavbar.taro-f44d12ac.js → sidenavbar.taro-51a133e6.js} +1 -1
  55. package/dist/esm/{signature.taro-d7a70ce0.js → signature.taro-45d1dde3.js} +1 -1
  56. package/dist/esm/{skeleton.taro-6821b2c6.js → skeleton.taro-38e2fca2.js} +1 -1
  57. package/dist/esm/{swipe.taro-e6c2b808.js → swipe.taro-1eb95b21.js} +5 -2
  58. package/dist/esm/{swiper.taro-852f6615.js → swiper.taro-8164df5b.js} +4 -0
  59. package/dist/esm/{tabbar.taro-86cece39.js → tabbar.taro-08e48c43.js} +1 -1
  60. package/dist/esm/{tabbaritem.taro-f4a91070.js → tabbaritem.taro-3643f585.js} +7 -7
  61. package/dist/esm/{tag.taro-213ec444.js → tag.taro-64f37bd9.js} +5 -3
  62. package/dist/esm/{timeselect.taro-b04b1538.js → timeselect.taro-4fb46162.js} +1 -1
  63. package/dist/esm/types/src/packages/button/button.d.ts +1 -0
  64. package/dist/esm/types/src/packages/button/button.taro.d.ts +1 -0
  65. package/dist/esm/types/src/packages/elevator/elevator.d.ts +3 -1
  66. package/dist/esm/types/src/packages/elevator/elevator.taro.d.ts +3 -1
  67. package/dist/esm/types/src/packages/formitem/formitem.d.ts +1 -0
  68. package/dist/esm/types/src/packages/notify/notify.d.ts +0 -1
  69. package/dist/esm/types/src/packages/numberkeyboard/numberkeyboard.d.ts +1 -0
  70. package/dist/esm/types/src/packages/numberkeyboard/numberkeyboard.taro.d.ts +1 -0
  71. package/dist/esm/types/src/packages/popup/popup.d.ts +1 -0
  72. package/dist/esm/types/src/packages/popup/popup.taro.d.ts +1 -0
  73. package/dist/esm/types/src/packages/progress/progress.d.ts +0 -1
  74. package/dist/esm/types/src/packages/progress/progress.taro.d.ts +0 -1
  75. package/dist/esm/types/src/packages/searchbar/searchbar.d.ts +1 -0
  76. package/dist/esm/types/src/packages/searchbar/searchbar.taro.d.ts +1 -0
  77. package/dist/esm/types/src/packages/swipe/swipe.d.ts +4 -1
  78. package/dist/esm/types/src/packages/swipe/swipe.taro.d.ts +4 -1
  79. package/dist/esm/types/src/packages/tabbar/demo.d.ts +1 -0
  80. package/dist/esm/types/src/packages/tabbaritem/tabbaritem.d.ts +1 -0
  81. package/dist/esm/types/src/packages/tabbaritem/tabbaritem.taro.d.ts +1 -0
  82. package/dist/esm/types/src/packages/tag/tag.d.ts +1 -0
  83. package/dist/esm/types/src/packages/tag/tag.taro.d.ts +1 -0
  84. package/dist/esm/{uploader.taro-1d745f4a.js → uploader.taro-b7b770e6.js} +2 -2
  85. package/dist/locales/base.js +1 -1
  86. package/dist/locales/en-US.js +1 -1
  87. package/dist/locales/id-ID.js +1 -1
  88. package/dist/locales/zh-CN.js +1 -1
  89. package/dist/locales/zh-TW.js +1 -1
  90. package/dist/locales/zh-UG.js +1 -1
  91. package/dist/nutui.react.es.js +78 -43
  92. package/dist/nutui.react.umd.js +78 -43
  93. package/dist/packages/address/address.scss +23 -2
  94. package/dist/packages/button/button.scss +23 -1
  95. package/dist/packages/calendar/calendar.scss +3 -3
  96. package/dist/packages/elevator/elevator.scss +1 -1
  97. package/dist/packages/numberkeyboard/numberkeyboard.scss +10 -2
  98. package/dist/packages/popup/popup.scss +4 -4
  99. package/dist/packages/progress/progress.scss +26 -3
  100. package/dist/packages/radio/radio.scss +1 -1
  101. package/dist/packages/radiogroup/radiogroup.scss +15 -2
  102. package/dist/packages/searchbar/searchbar.scss +35 -7
  103. package/dist/packages/shortpassword/shortpassword.scss +12 -1
  104. package/dist/packages/swiper/swiper.scss +1 -1
  105. package/dist/packages/switch/switch.scss +15 -2
  106. package/dist/packages/tabbar/tabbar.scss +17 -3
  107. package/dist/packages/tabbaritem/tabbaritem.scss +26 -17
  108. package/dist/packages/tag/tag.scss +3 -1
  109. package/dist/style.css +1 -1
  110. package/dist/style.es.js +1 -1
  111. package/dist/styles/theme-dark.scss +1 -0
  112. package/dist/styles/theme-default.scss +1 -0
  113. package/dist/styles/variables.scss +100 -19
  114. package/dist/types/index.d.ts +14 -3
  115. package/package.json +8 -7
  116. package/dist/styles/temp.scss +0 -2340
@@ -1,13 +1,16 @@
1
1
  .nut-theme-dark {
2
2
  .nut-numberkeyboard {
3
3
  background-color: $dark5;
4
+
4
5
  &__body {
5
6
  background-color: $dark5;
6
7
  color: $dark1;
8
+
7
9
  .nut-numberkeyboard__body__keys,
8
10
  .nut-numberkeyboard__sidebar {
9
11
  .key-board-wrapper {
10
12
  background-color: $dark5;
13
+
11
14
  .key {
12
15
  background-color: $dark4;
13
16
  color: $dark1;
@@ -15,6 +18,7 @@
15
18
  }
16
19
  }
17
20
  }
21
+
18
22
  .nut-numberkeyboard__header {
19
23
  .nut-numberkeyboard__header__tit {
20
24
  color: $dark1;
@@ -35,6 +39,7 @@
35
39
  background-color: $numberkeyboard-background-color;
36
40
  user-select: none;
37
41
  background-color: $gray4;
42
+
38
43
  .nut-numberkeyboard__header {
39
44
  position: relative;
40
45
  display: flex;
@@ -81,6 +86,7 @@
81
86
  box-sizing: border-box;
82
87
  padding: 0 6px 6px 0;
83
88
  background-color: $gray5;
89
+
84
90
  .key {
85
91
  display: flex;
86
92
  align-items: center;
@@ -89,7 +95,7 @@
89
95
  font-size: $numberkeyboard-key-font-size;
90
96
  line-height: $numberkeyboard-key-line-height;
91
97
  background-color: $numberkeyboard-key-background-color;
92
- color: $numberkeyboard-key-font-size-color;
98
+ color: $numberkeyboard-key-font-color;
93
99
  border-radius: $numberkeyboard-key-border-radius;
94
100
  cursor: pointer;
95
101
  }
@@ -125,11 +131,13 @@
125
131
 
126
132
  .finish {
127
133
  font-size: $numberkeyboard-key-finish-font-size;
128
- color: $numberkeyboard-key-finish-font-size-color;
134
+ color: $numberkeyboard-key-finish-font-color;
129
135
  background-color: $numberkeyboard-key-finish-background-color;
130
136
  }
131
137
 
132
138
  .activeFinsh {
139
+ font-size: $numberkeyboard-key-finish-font-size;
140
+ color: $numberkeyboard-key-finish-font-color;
133
141
  background-color: $numberkeyboard-key-activeFinsh-background-color;
134
142
  }
135
143
  }
@@ -26,13 +26,13 @@
26
26
  &__close-icon {
27
27
  position: absolute !important;
28
28
  z-index: 1;
29
- color: #969799;
30
- font-size: 18px;
29
+ color: $popup-close-icon-color;
31
30
  cursor: pointer;
32
31
  width: 30px;
33
32
  height: 30px;
34
- line-height: 30px;
35
- text-align: center;
33
+ display: flex;
34
+ justify-content: center;
35
+ align-items: center;
36
36
 
37
37
  &:active {
38
38
  opacity: 0.7;
@@ -1,3 +1,4 @@
1
+
1
2
  .nut-theme-dark {
2
3
  .nut-progress {
3
4
  &-text {
@@ -7,16 +8,25 @@
7
8
  }
8
9
  }
9
10
  }
11
+
10
12
  .nut-progress {
11
13
  display: flex;
12
14
  align-items: center;
13
15
  position: relative;
14
16
  width: 100%;
17
+
18
+ .nut-progress-text {
19
+ color: $progress-text-color;
20
+ }
21
+
15
22
  &-outer {
16
23
  flex: auto;
24
+ border-radius: $progress-border-radius;
25
+
17
26
  .nut-progress-text {
18
- color: red;
27
+ color: $progress-text-inner-color;
19
28
  }
29
+
20
30
  .nut-progress-active:before {
21
31
  content: '';
22
32
  position: absolute;
@@ -28,34 +38,43 @@
28
38
  animation: progressActive 2s ease-in-out infinite;
29
39
  }
30
40
  }
41
+
31
42
  &-small {
32
43
  height: $progress-small-height;
44
+
33
45
  .nut-progress-text {
34
46
  font-size: $progress-small-font-size;
35
47
  padding: $progress-small-padding;
36
48
  }
37
49
  }
50
+
38
51
  &-base {
39
52
  height: $progress-base-height;
53
+
40
54
  .nut-progress-text {
41
55
  font-size: $progress-base-font-size;
42
56
  padding: $progress-base-padding;
43
57
  }
44
58
  }
59
+
45
60
  &-large {
46
61
  height: $progress-large-height;
62
+
47
63
  .nut-progress-text {
48
64
  font-size: $progress-large-font-size;
49
65
  padding: $progress-large-padding;
50
66
  }
51
67
  }
68
+
52
69
  &-inner {
53
70
  height: 100%;
54
71
  display: flex;
55
72
  flex-direction: column;
56
73
  justify-content: center;
57
74
  transition: all 0.4s;
75
+ border-radius: $progress-border-radius;
58
76
  }
77
+
59
78
  &-text {
60
79
  display: flex;
61
80
  padding: $progress-text-padding;
@@ -63,10 +82,11 @@
63
82
  line-height: 1;
64
83
  min-width: 35px;
65
84
  }
85
+
66
86
  &-insidetext {
67
87
  position: absolute;
68
- top: -4px;
69
- bottom: -4px;
88
+ top: $progress-insidetext-position-top;
89
+ bottom: $progress-insidetext-position-bottom;
70
90
  display: flex;
71
91
  align-items: center;
72
92
  min-width: 0px;
@@ -74,15 +94,18 @@
74
94
  transform: translate(-50%);
75
95
  border-radius: $progress-insidetext-border-radius;
76
96
  }
97
+
77
98
  @keyframes progressActive {
78
99
  0% {
79
100
  background: rgba(255, 255, 255, 0.1);
80
101
  width: 0;
81
102
  }
103
+
82
104
  20% {
83
105
  background: rgba(255, 255, 255, 0.5);
84
106
  width: 0;
85
107
  }
108
+
86
109
  to {
87
110
  background: rgba(255, 255, 255, 0);
88
111
  width: 100%;
@@ -30,7 +30,7 @@
30
30
  margin-right: 0 !important;
31
31
  }
32
32
 
33
- &--reverse {
33
+ &.nut-radio--reverse {
34
34
  .nut-radio__label {
35
35
  margin-right: $radio-label-margin-left;
36
36
  margin-left: 0;
@@ -31,18 +31,30 @@
31
31
  }
32
32
  }
33
33
  .nut-radiogroup {
34
- display: inline-block;
34
+ display: flex;
35
+ align-items: flex-start;
36
+
35
37
  .nut-radio {
36
38
  margin-bottom: 5px;
39
+
37
40
  &__label {
38
41
  margin-right: 5px;
39
42
  }
43
+
40
44
  &__button {
41
45
  background-color: $gray4;
42
46
  }
43
47
  }
48
+
44
49
  &--vertical {
50
+ flex-direction: column;
51
+
45
52
  .nut-radio {
53
+ &.nut-radio--reverse {
54
+ width: 100%;
55
+ justify-content: space-between;
56
+ }
57
+
46
58
  &__label {
47
59
  margin-right: 5px;
48
60
  }
@@ -57,7 +69,8 @@
57
69
  &--horizontal {
58
70
  .nut-radio {
59
71
  display: inline-flex;
60
- margin-right: 10px;
72
+ margin-right: 20px;
73
+
61
74
  &--round {
62
75
  .nut-radio__label {
63
76
  margin: 0 6px;
@@ -1,25 +1,31 @@
1
1
  .nut-theme-dark {
2
2
  .nut-searchbar {
3
3
  background: $dark5;
4
+
4
5
  &__label {
5
6
  color: $dark1;
6
7
  }
8
+
7
9
  &__action-text {
8
10
  color: $dark1;
9
11
  }
12
+
10
13
  .nut-searchbar__input-clear {
11
14
  & .nut-searchbar__nut-icon-mask-close {
12
15
  color: $dark1;
16
+
13
17
  &:hover {
14
18
  cursor: pointer;
15
19
  color: $dark1;
16
20
  }
17
21
  }
18
22
  }
23
+
19
24
  &__right-search-icon,
20
25
  &__left-search-icon {
21
26
  color: $dark1;
22
27
  }
28
+
23
29
  &__leftout-icon,
24
30
  &__rightout-icon {
25
31
  i {
@@ -28,11 +34,13 @@
28
34
  }
29
35
  }
30
36
  }
37
+
31
38
  .val-text {
32
39
  font-size: 12px;
33
40
  color: $title-color2;
34
41
  padding: 0 20px;
35
42
  }
43
+
36
44
  .nut-searchbar {
37
45
  display: flex;
38
46
  align-items: center;
@@ -41,6 +49,7 @@
41
49
  background: $searchbar-background;
42
50
  color: $gray1;
43
51
  box-sizing: border-box;
52
+
44
53
  &__content {
45
54
  position: relative;
46
55
  flex: 1;
@@ -49,18 +58,23 @@
49
58
  justify-content: center;
50
59
  height: $searchbar-input-height;
51
60
  background: $searchbar-input-background;
61
+ border-radius: $searchbar-content-border-radius;
52
62
  }
63
+
53
64
  &__icon {
54
65
  padding: 0 5px 0 10px;
55
66
  }
67
+
56
68
  &__rightin-icon {
57
69
  padding: 0 5px;
58
70
  }
71
+
59
72
  .nut-searchbar__input-box {
60
73
  display: flex;
61
74
  align-items: center;
62
75
  flex: 1;
63
76
  }
77
+
64
78
  &__input {
65
79
  border: 0;
66
80
  outline: 0;
@@ -73,44 +87,58 @@
73
87
  border-radius: 0;
74
88
  font-size: $font-size-small;
75
89
  color: $searchbar-input-text-color;
90
+ caret-color: $searchbar-input-curror-color;
76
91
  background: transparent;
77
92
  }
93
+
78
94
  &__round {
79
95
  border-radius: $searchbar-input-border-radius;
80
96
  }
97
+
81
98
  &__disabled {
82
99
  cursor: not-allowed;
83
100
  }
101
+
84
102
  &__clear {
85
- padding: 0 10px 0 5px;
103
+ padding: $searchbar-clear-icon-padding;
104
+
86
105
  i {
87
106
  color: $gray1 !important;
88
107
  }
89
108
  }
109
+
90
110
  .pos-right {
91
111
  right: 40px;
92
112
  }
113
+
93
114
  &__left {
94
115
  text-align: left;
95
116
  }
117
+
96
118
  &__right {
97
119
  text-align: right;
98
120
  }
121
+
99
122
  &__center {
100
123
  text-align: center;
101
124
  }
102
- &__label,
103
- &__action-text {
104
- padding: 0 8px 0 0;
105
- font-size: 12px;
106
- color: $searchbar-action-text-color;
125
+
126
+ &__label {
127
+ padding: $searchbar-label-padding;
128
+ font-size: $searchbar-label-fontsize;
129
+ color: $searchbar-label-color;
107
130
  }
131
+
108
132
  &__action-text {
109
- padding: 0 0 0 8px;
133
+ padding: $searchbar-action-text-padding;
134
+ font-size: $searchbar-action-text-fontsize;
135
+ color: $searchbar-action-text-color;
110
136
  }
137
+
111
138
  &__leftout-icon {
112
139
  margin-right: 10px;
113
140
  }
141
+
114
142
  &__rightout-icon {
115
143
  margin-left: 10px;
116
144
  }
@@ -1,28 +1,36 @@
1
+
1
2
  .nut-theme-dark {
2
3
  .nut-shortpassword {
3
4
  &__title {
4
5
  color: $dark1;
5
6
  }
7
+
6
8
  &__subtitle {
7
9
  color: $dark2;
8
10
  }
11
+
9
12
  &__message__forget {
10
13
  color: $dark3;
11
14
  }
15
+
12
16
  &__input-real {
13
17
  background-color: $dark6;
14
18
  border-radius: 4px;
15
19
  }
20
+
16
21
  &__input-site {
17
22
  background-color: $dark6;
18
23
  }
24
+
19
25
  &__input-fake {
20
26
  border: none;
21
27
  background-color: $dark4;
28
+
22
29
  &__li__icon {
23
30
  background-color: $dark1;
24
31
  }
25
32
  }
33
+
26
34
  &__message__forget {
27
35
  color: $dark2;
28
36
  }
@@ -43,6 +51,7 @@
43
51
  font-size: $font-size-1;
44
52
  color: $text-color;
45
53
  }
54
+
46
55
  .nut-shortpsdWx-subtitle {
47
56
  display: block;
48
57
  margin-top: 12px;
@@ -55,11 +64,13 @@
55
64
  padding: 24px 0 10px 0;
56
65
  text-align: center;
57
66
  position: relative;
67
+
58
68
  .nut-input-site {
59
69
  width: 247px;
60
70
  height: 41px;
61
71
  border-radius: 4px;
62
72
  }
73
+
63
74
  .nut-input-real {
64
75
  position: absolute;
65
76
  right: 247px;
@@ -185,7 +196,7 @@
185
196
  padding: 8px 38px;
186
197
  line-height: 1;
187
198
  font-size: $font-size-2;
188
- color: $white;
199
+ color: $primary-text-color;
189
200
  }
190
201
  }
191
202
  }
@@ -18,7 +18,7 @@
18
18
  display: flex;
19
19
  position: absolute;
20
20
  left: 50%;
21
- bottom: 12px;
21
+ bottom: $swiper-pagination-bottom;
22
22
  transform: translateX(-50%);
23
23
  i {
24
24
  width: $swiper-pagination-item-width;
@@ -1,9 +1,11 @@
1
1
  .nut-theme-dark {
2
2
  .nut-switch {
3
3
  background-color: $dark4;
4
+
4
5
  &.switch-close {
5
6
  color: $dark1;
6
7
  }
8
+
7
9
  .switch-button {
8
10
  .close {
9
11
  color: $dark4;
@@ -22,48 +24,59 @@
22
24
  background-repeat: no-repeat;
23
25
  background-position: center center;
24
26
  flex: 0 0 auto; // 防止被压缩
27
+
25
28
  &.switch-close {
26
29
  background-color: $switch-close-bg-color;
30
+
27
31
  .close-line {
28
32
  background: $switch-close--cline-bg-color;
29
33
  border-radius: 2px;
30
34
  }
31
35
  }
36
+
32
37
  .switch-button {
33
38
  display: flex;
34
39
  align-items: center;
35
40
  justify-content: center;
36
41
  border-radius: 50%;
37
- background: $white;
42
+ background: $primary-text-color;
38
43
  transition: transform 0.3s;
44
+
39
45
  .nut-switch__label {
40
- color: $white;
46
+ color: $primary-text-color;
41
47
  font-size: $font-size-1;
48
+
42
49
  &.open {
43
50
  transform: translateX(-16px);
44
51
  }
52
+
45
53
  &.close {
46
54
  transform: translateX(16px);
47
55
  }
48
56
  }
49
57
  }
58
+
50
59
  &-disable {
51
60
  opacity: 0.6;
52
61
  }
62
+
53
63
  &-base {
54
64
  width: $switch-width;
55
65
  height: $switch-height;
56
66
  line-height: $switch-line-height;
67
+
57
68
  .switch-button {
58
69
  height: $switch-inside-height;
59
70
  width: $switch-inside-width;
60
71
  transform: $switch-inside-close-transform;
61
72
  }
73
+
62
74
  &.switch-open {
63
75
  .switch-button {
64
76
  transform: $switch-inside-open-transform;
65
77
  }
66
78
  }
79
+
67
80
  &.switch-close {
68
81
  .close-line {
69
82
  width: 8px;
@@ -3,14 +3,17 @@
3
3
  background: $dark4;
4
4
  }
5
5
  }
6
+
6
7
  .nut-tabbar {
7
8
  border: 0px;
8
9
  box-shadow: $tabbar-box-shadow;
9
10
  border-bottom: $tabbar-border-bottom;
10
11
  border-top: $tabbar-border-top;
12
+ height: $tabbar-height;
11
13
  width: 100%;
12
14
  display: flex;
13
- padding: 7px 0;
15
+ justify-content: center;
16
+ align-items: center;
14
17
  box-sizing: border-box;
15
18
  background: $white;
16
19
 
@@ -26,7 +29,18 @@
26
29
  }
27
30
 
28
31
  &__safebottom {
29
- padding-bottom: constant(safe-area-inset-bottom);
30
- padding-bottom: env(safe-area-inset-bottom);
32
+ bottom: constant(safe-area-inset-bottom);
33
+ bottom: env(safe-area-inset-bottom);
34
+
35
+ &::after {
36
+ content: '';
37
+ z-index: 90;
38
+ position: fixed;
39
+ left: 0;
40
+ bottom: 0;
41
+ height: env(safe-area-inset-bottom);
42
+ width: 100%;
43
+ background-color: #fff;
44
+ }
31
45
  }
32
46
  }
@@ -1,6 +1,8 @@
1
+
1
2
  .nut-theme-dark {
2
3
  .nut-tabbar-item {
3
4
  color: $dark1;
5
+
4
6
  &--active {
5
7
  color: $primary-color;
6
8
  }
@@ -8,14 +10,15 @@
8
10
  }
9
11
 
10
12
  .nut-tabbar-item {
13
+ display: flex;
14
+ flex-direction: column;
15
+ justify-content: center;
16
+ align-items: center;
11
17
  flex: 1;
12
18
  text-align: center;
13
19
  text-decoration: none;
14
20
  color: $gray1;
15
21
  height: 100%;
16
- display: flex;
17
- justify-content: center;
18
- align-items: center;
19
22
 
20
23
  &--active {
21
24
  color: $primary-color;
@@ -34,55 +37,61 @@
34
37
  border: 1px solid $white;
35
38
  border-radius: 7px;
36
39
  text-align: center;
37
- top: -2px;
38
- right: -7px;
40
+ top: calc(50% - 6px);
41
+ right: calc(50% - 16px);
39
42
  box-shadow: 0 0 0 1px $white;
40
43
  font-size: $font-size-1;
41
- color: $white;
44
+ color: $primary-text-color;
42
45
  z-index: 1;
43
46
  }
47
+
44
48
  &__dot {
45
49
  position: absolute;
46
50
  width: 7px;
47
51
  height: 7px;
52
+ border: 0;
48
53
  border-radius: 7px;
49
54
  padding: 0px;
50
55
  background: $tabbar-active-color;
51
- text-align: center;
52
- font-size: 12px;
53
- font-weight: normal;
54
- color: #fff;
55
- top: 0;
56
- right: 0;
56
+ top: $tabbar-dot-top;
57
+ right: calc(50% - $tabbar-dot-right);
57
58
  transform: translate(50%, -50%);
58
59
  }
59
60
 
60
61
  &__num {
61
62
  line-height: 1;
62
63
  font-size: $tabbar-item-text-font-size;
63
- color: $white;
64
+ color: $primary-text-color;
64
65
  padding: 1px 2px 2px 3px;
66
+ top: calc(-50% + 6px);
67
+ right: calc(-50%);
65
68
  }
66
69
 
67
70
  &__nums {
68
71
  line-height: 1;
69
72
  font-size: $tabbar-item-text-font-size;
70
- color: $white;
73
+ color: $primary-text-color;
71
74
  padding: 2px 1px 2px 2px;
75
+ top: calc(-50% + 6px);
76
+ right: calc(-50% - 8px);
72
77
  }
78
+
73
79
  &__icon {
74
80
  display: block;
75
81
  background-size: 100% 100%;
76
82
  background-position: center center;
77
83
  }
84
+
78
85
  &--nav-word {
79
- font-size: $font-size-0;
80
- line-height: $tabbar-item-text-line-height;
81
86
  display: block;
87
+ font-size: $font-size-0;
88
+ margin-top: $tabbar-word-margin-top;
82
89
  }
90
+
83
91
  &--big-word {
84
92
  font-size: $font-size-large;
85
- line-height: 1;
93
+ margin-top: 0;
94
+ line-height: $tabbar-item-text-line-height;
86
95
  }
87
96
  }
88
97
  }
@@ -1,11 +1,13 @@
1
+
1
2
  .nut-tag {
2
- padding: 0 4px;
3
+ padding: $tag-padding;
3
4
  display: inline-flex;
4
5
  justify-content: center;
5
6
  align-items: center;
6
7
  font-size: $tag-font-size;
7
8
  border-radius: $tag-default-border-radius;
8
9
  height: $tag-height;
10
+
9
11
  ._icon {
10
12
  vertical-align: middle;
11
13
  margin-left: 4px;