Skip to content

Commit

Permalink
feat: update icon (#2710)
Browse files Browse the repository at this point in the history
  • Loading branch information
oasis-cloud authored Nov 8, 2024
1 parent d53f051 commit 60d5c80
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 47 deletions.
5 changes: 1 addition & 4 deletions src/packages/grid/demos/taro/demo1.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import React from 'react'
import { Grid } from '@nutui/nutui-react-taro'
// import { Image } from '@nutui/icons-react-taro'
import { Text } from '@tarojs/components'

const Image = () => <Text>T</Text>
import { Image } from '@nutui/icons-react-taro'

const Demo1 = () => {
return (
Expand Down
5 changes: 1 addition & 4 deletions src/packages/grid/demos/taro/demo10.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import React from 'react'
import { Grid } from '@nutui/nutui-react-taro'
// import { Image } from '@nutui/icons-react-taro'
import { Image } from '@nutui/icons-react-taro'
import Taro from '@tarojs/taro'
import { Text } from '@tarojs/components'

const Image = () => <Text>T</Text>

const Demo10 = () => {
const onClick = (item: any, index: number) => {
Expand Down
5 changes: 1 addition & 4 deletions src/packages/grid/demos/taro/demo2.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import React from 'react'
import { Grid } from '@nutui/nutui-react-taro'
// import { Image } from '@nutui/icons-react-taro'
import { Text } from '@tarojs/components'

const Image = () => <Text>T</Text>
import { Image } from '@nutui/icons-react-taro'

const Demo2 = () => {
return (
Expand Down
5 changes: 1 addition & 4 deletions src/packages/grid/demos/taro/demo3.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import React from 'react'
import { Grid } from '@nutui/nutui-react-taro'
// import { Image } from '@nutui/icons-react-taro'
import { Text } from '@tarojs/components'

const Image = () => <Text>T</Text>
import { Image } from '@nutui/icons-react-taro'

const Demo3 = () => {
return (
Expand Down
5 changes: 1 addition & 4 deletions src/packages/grid/demos/taro/demo4.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import React from 'react'
import { Grid } from '@nutui/nutui-react-taro'
// import { Image } from '@nutui/icons-react-taro'
import { Text } from '@tarojs/components'

const Image = () => <Text>T</Text>
import { Image } from '@nutui/icons-react-taro'

const Demo4 = () => {
return (
Expand Down
5 changes: 1 addition & 4 deletions src/packages/grid/demos/taro/demo5.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import React from 'react'
import { Grid } from '@nutui/nutui-react-taro'
// import { Image } from '@nutui/icons-react-taro'
import { Text } from '@tarojs/components'
import { Image } from '@nutui/icons-react-taro'
import pxTransform from '@/utils/px-transform'

const Image = () => <Text>T</Text>

const Demo5 = () => {
const style = { height: pxTransform(100) }
return (
Expand Down
5 changes: 1 addition & 4 deletions src/packages/grid/demos/taro/demo6.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import React from 'react'
import { Grid } from '@nutui/nutui-react-taro'
// import { Image } from '@nutui/icons-react-taro'
import { Text } from '@tarojs/components'

const Image = () => <Text>T</Text>
import { Image } from '@nutui/icons-react-taro'

const Demo6 = () => {
return (
Expand Down
5 changes: 1 addition & 4 deletions src/packages/grid/demos/taro/demo7.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import React from 'react'
import { Grid } from '@nutui/nutui-react-taro'
// import { Image } from '@nutui/icons-react-taro'
import { Text } from '@tarojs/components'

const Image = () => <Text>T</Text>
import { Image } from '@nutui/icons-react-taro'

const Demo7 = () => {
return (
Expand Down
22 changes: 7 additions & 15 deletions src/packages/grid/demos/taro/demo8.tsx
Original file line number Diff line number Diff line change
@@ -1,35 +1,27 @@
import React from 'react'
import { Grid } from '@nutui/nutui-react-taro'
// import { Image } from '@nutui/icons-react-taro'
import { Text } from '@tarojs/components'
import pxTransform from '@/utils/px-transform'
import { Image } from '@nutui/icons-react-taro'

const Demo8 = () => {
return (
<Grid columns="3">
<Grid.Item text="文字">
{/* <Image size={16} /> */}
<Text style={{ fontSize: pxTransform(16) }}>T</Text>
<Image size={16} />
</Grid.Item>
<Grid.Item text="文字">
{/* <Image color="red" /> */}
<Text style={{ color: 'red' }}>T</Text>
<Image color="red" />
</Grid.Item>
<Grid.Item text="文字">
{/* <Image size={30} color="#478EF2" /> */}
<Text style={{ color: '#478EF2', fontSize: pxTransform(30) }}>T</Text>
<Image size={30} color="#478EF2" />
</Grid.Item>
<Grid.Item text="文字">
{/* <Image size={16} /> */}
<Text style={{ fontSize: pxTransform(16) }}>T</Text>
<Image size={16} />
</Grid.Item>
<Grid.Item text="文字">
{/* <Image color="red" /> */}
<Text style={{ color: 'red' }}>T</Text>
<Image color="red" />
</Grid.Item>
<Grid.Item text="文字">
{/* <Image size={30} color="#478EF2" /> */}
<Text style={{ color: '#478EF2', fontSize: pxTransform(30) }}>T</Text>
<Image size={30} color="#478EF2" />
</Grid.Item>
</Grid>
)
Expand Down

0 comments on commit 60d5c80

Please sign in to comment.