Skip to content

Feat resize #7

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.

Sign up for GitHub

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

Open
irisSong wants to merge 12 commits into
base: feat_v3.x_cpp
Choose a base branch
from
Open

Feat resize #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0a4eda4
fix: 恢复原有功能
xiaoyatong Feb 2, 2026
721f05e
fix: calendar文本color继承问题&calendarCard顶部箭头icon替换为Image标签 (#3444)
xiyehutao Apr 29, 2026
7ad4196
feat: 解决calendar中weekend样式优先级问题
xiyehutao Apr 29, 2026
dc4f1e2
feat: 多尺寸适配
irisSong Apr 29, 2026
36d2328
feat(popup): 透传overlay 属性
xiaoyatong May 6, 2026
c4edd65
feat(popup): 增加属性,用于表达是否展示动效
xiaoyatong May 6, 2026
11be1b3
feat: 处理日历在多端表现异常问题，价格兼容更多格式。 (#3452)
xiaoyatong May 7, 2026
402c19c
feat: 增加老年版\大字版处理
irisSong May 7, 2026
1a35d9b
fix: 0px 不转换
irisSong May 8, 2026
1f36f70
style: 样式多尺寸适配
irisSong May 9, 2026
478e924
chore: 合并主分支
irisSong May 9, 2026
5565d44
style: 样式多尺寸适配
irisSong May 9, 2026
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: 2 additions & 0 deletions packages/nutui-taro-demo/src/pages/index/index.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
export default definePageConfig({
navigationBarTitleText: '首页',
// App设计规范适配版本
// designAppVersion: 16
})
8 changes: 4 additions & 4 deletions src/packages/actionsheet/actionsheet.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
}

.nut-popup-title {
border-bottom: 1px solid $actionsheet-border-color;
border-bottom: scale-px(1px) solid $actionsheet-border-color;
}

&-list {
Expand All @@ -23,7 +23,7 @@
&-cancel,
&-item {
display: block;
padding: 10px;
padding: scale-px(10px);
text-align: $actionsheet-item-text-align;
line-height: $actionsheet-item-line-height;
font-size: $font-size-base;
Expand Down Expand Up @@ -54,8 +54,8 @@
}

&-cancel {
margin-top: 5px;
border-top: 1px solid $actionsheet-border-color;
margin-top: scale-px(5px);
border-top: scale-px(1px) solid $actionsheet-border-color;
border-radius: $actionsheet-border-radius;
}

Expand Down
84 changes: 42 additions & 42 deletions src/packages/address/address.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
.nut-address {
&-exist {
display: block;
padding: 15px 20px 0;
height: 279px;
padding: scale-px(15px) scale-px(20px) 0;
height: scale-px(279px);
overflow-y: auto;
box-sizing: border-box;

&-item {
display: flex;
align-items: center;
margin-bottom: 20px;
margin-bottom: scale-px(20px);
font-size: $font-size-s;
line-height: $font-size-base;
color: $color-title;
Expand All @@ -22,56 +22,56 @@
}

&-info {
margin-left: 9px;
margin-left: scale-px(9px);
}
}
}

&-footer {
width: 100%;
height: 54px;
padding: 6px 0px 0;
border-top: 1px solid $color-border;
height: scale-px(54px);
padding: scale-px(6px) 0px 0;
border-top: scale-px(1px) solid $color-border;

&-btn {
width: 90%;
height: 42px;
line-height: 42px;
height: scale-px(42px);
line-height: scale-px(42px);
margin: auto;
text-align: center;
background: $button-primary-background-color;
border-radius: 21px;
font-size: 15px;
border-radius: scale-px(21px);
font-size: $font-size-l;
color: $color-primary-text;
}
}
}

.nut-address {
&-title {
font-size: 14px;
font-size: $font-size-base;
font-weight: 500;
padding: 16px 16px 12px 16px;
padding: scale-px(16px) scale-px(16px) scale-px(12px) scale-px(16px);
}
&-hotlist {
padding: 0 16px;
padding: 0 scale-px(16px);
display: flex;
flex-wrap: wrap;
align-items: flex-start;
&-item {
display: flex;
justify-content: center;
align-items: center;
width: 63px;
height: 28px;
font-size: 12px;
border-radius: 4px;
margin-bottom: 7px;
width: scale-px(63px);
height: scale-px(28px);
font-size: $font-size-s;
border-radius: scale-px(4px);
margin-bottom: scale-px(7px);
/* #ifdef harmony dynamic*/
margin-right: 6px;
margin-right: scale-px(6px);
/* #endif */
/* #ifndef harmony dynamic*/
margin-right: 7px;
margin-right: scale-px(7px);
/* #endif */
background-color: $color-background-sunken;
color: $color-title;
Expand All @@ -83,36 +83,36 @@
&.hotlist-more {
.nut-address-hotlist-item {
width: auto;
padding: 0 16px;
margin-right: 7px;
padding: 0 scale-px(16px);
margin-right: scale-px(7px);
}
}
}

&-selected {
width: 100%;
height: 60px;
padding: 0 16px;
height: scale-px(60px);
padding: 0 scale-px(16px);
display: flex;
align-items: center;
border-bottom: 1px solid $color-border;
border-bottom: scale-px(1px) solid $color-border;
&-item {
font-size: 12px;
font-size: $font-size-s;
display: inline-block;
height: 28px;
line-height: 28px;
padding: 0 12px;
border-radius: 4px;
height: scale-px(28px);
line-height: scale-px(28px);
padding: 0 scale-px(12px);
border-radius: scale-px(4px);
background-color: $color-background-sunken;

&.active {
border: 1px solid $color-primary;
border: scale-px(1px) solid $color-primary;
background-color: $color-primary-light-pressed;
color: $color-primary;
}
}
&-border {
margin: 0 2px;
margin: 0 scale-px(2px);
color: $color-text-disabled;
}
}
Expand All @@ -122,15 +122,15 @@
.nut-elevator-list {
&-item {
position: relative;
padding-left: 20px;
padding-left: scale-px(20px);
}
&-item-code {
display: inline;
position: absolute;
left: 0;
top: 0;
height: 30px;
line-height: 30px;
height: scale-px(30px);
line-height: scale-px(30px);
border-bottom: 0;
color: $color-text-help;
font-weight: 500;
Expand All @@ -145,11 +145,11 @@
display: flex;
justify-content: center;
align-items: center;
width: 16px;
height: 16px;
font-size: 10px;
border-radius: 16px;
margin-bottom: 2px;
width: scale-px(16px);
height: scale-px(16px);
font-size: $font-size-xxs;
border-radius: scale-px(16px);
margin-bottom: scale-px(2px);
color: $color-text-help;
&-active {
background-color: $color-primary;
Expand All @@ -167,7 +167,7 @@
&-item {
&-info {
margin-left: 0;
margin-right: 9px;
margin-right: scale-px(9px);
}
}
}
Expand Down
52 changes: 26 additions & 26 deletions src/packages/animate/animate.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,31 +76,31 @@
transform: translateX(0);
}
10% {
transform: translateX(-9px);
transform: translateX(scale-px(-9px));
}
20% {
transform: translateX(8px);
transform: translateX(scale-px(8px));
}
30% {
transform: translateX(-7px);
transform: translateX(scale-px(-7px));
}
40% {
transform: translateX(6px);
transform: translateX(scale-px(6px));
}
50% {
transform: translateX(-5px);
transform: translateX(scale-px(-5px));
}
60% {
transform: translateX(4px);
transform: translateX(scale-px(4px));
}
70% {
transform: translateX(-3px);
transform: translateX(scale-px(-3px));
}
80% {
transform: translateX(2px);
transform: translateX(scale-px(2px));
}
90% {
transform: translateX(-1px);
transform: translateX(scale-px(-1px));
}
}
.nut-animate-shake {
Expand Down Expand Up @@ -142,16 +142,16 @@
position: relative;
&::after,
&::before {
width: 60px;
height: 60px;
width: scale-px(60px);
height: scale-px(60px);
content: '';
box-sizing: border-box;
border: 4px solid rgba(255, 255, 255, 0.6);
border: scale-px(4px) solid rgba(255, 255, 255, 0.6);
position: absolute;
border-radius: 30px;
border-radius: scale-px(30px);
right: 50%;
margin-top: -30px;
margin-right: -30px;
margin-top: scale-px(-30px);
margin-right: scale-px(-30px);
z-index: 1;
transform: scale(0);
animation: twinkle 2s ease-out infinite;
Expand Down Expand Up @@ -180,8 +180,8 @@
position: relative;
overflow: hidden;
&::after {
width: 100px;
height: 60px;
width: scale-px(100px);
height: scale-px(60px);
position: absolute;
left: 0;
top: 0;
Expand All @@ -194,17 +194,17 @@
);
animation: flicker 1.5s linear infinite;
transform: skewX(-20deg);
filter: blur(3px);
filter: blur(scale-px(3px));
}
}

@keyframes flicker {
0% {
transform: translateX(-100px) skewX(-20deg);
transform: translateX(scale-px(-100px)) skewX(-20deg);
}
40%,
100% {
transform: translateX(150px) skewX(-20deg);
transform: translateX(scale-px(150px)) skewX(-20deg);
}
}

Expand All @@ -214,13 +214,13 @@
transform: rotate(0) translateY(0);
}
25% {
transform: rotate(10deg) translateY(20px);
transform: rotate(10deg) translateY(scale-px(20px));
}
50% {
transform: rotate(0) translateY(-10px);
transform: rotate(0) translateY(scale-px(-10px));
}
75% {
transform: rotate(-10deg) translateY(20px);
transform: rotate(-10deg) translateY(scale-px(20px));
}
100% {
transform: rotate(0) translateY(0);
Expand All @@ -237,13 +237,13 @@
top: 0;
}
25% {
top: 1px;
top: scale-px(1px);
}
50% {
top: 4px;
top: scale-px(4px);
}
75% {
top: 1px;
top: scale-px(1px);
}
100% {
top: 0;
Expand Down
Loading
Loading