Skip to content

feat: Picker/DatePicker/Address/Sku/Countdown 等组件进行暗黑模式修改 #1511

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

Merged
merged 35 commits into from
Jul 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
a7878df
fix: marge主分支 (#1)
yangxiaolu1993 Jun 27, 2022
4ab2003
Merge branch 'jdf2e:next' into next
yangxiaolu1993 Jun 27, 2022
f98d540
feat: imagepreview重复问题修改
yangxiaolu1993 Jun 27, 2022
67b6cad
fix: picker 组件重影问题修改
yangxiaolu1993 Jun 27, 2022
236f2fa
Merge branch 'jdf2e:next' into next
yangxiaolu1993 Jun 27, 2022
3a01721
fix: 科技样式同步
yangxiaolu1993 Jun 27, 2022
6baa48c
Merge branch 'next' of https://github.com/yangxiaolu1993/nutui into next
yangxiaolu1993 Jun 27, 2022
dbf8062
Merge branch 'jdf2e:next' into next
yangxiaolu1993 Jun 30, 2022
257bbde
Merge branch 'jdf2e:next' into next
yangxiaolu1993 Jul 1, 2022
6540137
Merge branch 'jdf2e:next' into next
yangxiaolu1993 Jul 1, 2022
535da7c
Merge branch 'jdf2e:next' into next
yangxiaolu1993 Jul 4, 2022
3def99e
feat: picker组件惯性滚动优化
yangxiaolu1993 Jul 6, 2022
20cde08
feat: picker组件惯性滚动优化
yangxiaolu1993 Jul 6, 2022
8f6801f
Merge branch 'jdf2e:next' into next
yangxiaolu1993 Jul 6, 2022
3875a2a
Merge branch 'jdf2e:next' into next
yangxiaolu1993 Jul 7, 2022
d00b6d6
fix: issue问题修噶
yangxiaolu1993 Jul 8, 2022
0bc2db1
fix: datepicker国际化修噶
yangxiaolu1993 Jul 8, 2022
99c8f79
Merge branch 'jdf2e:next' into next
yangxiaolu1993 Jul 8, 2022
eb482f4
Merge branch 'jdf2e:next' into next
yangxiaolu1993 Jul 11, 2022
afb0ea6
Merge branch 'jdf2e:next' into next
yangxiaolu1993 Jul 15, 2022
2fa73b1
Merge branch 'jdf2e:next' into next
yangxiaolu1993 Jul 21, 2022
8d4f961
Merge branch 'jdf2e:next' into next
yangxiaolu1993 Jul 27, 2022
0eacdbb
fix: datePicker在year-month下,maxDate不生效问题解决
yangxiaolu1993 Jul 27, 2022
64f2c62
Merge branch 'jdf2e:next' into next
yangxiaolu1993 Jul 27, 2022
e420d76
fix: picker异步处理
yangxiaolu1993 Jul 27, 2022
c466171
fix: picker taro
yangxiaolu1993 Jul 27, 2022
780e3b6
fix: picker问题修改
yangxiaolu1993 Jul 27, 2022
6422c66
Merge branch 'jdf2e:next' into next
yangxiaolu1993 Jul 28, 2022
a58e1c4
feat: address 新增插槽
yangxiaolu1993 Jul 29, 2022
7e5f199
feat: address 新增插槽
yangxiaolu1993 Jul 29, 2022
f601b7b
Merge branch 'jdf2e:next' into next
yangxiaolu1993 Jul 29, 2022
36b30b7
feat: 暗黑模式修改
yangxiaolu1993 Jul 29, 2022
382d5ff
Merge branch 'jdf2e:next' into next
yangxiaolu1993 Jul 29, 2022
fd08d12
Merge branch 'next' into black
yangxiaolu1993 Jul 29, 2022
35018cd
feat: comment暗黑模式
yangxiaolu1993 Jul 29, 2022
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
42 changes: 42 additions & 0 deletions src/packages/__VUE/address/index.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,45 @@
.nut-theme-dark {
.nut-address {
&__header {
color: $dark-color;

&__title {
color: $dark-color;
}
}

.custom-address {
.region-tab {
color: $dark-color;
}
.region-con {
.region-group {
.region-item {
color: $dark-color;
}
}
}
}

.exist-address {
.exist-address-group {
.exist-ul {
.exist-item {
color: $dark-color;
}
}
}

.choose-other {
border-top: 1px solid $dark-background;
}
}
&-custom-buttom {
border-top: 1px solid $dark-background;
}
}
}

.nut-address {
display: block;
&__header {
Expand Down
13 changes: 13 additions & 0 deletions src/packages/__VUE/audio/demo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,19 @@ export default createDemo({
});
</script>
<style lang="scss" scoped>
.nut-theme-dark {
.demo {
.nut-voice {
background: $dark-color;
border: 1px solid $dark-color;
border-radius: 18px;
}

.nut-audio-operate {
color: $dark-color;
}
}
}
.demo {
.nut-voice {
display: flex;
Expand Down
8 changes: 8 additions & 0 deletions src/packages/__VUE/audio/index.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
.nut-theme-dark {
.nut-audio-icon {
.nut-audio-icon-box {
background: $dark-color;
}
}
}

.nut-audio {
padding: 0;
.progress-wrapper {
Expand Down
37 changes: 37 additions & 0 deletions src/packages/__VUE/comment/index.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,40 @@
.nut-theme-dark {
.nut-comment {
&-header {
&__user {
&-name {
color: $dark-color;
}

&-default {
&-name {
color: $dark-color;
}
}
}
}
&__follow {
&-title {
color: $dark-color;
}
}
&-bottom {
&__cpx {
color: $dark-color;

&-item {
span {
color: $dark-color;
}
}
}
}

.nut-comment-shop {
border-top: 1px solid $dark-color;
}
}
}
.nut-comment {
width: 100%;
font-size: 12px;
Expand Down
12 changes: 12 additions & 0 deletions src/packages/__VUE/image/index.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
.nut-theme-dark {
.nut-image {
.nut-img-loading {
background: $dark-background;
}

.nut-img-error {
background: $dark-background;
}
}
}

.nut-image {
display: block;
position: relative;
Expand Down
5 changes: 5 additions & 0 deletions src/packages/__VUE/infiniteloading/demo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,11 @@ export default createDemo({
</script>

<style lang="scss" scoped>
.nut-theme-dark {
.infiniteLi {
color: $dark-color;
}
}
.infiniteUl {
height: 300px;
width: 100%;
Expand Down
18 changes: 18 additions & 0 deletions src/packages/__VUE/infiniteloading/index.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
.nut-theme-dark {
.nut-infiniteloading {
.nut-infinite-top {
.top-text {
color: $dark-color;
}
}

.nut-infinite-bottom {
color: $dark-color;

.bottom-text {
color: $dark-color;
}
}
}
}

.nut-infiniteloading {
display: block;
width: 100%;
Expand Down
70 changes: 16 additions & 54 deletions src/packages/__VUE/noticebar/demo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,50 +4,23 @@
<nut-noticebar :text="translate('text')"></nut-noticebar>

<h2>{{ translate('scrollable') }}</h2>
<nut-noticebar
:text="translate('textShort')"
:scrollable="true"
:background="`rgba(251, 248, 220, 1)`"
:color="`#D9500B`"
>
</nut-noticebar>
<nut-noticebar :text="translate('textShort')" :scrollable="true"> </nut-noticebar>
<p />
<nut-noticebar
:text="translate('text')"
:scrollable="false"
:background="`rgba(251, 248, 220, 1)`"
:color="`#D9500B`"
></nut-noticebar>
<nut-noticebar :text="translate('text')" :scrollable="false"></nut-noticebar>

<h2>{{ translate('mode') }}</h2>
<nut-noticebar :closeMode="true" @click="hello" :background="`rgba(251, 248, 220, 1)`" :color="`#D9500B`"
>{{ translate('text') }}
</nut-noticebar>
<nut-noticebar :closeMode="true" @click="hello">{{ translate('text') }} </nut-noticebar>
<p />
<nut-noticebar
:closeMode="true"
right-icon="circle-close"
@click="hello"
:background="`rgba(251, 248, 220, 1)`"
:color="`#D9500B`"
>{{ translate('text') }}
</nut-noticebar>
<nut-noticebar :closeMode="true" right-icon="circle-close" @click="hello">{{ translate('text') }} </nut-noticebar>
<p />
<nut-noticebar
left-icon="https://img13.360buyimg.com/imagetools/jfs/t1/72082/2/3006/1197/5d130c8dE1c71bcd6/e48a3b60804c9775.png"
:background="`rgba(251, 248, 220, 1)`"
:color="`#D9500B`"
>
<a href="https://www.jd.com">{{ translate('jd') }}</a>
</nut-noticebar>

<h2>{{ translate('multiline') }}</h2>
<nut-noticebar
:text="translate('text')"
wrapable
:background="`rgba(251, 248, 220, 1)`"
:color="`#D9500B`"
></nut-noticebar>
<nut-noticebar :text="translate('text')" wrapable></nut-noticebar>

<h2>{{ translate('vertical') }}</h2>
<div class="interstroll-list">
Expand All @@ -58,8 +31,6 @@
:standTime="1000"
@click="go"
:closeMode="true"
:background="`rgba(251, 248, 220, 1)`"
:color="`#D9500B`"
></nut-noticebar>
</div>

Expand All @@ -71,22 +42,11 @@
:speed="10"
:standTime="2000"
:complexAm="true"
:background="`rgba(251, 248, 220, 1)`"
:color="`#D9500B`"
></nut-noticebar>
</div>
<h2>{{ translate('customAm') }}</h2>
<div class="interstroll-list">
<nut-noticebar
direction="vertical"
:height="50"
:speed="10"
:standTime="1000"
:list="[]"
@close="go"
:background="`rgba(251, 248, 220, 1)`"
:color="`#D9500B`"
>
<nut-noticebar direction="vertical" :height="50" :speed="10" :standTime="1000" :list="[]" @close="go">
<div
class="custom-item"
:data-index="index"
Expand All @@ -100,14 +60,7 @@

<h2>{{ translate('customRightIcon') }}</h2>
<div class="interstroll-list">
<nut-noticebar
direction="vertical"
:list="horseLamp1"
:speed="10"
:standTime="1000"
:background="`rgba(251, 248, 220, 1)`"
:color="`#D9500B`"
>
<nut-noticebar direction="vertical" :list="horseLamp1" :speed="10" :standTime="1000">
<template v-slot:rightIcon>
<nut-icon name="fabulous" color="#f0250f"> </nut-icon>
</template>
Expand Down Expand Up @@ -183,6 +136,15 @@ export default createDemo({
</script>

<style lang="scss" scoped>
.nut-theme-dark {
.custom-item {
color: $dark-color;
}

a {
color: $dark-color;
}
}
.demo {
padding-bottom: 30px !important;

Expand Down
12 changes: 12 additions & 0 deletions src/packages/__VUE/noticebar/index.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
.nut-theme-dark {
.nut-noticebar-page {
background: $dark-background2;
color: $dark-color;
}

.nut-noticebar-vertical {
.horseLamp_list_item {
color: $dark-color;
}
}
}
.nut-noticebar-page {
// width: 100%;
display: flex;
Expand Down
33 changes: 33 additions & 0 deletions src/packages/__VUE/picker/index.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,36 @@
.nut-theme-dark {
.nut-picker {
&__title {
color: $dark-color;
}

&-roller {
&-item {
color: $dark-color;
}

&-item-tile {
color: $dark-color;
}
}

&-roller-mask {
background-image: linear-gradient(180deg, rgba(27, 27, 27, 0.9), rgba(27, 27, 27, 0.4)),
linear-gradient(0deg, rgba(27, 27, 27, 0.9), rgba(27, 27, 27, 0.4));
background-repeat: no-repeat;
background-position: top, bottom;
background-size: 100% 108px;
z-index: 1;
}

&-content {
color: $dark-color;
}
&-item {
color: $dark-color;
}
}
}
.nut-picker {
// 标题
&__bar {
Expand Down
40 changes: 40 additions & 0 deletions src/packages/__VUE/sku/index.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,43 @@
.nut-theme-dark {
.nut-sku {
background: $dark-background;

&-select {
&-item {
&-title {
color: $dark-color;
}
&-skus {
&-sku {
color: $dark-color;
background: $dark-background2;
}
}
}
}

&-stepper {
&-title {
color: $dark-color;
}
&-limit {
color: $dark-color;
}
&-count {
&-lowestBuy {
color: $primary-color;
}
}
}

&-operate {
&-btn {
background: $dark-background2;
}
}
}
}

.nut-sku {
height: 100%;
display: flex;
Expand Down
3 changes: 2 additions & 1 deletion src/sites/mobile-taro/vue/project.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
"minifyWXML": true,
"showES6CompileOption": false,
"useCompilerPlugins": false,
"ignoreUploadUnusedFiles": true
"ignoreUploadUnusedFiles": true,
"useStaticServer": true
},
"compileType": "miniprogram",
"simulatorType": "wechat",
Expand Down