@nutui/nutui-react 3.0.0-beta.3 → 3.0.0-beta.5

package/dist/styles/themes/default.scss

@@ -1,106 +1,3 @@
 @import '../theme-default.scss';
-@import '../variables.scss';
-@import '../mixins/index.scss';
-@import '../animation/index.scss';
-@import '../../es/packages/watermark/style/watermark.scss';
-@import '../../es/packages/video/style/video.scss';
-@import '../../es/packages/virtuallist/style/virtuallist.scss';
-@import '../../es/packages/uploader/style/uploader.scss';
-@import '../../es/packages/trendarrow/style/trendarrow.scss';
-@import '../../es/packages/toast/style/toast.scss';
-@import '../../es/packages/tour/style/tour.scss';
-@import '../../es/packages/timedetail/style/timedetail.scss';
-@import '../../es/packages/timeselect/style/timeselect.scss';
-@import '../../es/packages/textarea/style/textarea.scss';
-@import '../../es/packages/tag/style/tag.scss';
-@import '../../es/packages/tabs/style/tabs.scss';
-@import '../../es/packages/tabbaritem/style/tabbaritem.scss';
-@import '../../es/packages/table/style/table.scss';
-@import '../../es/packages/tabbar/style/tabbar.scss';
-@import '../../es/packages/tabpane/style/tabpane.scss';
-@import '../../es/packages/switch/style/switch.scss';
-@import '../../es/packages/swiperitem/style/swiperitem.scss';
-@import '../../es/packages/swiper/style/swiper.scss';
-@import '../../es/packages/swipe/style/swipe.scss';
-@import '../../es/packages/sticky/style/sticky.scss';
-@import '../../es/packages/steps/style/steps.scss';
-@import '../../es/packages/subsidenavbar/style/subsidenavbar.scss';
-@import '../../es/packages/step/style/step.scss';
-@import '../../es/packages/space/style/space.scss';
-@import '../../es/packages/skeleton/style/skeleton.scss';
-@import '../../es/packages/signature/style/signature.scss';
-@import '../../es/packages/sidenavbaritem/style/sidenavbaritem.scss';
-@import '../../es/packages/sidenavbar/style/sidenavbar.scss';
-@import '../../es/packages/shortpassword/style/shortpassword.scss';
-@import '../../es/packages/searchbar/style/searchbar.scss';
-@import '../../es/packages/safearea/style/safearea.scss';
-@import '../../es/packages/resultpage/style/resultpage.scss';
-@import '../../es/packages/row/style/row.scss';
-@import '../../es/packages/rate/style/rate.scss';
-@import '../../es/packages/range/style/range.scss';
-@import '../../es/packages/radiogroup/style/radiogroup.scss';
-@import '../../es/packages/radio/style/radio.scss';
-@import '../../es/packages/pulltorefresh/style/pulltorefresh.scss';
-@import '../../es/packages/progress/style/progress.scss';
-@import '../../es/packages/price/style/price.scss';
-@import '../../es/packages/popup/style/popup.scss';
-@import '../../es/packages/picker/style/picker.scss';
-@import '../../es/packages/pagination/style/pagination.scss';
-@import '../../es/packages/popover/style/popover.scss';
-@import '../../es/packages/overlay/style/overlay.scss';
-@import '../../es/packages/notify/style/notify.scss';
-@import '../../es/packages/numberkeyboard/style/numberkeyboard.scss';
-@import '../../es/packages/noticebar/style/noticebar.scss';
-@import '../../es/packages/navbar/style/navbar.scss';
-@import '../../es/packages/menuitem/style/menuitem.scss';
-@import '../../es/packages/menu/style/menu.scss';
-@import '../../es/packages/loading/style/loading.scss';
-@import '../../es/packages/layout/style/layout.scss';
-@import '../../es/packages/inputnumber/style/inputnumber.scss';
-@import '../../es/packages/input/style/input.scss';
-@import '../../es/packages/infiniteloading/style/infiniteloading.scss';
-@import '../../es/packages/indicator/style/indicator.scss';
-@import '../../es/packages/imagepreview/style/imagepreview.scss';
-@import '../../es/packages/image/style/image.scss';
-@import '../../es/packages/hoverbuttonitem/style/hoverbuttonitem.scss';
-@import '../../es/packages/hoverbutton/style/hoverbutton.scss';
-@import '../../es/packages/griditem/style/griditem.scss';
-@import '../../es/packages/grid/style/grid.scss';
-@import '../../es/packages/formitem/style/formitem.scss';
-@import '../../es/packages/form/style/form.scss';
-@import '../../es/packages/ellipsis/style/ellipsis.scss';
-@import '../../es/packages/empty/style/empty.scss';
-@import '../../es/packages/fixednav/style/fixednav.scss';
-@import '../../es/packages/elevator/style/elevator.scss';
-@import '../../es/packages/drag/style/drag.scss';
-@import '../../es/packages/divider/style/divider.scss';
-@import '../../es/packages/dialog/style/dialog.scss';
-@import '../../es/packages/datepicker/style/datepicker.scss';
-@import '../../es/packages/countup/style/countup.scss';
-@import '../../es/packages/countdown/style/countdown.scss';
-@import '../../es/packages/configprovider/style/configprovider.scss';
-@import '../../es/packages/collapseitem/style/collapseitem.scss';
-@import '../../es/packages/collapse/style/collapse.scss';
-@import '../../es/packages/col/style/col.scss';
-@import '../../es/packages/circleprogress/style/circleprogress.scss';
-@import '../../es/packages/checkboxgroup/style/checkboxgroup.scss';
-@import '../../es/packages/card/style/card.scss';
-@import '../../es/packages/cellgroup/style/cellgroup.scss';
-@import '../../es/packages/checkbox/style/checkbox.scss';
-@import '../../es/packages/cell/style/cell.scss';
-@import '../../es/packages/cascader/style/cascader.scss';
-@import '../../es/packages/calendaritem/style/calendaritem.scss';
-@import '../../es/packages/calendarcard/style/calendarcard.scss';
-@import '../../es/packages/calendar/style/calendar.scss';
-@import '../../es/packages/button/style/button.scss';
-@import '../../es/packages/barrage/style/barrage.scss';
-@import '../../es/packages/badge/style/badge.scss';
-@import '../../es/packages/backtop/style/backtop.scss';
-@import '../../es/packages/avatargroup/style/avatargroup.scss';
-@import '../../es/packages/avatarcropper/style/avatarcropper.scss';
-@import '../../es/packages/avatar/style/avatar.scss';
-@import '../../es/packages/audio/style/audio.scss';
-@import '../../es/packages/animatingnumbers/style/animatingnumbers.scss';
-@import '../../es/packages/animate/style/animate.scss';
-@import '../../es/packages/address/style/address.scss';
-@import '../../es/packages/actionsheet/style/actionsheet.scss';
+@import '../theme-dark.scss';
+@import '../jd-font';

package/dist/styles/variables.scss

@@ -229,7 +229,7 @@ $button-default-disabled-color: var(
 $button-default-padding: var(--nutui-button-default-padding, 0px 12px) !default;
 $button-default-font-size: var(
   --nutui-button-default-font-size,
-  $font-size-base
+  $font-size-s
 ) !default;
 $button-default-font-weight: var(
   --nutui-button-default-font-weight,
@@ -240,14 +240,14 @@ $button-xlarge-height: var(--nutui-button-xlarge-height, 48px) !default;
 $button-xlarge-padding: var(--nutui-button-xlarge-padding, 0px 24px) !default;
 $button-xlarge-font-size: var(
   --nutui-button-xlarge-font-size,
-  $font-size-xxl
+  $font-size-xl
 ) !default;
 
 $button-large-height: var(--nutui-button-large-height, 40px) !default;
 $button-large-padding: var(--nutui-button-large-padding, 0px 16px) !default;
 $button-large-font-size: var(
   --nutui-button-large-font-size,
-  $font-size-l
+  $font-size-base
 ) !default;
 $button-large-font-weight: var(
   --nutui-button-large-font-weight,
@@ -273,7 +273,7 @@ $button-mini-padding: var(--nutui-button-mini-padding, 0px 8px) !default;
 $button-mini-height: var(--nutui-button-mini-height, 24px) !default;
 $button-mini-font-size: var(
   --nutui-button-mini-font-size,
-  $font-size-s
+  $font-size-xs
 ) !default;
 $button-mini-border-radius: var(
   --nutui-button-mini-border-radius,
@@ -288,13 +288,12 @@ $button-primary-border-color: var(
   --nutui-button-primary-border-color,
   $color-primary
 ) !default;
-$button-primary-background-color: $color-primary;
+$button-primary-background-color: linear-gradient(
+  90deg,
+  $color-primary-stop-1 0%,
+  $color-primary-stop-2 100%
+) !default;
 
-// linear-gradient(
-//   135deg,
-//   $color-primary-stop-1 0%,
-//   $color-primary-stop-2 100%
-// ) !default;
 $button-primary-disabled: var(
   --nutui-button-primary-disabled,
   $color-primary-disabled-special
@@ -368,6 +367,10 @@ $button-danger-disabled: var(
   $color-danger-disabled
 ) !default;
 
+$button-xlarge-text-icon-margin: var(
+  --nutui-button-xlarge-text-icon-margin,
+  6px
+) !default;
 $button-text-icon-margin: var(--nutui-button-text-icon-margin, 4px) !default;
 
 // cell（✅）
@@ -775,43 +778,43 @@ $numberkeyboard-key-confirm-background-color: var(
 // countdown（✅）
 $countdown-display: var(--nutui-countdown-display, flex) !default;
 $countdown-color: var(--nutui-countdown-color, $color-primary) !default;
-$countdown-font-size: var(--nutui-countdown-font-size, 10px) !default;
-$coutdown-font-weight: var(--nutui-countdown-font-weight, 400) !default;
-$countdown-height: var(--nutui-countdown-height, 14px) !default;
-$countdown-width: var(--nutui-countdown-width, 20px) !default;
-$countdown-number-padding: var(
-  --nutui-countdown-number-padding,
-  0 1px
+$countdown-font-size: var(--nutui-countdown-font-size, $font-size-xs) !default;
+$coutdown-font-weight: var(
+  --nutui-countdown-font-weight,
+  $font-weight
 ) !default;
+$countdown-height: var(--nutui-countdown-height, 16px) !default;
+$countdown-width: var(--nutui-countdown-width, 16px) !default;
+$countdown-number-padding: var(--nutui-countdown-number-padding, 0 0) !default;
 $countdown-number-border-radius: var(
   --nutui-countdown-number-border-radius,
-  2px
-) !default;
-$countdown-number-margin: var(--nutui-countdown-number-margin, 0 2px) !default;
-$countdown-number-border-color: var(
-  --nutui-countdown-number-border-color,
-  $color-primary-light-pressed
+  $radius-xxs
 ) !default;
+$countdown-number-margin: var(--nutui-countdown-number-margin, 0 1px) !default;
 $countdown-number-color: var(
   --nutui-countdown-number-color,
   $color-primary
 ) !default;
 $countdown-number-background-color: var(
   --nutui-countdown-number-background-color,
-  transparent
+  $color-background-overlay
 ) !default;
-$countdown-number-primary-border-color: var(
-  --nutui-countdown-number-primary-border-color,
-  $color-primary
+$countdown-number-border-color: var(
+  --nutui-countdown-number-border-color,
+  $color-primary-light-pressed
 ) !default;
 $countdown-number-primary-color: var(
   --nutui-countdown-number-primary-color,
-  #ffffff
+  $color-primary-text
 ) !default;
 $countdown-number-primary-background-color: var(
   --nutui-countdown-number-primary-background-color,
   $color-primary
 ) !default;
+$countdown-number-primary-border-color: var(
+  --nutui-countdown-number-primary-border-color,
+  $color-primary
+) !default;
 
 //large price（✅）
 $price-symbol-padding-right: var(
@@ -1634,7 +1637,10 @@ $popover-menu-item-padding: var(
 
 //progress（✅）
 $progress-height: var(--nutui-progress-height, 10px) !default;
-$progress-color: var(--nutui-progress-color, #ff0f23) !default;
+$progress-color: var(
+  --nutui-progress-color,
+  $color-primary-gradient-1
+) !default;
 $progress-background: var(
   --nutui-progress-background,
   $color-background
@@ -1646,7 +1652,7 @@ $progress-text-color: var(
 ) !default;
 $progress-text-background: var(
   --nutui-progress-text-background,
-  #ff0f23
+  $color-primary-gradient-1
 ) !default;
 $progress-text-padding: var(--nutui-progress-text-padding, 0 5px) !default;
 $progress-text-font-size: var(--nutui-progress-text-font-size, 9px) !default;
@@ -2068,7 +2074,12 @@ $skeleton-line-border-radius: var(
 $card-border-radius: var(--nutui-card-border-radius, 4px) !default;
 
 // grid（✅）
+$grid-border-width: var(--nutui-grid-border-width, 0px) !default;
 $grid-border-color: var(--nutui-grid-border-color, $color-border) !default;
+$grid-item-border-radius: var(
+  --nutui-grid-item-border-radius,
+  $radius-l
+) !default;
 $grid-item-content-padding: var(
   --nutui-grid-item-content-padding,
   16px 8px
@@ -2402,15 +2413,15 @@ $loading-color: var(--nutui-loading-color, $color-text-help) !default;
 $loading-font-size: var(--nutui-loading-font-size, $font-size-s) !default;
 
 // ResultPage
-$resultpage-width: var(--nutui-resultpage-width, 247px) !default;
-$resultpage-icon-size: var(--nutui-resultpage-icon-size, 48px) !default;
+$resultpage-width: var(--nutui-resultpage-width, 240px) !default;
+$resultpage-icon-size: var(--nutui-resultpage-icon-size, 36px) !default;
 $resultpage-icon-margin-bottom: var(
   --nutui-resultpage-icon-margin-bottom,
-  16px
+  12px
 ) !default;
 $resultpage-title-margin-bottom: var(
   --nutui-resultpage-title-margin-bottom,
-  9px
+  12px
 ) !default;
 $resultpage-title-font-size: var(
   --nutui-resultpage-title-font-size,
@@ -2434,5 +2445,5 @@ $resultpage-description-line-height: var(
 ) !default;
 $resultpage-actions-margin-top: var(
   --nutui-resultpage-actions-margin-top,
-  21px
+  16px
 ) !default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nutui/nutui-react",
-  "version": "3.0.0-beta.3",
+  "version": "3.0.0-beta.5",
   "style": "dist/style.css",
   "main": "dist/nutui.react.umd.js",
   "module": "dist/es/packages/nutui.react.build.js",