Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

style(range): 修订样式变量 #1718

Merged
merged 43 commits into from
Dec 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
49a6aca
feat: uploader taro h5 支持video
xiaoyatong Nov 9, 2023
8297caf
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 13, 2023
9d730d4
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 14, 2023
ecc10ce
fix: delete sth doesnot merge
xiaoyatong Nov 14, 2023
49310f9
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 14, 2023
5b84c0d
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 14, 2023
e633cea
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 14, 2023
bd3aa30
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 15, 2023
6eb249a
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 15, 2023
981162e
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 16, 2023
2369884
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 16, 2023
85f285f
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 17, 2023
f09fec7
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 17, 2023
137b690
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 17, 2023
7ddfca7
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 20, 2023
6f2e558
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 21, 2023
60c4d72
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 21, 2023
3a86c79
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 21, 2023
a927492
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 22, 2023
225acd3
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 22, 2023
0b21faa
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 22, 2023
14cd4e1
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 22, 2023
59fb3db
style: delete dark
xiaoyatong Nov 22, 2023
068f800
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 22, 2023
8f490ea
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 23, 2023
f63d00c
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 23, 2023
53783e1
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 23, 2023
334bb27
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 24, 2023
b5b3129
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 24, 2023
dea6141
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 24, 2023
253eecf
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 27, 2023
ac3c216
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 27, 2023
a856800
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 27, 2023
a391d51
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 29, 2023
9ed5ddf
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 29, 2023
b830fe5
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 29, 2023
ae0c326
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 29, 2023
44dd196
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 30, 2023
51a4f9b
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 30, 2023
feb185e
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 30, 2023
bbc4971
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 30, 2023
f8e5769
Merge branch 'next' of https://github.com/jdf2e/nutui-react into next
xiaoyatong Nov 30, 2023
043aac8
style(range): 修订样式变量
xiaoyatong Dec 1, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/packages/range/doc.en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ The component provides the following CSS variables, which can be used to customi

| Name | Description | Default |
| --- | --- | --- |
| \--nutui-range-font-color | font color | `$gray1` |
| \--nutui-range-color | font color | `$color-title` |
| \--nutui-range-margin | margin | `15px` |
| \--nutui-range-height | stroke width | `4px` |
| \--nutui-range-active-color | active color | `$color-primary` |
Expand Down
2 changes: 1 addition & 1 deletion src/packages/range/doc.md
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ export default App;

| 名称 | 说明 | 默认值 |
| --- | --- | --- |
| \--nutui-range-font-color | 字体颜色 | `$gray1` |
| \--nutui-range-color | 字体颜色 | `$color-title` |
| \--nutui-range-margin | 进度条外边距 | `15px` |
| \--nutui-range-height | 进度条的宽度 | `4px` |
| \--nutui-range-active-color | 激活颜色 | `$color-primary` |
Expand Down
2 changes: 1 addition & 1 deletion src/packages/range/doc.taro.md
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ export default App;

| 名称 | 说明 | 默认值 |
| --- | --- | --- |
| \--nutui-range-font-color | 字体颜色 | `$gray1` |
| \--nutui-range-color | 字体颜色 | `$color-title` |
| \--nutui-range-margin | 进度条外边距 | `15px` |
| \--nutui-range-height | 进度条的宽度 | `4px` |
| \--nutui-range-active-color | 激活颜色 | `$color-primary` |
Expand Down
2 changes: 1 addition & 1 deletion src/packages/range/doc.zh-TW.md
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ export default App;

| 名稱 | 說明 | 默認值 |
| --- | --- | --- |
| \--nutui-range-font-color | 字體顏色 | `$gray1` |
| \--nutui-range-color | 字體顏色 | `$color-title` |
| \--nutui-range-margin | 進度條外邊距 | `15px` |
| \--nutui-range-height | 進度條的寬度 | `4px` |
| \--nutui-range-active-color | 激活顏色 | `$color-primary` |
Expand Down
15 changes: 13 additions & 2 deletions src/packages/range/range.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,23 @@
width: 100%;
height: $range-height;
align-items: center;

.min,
.max {
font-size: $font-size-small;
color: $range-font-color;
color: $range-color;
user-select: none;
}

&-vertical {
height: 100%;
flex-direction: column;
padding: 0px 15px;

.nut-range {
width: $range-height;
height: 100%;

&-button {
&-wrapper,
&-wrapper-right {
Expand All @@ -35,12 +39,15 @@
transform: translate3d(-50%, -50%, 0);
}
}

.number {
transform: translate3d(100%, 0, 0);
}

&-vertical {
margin: $range-margin 0px;
}

&-mark {
position: absolute;
width: 100%;
Expand All @@ -64,6 +71,7 @@
user-select: none;
transform: translateY(-50%);
}

&-tick {
position: absolute;
top: 0px;
Expand All @@ -81,6 +89,7 @@
}
}
}

.nut-range {
display: block;
position: relative;
Expand All @@ -90,6 +99,7 @@
background-color: $range-inactive-color;
border-radius: 2px;
cursor: pointer;

&::before {
position: absolute;
top: -8px;
Expand Down Expand Up @@ -148,10 +158,11 @@
justify-content: center;
user-select: none;
font-size: $font-size-small;
color: $range-font-color;
color: $range-color;
transform: translate3d(0, -100%, 0);
}
}

&-disabled {
cursor: not-allowed;
opacity: 0.54;
Expand Down
7 changes: 5 additions & 2 deletions src/styles/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1060,10 +1060,13 @@ $infiniteloading-bottom-color: var(
) !default;

//range(✅)
$range-font-color: var(--nutui-range-font-color, $gray1) !default;
$range-color: var(--nutui-range-color, $gray1) !default;
$range-height: var(--nutui-range-height, 4px) !default;
$range-margin: var(--nutui-range-margin, 15px) !default;
$range-inactive-color: var(--nutui-range-inactive-color, #fa958c) !default;
$range-inactive-color: var(
--nutui-range-inactive-color,
$color-primary-light
) !default;
$range-active-color: var(--nutui-range-active-color, $color-primary) !default;
$range-button-background: var(
--nutui-range-button-background,
Expand Down