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.

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

fix: countdown手动控制demo展示样式优化 #1229

Merged
merged 12 commits into from
Jul 14, 2023
Merged

fix: countdown手动控制demo展示样式优化 #1229

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
fd70c7c
fix: 完善migrate-from-v1文档
irisSong Jun 15, 2023
d1de972
fix: 合并next分支
irisSong Jun 26, 2023
a6f4368
Merge remote-tracking branch 'upstream/next' into next
irisSong Jun 26, 2023
68e6b76
Merge remote-tracking branch 'upstream/next' into next
irisSong Jul 4, 2023
0d0d11f
Merge remote-tracking branch 'upstream/next' into next
irisSong Jul 5, 2023
ba7b233
fix: animatingNumber组件暗黑模式适配+demo优化
irisSong Jul 5, 2023
99730ac
Merge remote-tracking branch 'upstream/next' into next
irisSong Jul 12, 2023
68dd2a7
fix: signature组件提取样式变量+修复taro h5 demo签字时滚动问题
irisSong Jul 13, 2023
a3e2f64
fix: 修复signature小程序下签字demo跟随滚动问题
irisSong Jul 14, 2023
8548d11
Merge remote-tracking branch 'upstream/next' into next
irisSong Jul 14, 2023
ff02428
fix: countdown手动控制demo展示样式优化
irisSong Jul 14, 2023
978d1f5
Merge remote-tracking branch 'upstream/next' into next
irisSong Jul 14, 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
5 changes: 5 additions & 0 deletions src/packages/countdown/demo.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.demo-countdown {
.nut-grid-item__content {
border: 0 !important;
}
}
7 changes: 6 additions & 1 deletion src/packages/countdown/demo.taro.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
} from '@/packages/nutui.react.taro'
import Header from '@/sites/components/header'
import { useTranslate } from '@/sites/assets/locale/taro'
import '@/packages/countdown/demo.scss'

interface countdownRefState {
start: () => void
Expand Down Expand Up @@ -166,7 +167,11 @@ const CountDownDemo = () => {
return (
<>
<Header />
<div className={`demo ${Taro.getEnv() === 'WEB' ? 'web' : ''}`}>
<div
className={`demo demo-countdown ${
Taro.getEnv() === 'WEB' ? 'web' : ''
}`}
>
<h2>{translated.basic}</h2>
<Cell>
<CountDown
Expand Down
3 changes: 2 additions & 1 deletion src/packages/countdown/demo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { useTranslate } from '../../sites/assets/locale'
import Button from '../button'
import Grid from '../grid'
import GridItem from '../griditem'
import './demo.scss'

interface countdownRefState {
start: () => void
Expand Down Expand Up @@ -161,7 +162,7 @@ const CountDownDemo = () => {
}
return (
<>
<div className="demo">
<div className="demo demo-countdown">
<h2>{translated.basic}</h2>
<Cell>
<CountDown
Expand Down