diff --git a/src/packages/button/button.scss b/src/packages/button/button.scss
index a736beb849..dc39cbfee2 100644
--- a/src/packages/button/button.scss
+++ b/src/packages/button/button.scss
@@ -102,7 +102,10 @@
&-round {
border-radius: $button-border-radius;
- &-xlarge,
+ &-xlarge {
+ border-radius: $button-xlarge-border-radius;
+ }
+
&-large {
border-radius: $button-large-border-radius;
}
@@ -178,7 +181,7 @@
padding: $button-large-padding;
font-size: $button-large-font-size;
font-weight: $button-large-font-weight;
- border-radius: $radius-base;
+ border-radius: $radius-s;
.nut-button-text {
margin-left: $button-xlarge-text-icon-margin;
@@ -203,7 +206,7 @@
height: $button-small-height;
padding: $button-small-padding;
font-size: $button-small-font-size;
- border-radius: $radius-s;
+ border-radius: $radius-xs;
.nut-icon {
font-size: $button-small-font-size;
@@ -220,7 +223,7 @@
height: $button-mini-height;
padding: $button-mini-padding;
font-size: $button-mini-font-size;
- border-radius: $radius-s;
+ border-radius: $radius-xs;
.nut-icon {
font-size: $button-mini-font-size;
@@ -246,6 +249,11 @@
background: $button-primary-background-color;
color: $button-primary-color;
border-color: transparent;
+ font-weight: $font-weight-bold;
+ &.nut-button-small,
+ &.nut-button-mini {
+ font-weight: $font-weight;
+ }
}
&-disabled,
@@ -283,6 +291,9 @@
}
}
}
+ &-primary.nut-button-solid.nut-button-normal {
+ font-weight: $font-weight-bold;
+ }
&-success {
color: $button-success-color;
diff --git a/src/packages/button/demos/h5/demo8.tsx b/src/packages/button/demos/h5/demo8.tsx
index 6c184ffffd..e8b1f1ed58 100644
--- a/src/packages/button/demos/h5/demo8.tsx
+++ b/src/packages/button/demos/h5/demo8.tsx
@@ -3,11 +3,9 @@ import { Button } from '@nutui/nutui-react'
const Demo8 = () => {
return (
- <>
-
- >
+
)
}
export default Demo8
diff --git a/src/packages/button/demos/taro/demo10.tsx b/src/packages/button/demos/taro/demo10.tsx
index b5dcef4d2c..ae1c963e03 100644
--- a/src/packages/button/demos/taro/demo10.tsx
+++ b/src/packages/button/demos/taro/demo10.tsx
@@ -1,23 +1,13 @@
import React from 'react'
import { Button, Cell } from '@nutui/nutui-react-taro'
-import { harmonyAndRn } from '@/utils/platform-taro'
-import pxTransform from '@/utils/px-transform'
+import { harmony } from '@/utils/platform-taro'
const App = () => {
- const marginStyle = harmonyAndRn()
- ? {
- width: pxTransform(120),
- marginRight: pxTransform(8),
- marginTop: pxTransform(8),
- marginLeft: pxTransform(8),
- marginBottom: pxTransform(8),
- }
- : {
- marginRight: 8,
- marginTop: 8,
- marginLeft: 8,
- marginBottom: 8,
- }
+ const marginStyle = {
+ width: harmony() ? 120 : 'auto',
+ margin: 8,
+ }
+
return (
|