diff --git a/src/packages/button/button.scss b/src/packages/button/button.scss index 9d88be721e..0ce4c5b8aa 100644 --- a/src/packages/button/button.scss +++ b/src/packages/button/button.scss @@ -101,22 +101,6 @@ &-round { border-radius: $button-border-radius; - - &-xlarge { - border-radius: $button-xlarge-border-radius; - } - - &-large { - border-radius: $button-large-border-radius; - } - - &-small { - border-radius: $button-small-border-radius; - } - - &-mini { - border-radius: $button-mini-border-radius; - } } &-default { @@ -155,7 +139,7 @@ height: $button-xlarge-height; padding: $button-xlarge-padding; font-size: $button-xlarge-font-size; - border-radius: $radius-base; + border-radius: $button-xlarge-border-radius; .nut-button-text { margin-left: $button-xlarge-text-icon-margin; @@ -178,7 +162,7 @@ height: $button-large-height; padding: $button-large-padding; font-size: $button-large-font-size; - border-radius: $radius-s; + border-radius: $button-large-border-radius; .nut-button-text { margin-left: $button-xlarge-text-icon-margin; @@ -202,7 +186,7 @@ height: $button-small-height; padding: $button-small-padding; font-size: $button-small-font-size; - border-radius: $radius-xs; + border-radius: $button-small-border-radius; .nut-icon { font-size: $button-small-font-size; @@ -219,7 +203,7 @@ height: $button-mini-height; padding: $button-mini-padding; font-size: $button-mini-font-size; - border-radius: $radius-xs; + border-radius: $button-mini-border-radius; .nut-icon { font-size: $button-mini-font-size; diff --git a/src/packages/button/demo.tsx b/src/packages/button/demo.tsx index c6c7b0cf5e..3b9c27b59f 100644 --- a/src/packages/button/demo.tsx +++ b/src/packages/button/demo.tsx @@ -1,6 +1,5 @@ import React from 'react' import { useTranslate } from '@/sites/assets/locale' -import Cell from '../cell' import Demo1 from './demos/h5/demo1' import Demo2 from './demos/h5/demo2' import Demo3 from './demos/h5/demo3' @@ -54,41 +53,23 @@ const ButtonDemo = () => { <>

{translated.ce5c5446}

- - - +

{translated.e51e4582}

- - - +

{translated['0aaad622']}

- - - +

{translated['7db1a8b2']}

- - - +

{translated.ce5c5447}

- - - +

{translated.a52bef0c}

- - - +

{translated['0aaad620']}

- - - +

{translated.c9e6df49}

- - - +

{translated.customColor}

- - - +
) diff --git a/src/packages/button/demos/h5/demo1.tsx b/src/packages/button/demos/h5/demo1.tsx index 0a1af6bb59..718d24662f 100644 --- a/src/packages/button/demos/h5/demo1.tsx +++ b/src/packages/button/demos/h5/demo1.tsx @@ -1,10 +1,10 @@ import React from 'react' -import { Button } from '@nutui/nutui-react' +import { Button, Cell } from '@nutui/nutui-react' const Demo1 = () => { const marginStyle = { margin: 8 } return ( - <> + @@ -23,7 +23,7 @@ const Demo1 = () => { - + ) } export default Demo1 diff --git a/src/packages/button/demos/h5/demo2.tsx b/src/packages/button/demos/h5/demo2.tsx index e79948b669..85d10628b4 100644 --- a/src/packages/button/demos/h5/demo2.tsx +++ b/src/packages/button/demos/h5/demo2.tsx @@ -1,10 +1,10 @@ import React from 'react' -import { Button } from '@nutui/nutui-react' +import { Button, Cell } from '@nutui/nutui-react' const Demo2 = () => { const marginStyle = { margin: 8 } return ( - <> + @@ -17,7 +17,7 @@ const Demo2 = () => { - + ) } export default Demo2 diff --git a/src/packages/button/demos/h5/demo3.tsx b/src/packages/button/demos/h5/demo3.tsx index 92680bbc0c..3edb13d4b6 100644 --- a/src/packages/button/demos/h5/demo3.tsx +++ b/src/packages/button/demos/h5/demo3.tsx @@ -1,11 +1,11 @@ import React from 'react' import { Star, Plus } from '@nutui/icons-react' -import { Button } from '@nutui/nutui-react' +import { Button, Cell } from '@nutui/nutui-react' const Demo3 = () => { const marginStyle = { margin: 8 } return ( - <> + - + ) } export default Demo3 diff --git a/src/packages/button/demos/h5/demo4.tsx b/src/packages/button/demos/h5/demo4.tsx index fe13a96859..dbfa76fb06 100644 --- a/src/packages/button/demos/h5/demo4.tsx +++ b/src/packages/button/demos/h5/demo4.tsx @@ -1,11 +1,11 @@ import React from 'react' import { Star, Plus } from '@nutui/icons-react' -import { Button } from '@nutui/nutui-react' +import { Button, Cell } from '@nutui/nutui-react' const Demo4 = () => { const marginStyle = { margin: 8 } return ( - <> + - + ) } export default Demo4 diff --git a/src/packages/button/demos/h5/demo5.tsx b/src/packages/button/demos/h5/demo5.tsx index bd406adb43..cc4c719a60 100644 --- a/src/packages/button/demos/h5/demo5.tsx +++ b/src/packages/button/demos/h5/demo5.tsx @@ -1,17 +1,17 @@ import React from 'react' -import { Button } from '@nutui/nutui-react' +import { Button, Cell } from '@nutui/nutui-react' const Demo5 = () => { const marginStyle = { margin: 8 } return ( - <> + - + ) } export default Demo5 diff --git a/src/packages/button/demos/h5/demo6.tsx b/src/packages/button/demos/h5/demo6.tsx index e572980441..7c7349f692 100644 --- a/src/packages/button/demos/h5/demo6.tsx +++ b/src/packages/button/demos/h5/demo6.tsx @@ -1,11 +1,11 @@ import React, { useState } from 'react' -import { Button } from '@nutui/nutui-react' +import { Button, Cell } from '@nutui/nutui-react' const Demo6 = () => { const [loading, setLoading] = useState(false) const marginStyle = { margin: 8 } return ( - <> + @@ -22,7 +22,7 @@ const Demo6 = () => { > Click Me! - + ) } export default Demo6 diff --git a/src/packages/button/demos/h5/demo7.tsx b/src/packages/button/demos/h5/demo7.tsx index c19dd69006..c8bce72b60 100644 --- a/src/packages/button/demos/h5/demo7.tsx +++ b/src/packages/button/demos/h5/demo7.tsx @@ -1,19 +1,18 @@ import React from 'react' -import { Button } from '@nutui/nutui-react' +import { Button, Cell } from '@nutui/nutui-react' const App = () => { const marginStyle = { margin: 8 } return ( - <> - - - - + ) } export default App diff --git a/src/packages/button/demos/h5/demo8.tsx b/src/packages/button/demos/h5/demo8.tsx index e8b1f1ed58..21769ad851 100644 --- a/src/packages/button/demos/h5/demo8.tsx +++ b/src/packages/button/demos/h5/demo8.tsx @@ -1,11 +1,13 @@ import React from 'react' -import { Button } from '@nutui/nutui-react' +import { Button, Cell } from '@nutui/nutui-react' const Demo8 = () => { return ( - + + + ) } export default Demo8 diff --git a/src/packages/button/demos/h5/demo9.tsx b/src/packages/button/demos/h5/demo9.tsx index 7e814f0d2b..9c6ec13ec6 100644 --- a/src/packages/button/demos/h5/demo9.tsx +++ b/src/packages/button/demos/h5/demo9.tsx @@ -1,9 +1,9 @@ import React from 'react' -import { Button } from '@nutui/nutui-react' +import { Button, Cell } from '@nutui/nutui-react' const App = () => { return ( - <> + - + ) } export default App diff --git a/src/packages/button/demos/taro/demo8.tsx b/src/packages/button/demos/taro/demo8.tsx index 5139cf8e24..60d397cea5 100644 --- a/src/packages/button/demos/taro/demo8.tsx +++ b/src/packages/button/demos/taro/demo8.tsx @@ -10,15 +10,14 @@ const Demo8 = () => { return ( - - -