@nutui/nutui-react 2.1.0 → 2.2.0-beta.0

package/dist/packages/badge/badge.scss

@@ -3,32 +3,49 @@
   display: inline-block;
 
   &__icon {
-    display: flex;
     position: absolute;
+    display: flex;
+    justify-content: center;
+    align-items: center;
     background: $badge-background-color;
-    top: -20%;
-    right: -20%;
+    top: -10%;
+    right: -15%;
     padding: $badge-icon-padding;
     text-align: center;
     border: $badge-border;
     border-radius: $badge-border-radius;
     z-index: $badge-z-index;
+
+    .nut-icon {
+      width: $badge-icon-size;
+      height: $badge-icon-size;
+      font-size: $badge-icon-size;
+    }
   }
 
   &__sup {
+    height: $badge-height;
     position: absolute;
+    display: flex;
+    justify-content: center;
+    align-items: center;
     background: $badge-background-color;
     color: $badge-color;
     padding: $badge-padding;
     font-size: $badge-font-size;
     font-weight: normal;
     text-align: center;
-    line-height: 16px;
     border: $badge-border;
     border-radius: $badge-border-radius;
     min-width: $badge-min-width;
   }
 
+  &__one {
+    height: $badge-height;
+    width: $badge-height;
+    padding: 0;
+  }
+
   &__content {
     transform: $badge-content-transform;
   }

package/dist/packages/calendar/calendar.scss

@@ -92,7 +92,7 @@
       top: -50px;
       left: 0;
       right: 0;
-      font-size: $font-size-1;
+      font-size: $font-size-small;
       color: $text-color;
     }
   }
@@ -160,7 +160,7 @@
 
     &-active {
       background-color: $calendar-active-background-color;
-      color: $primary-text-color !important;
+      color: $color-primary-text !important;
       border-radius: $calendar-day-active-border-radius;
 
       &.active-start {
@@ -176,7 +176,7 @@
       }
 
       .nut-calendar-day-info {
-        color: $primary-text-color;
+        color: $color-primary-text;
       }
     }
 
@@ -215,7 +215,7 @@
       margin: 10px 18px;
       border-radius: 22px;
       background: $button-primary-background-color;
-      color: $primary-text-color;
+      color: $color-primary-text;
       text-align: center;
       line-height: 44px;
     }

package/dist/packages/calendarcard/calendarcard.scss

@@ -64,7 +64,7 @@
     &.start,
     &.end {
       background-color: $calendar-active-background-color;
-      color: $primary-text-color !important;
+      color: $color-primary-text !important;
       border-radius: $calendar-day-active-border-radius;
     }
 
@@ -90,7 +90,7 @@
     }
 
     .nut-calendar-day-info {
-      color: $primary-text-color;
+      color: $color-primary-text;
     }
 
     // 上个月、下个月

package/dist/packages/card/card.scss

@@ -59,7 +59,7 @@
       .nut-tag {
         padding: 0 2px;
         margin-right: 5px;
-        font-size: $font-size-0;
+        font-size: $font-size-xs;
       }
     }
     .nut-cardright-shop {

package/dist/packages/checkbox/checkbox.scss

@@ -23,7 +23,7 @@
   }
 
   &__icon {
-    color: $primary-color;
+    color: $color-primary;
     font-size: $checkbox-icon-font-size;
     transition-duration: 0.3s;
     transition-property: color, border-color, background-color;
@@ -35,7 +35,7 @@
   }
 
   &__icon--indeterminate {
-    color: $primary-color;
+    color: $color-primary;
     font-size: $checkbox-icon-font-size;
   }
 

package/dist/packages/dialog/dialog.scss

@@ -5,6 +5,7 @@
   flex-direction: column;
   align-items: center;
   width: $dialog-width;
+  max-height: 67%;
   min-height: $dialog-min-height;
   padding: $dialog-padding;
   box-sizing: border-box;
@@ -26,27 +27,26 @@
     left: 50%;
     -webkit-transform: translate(-50%, -50%);
     transform: translate(-50%, -50%);
-    border-radius: $dialog-outer-border-radius;
-    z-index: $dialog-outer-z-index;
+    border-radius: $dialog-border-radius;
+    z-index: $dialog-z-index;
     animation-duration: 0.3s;
   }
 
   &__header {
     display: block;
     text-align: center;
-    font-size: $font-size-3;
+    font-size: $font-size-large;
+    font-weight: $dialog-header-font-weight;
     color: $title-color;
     @include oneline-ellipsis();
   }
 
   &__content {
     width: 100%;
-    overflow: auto;
-    flex: 1;
     margin: $dialog-content-margin;
     max-height: $dialog-content-max-height;
     line-height: $dialog-content-line-height;
-    font-size: $font-size-1;
+    font-size: $font-size-small;
     color: $text-color;
     word-wrap: break-word;
     word-break: break-all;
@@ -67,11 +67,16 @@
         min-width: 100%;
         margin: 0;
 
-        &.nut-dialog__footer-cancel {
-          border: 0;
+        &.nut-dialog__footer-ok {
+          order: 1;
         }
 
-        &.nut-dialog__footer-ok {
+        &.nut-dialog__footer-cancel {
+          border: 0;
+          color: $text-color;
+          order: 2;
+          display: flex;
+          align-items: flex-end;
           margin-top: $dialog-vertical-footer-ok-margin-top;
         }
       }
@@ -90,23 +95,3 @@
     }
   }
 }
-
-// .fadeDialog-enter,
-// .fadeDialog-appear {
-//   opacity: 0;
-// }
-
-// .fadeDialog-enter-active,
-// .fadeDialog-appear-active {
-//   opacity: 1;
-//   transition: opacity 1s cubic-bezier(0.3, 1.3, 0.3, 1);
-// }
-
-// .fadeDialog-exit {
-//   opacity: 1;
-// }
-
-// .fadeDialog-exit-active {
-//   opacity: 0;
-//   transition: opacity 1s cubic-bezier(0.3, 1.3, 0.3, 1);
-// }

package/dist/packages/divider/divider.scss

@@ -4,7 +4,7 @@
   font-size: $divider-text-font-size;
   color: $divider-text-color;
   margin: $divider-margin;
-  border: 0 solid currentColor;
+  border: 0 solid $divider-border-color;
   width: 100%;
 
   &::before,
@@ -21,23 +21,23 @@
   &__left,
   &__right {
     &::before {
-      margin-right: $divider-before-margin-right;
+      margin-right: $divider-spacing;
     }
 
     &::after {
-      margin-left: $divider-after-margin-left;
+      margin-left: $divider-spacing;
     }
   }
 
   &__left {
     &::before {
-      max-width: 10%;
+      max-width: $divider-side-width;
     }
   }
 
   &__right {
     &::after {
-      max-width: 10%;
+      max-width: $divider-side-width;
     }
   }
 
@@ -53,7 +53,7 @@
     top: $divider-vertical-top;
     display: inline-block;
     height: $divider-vertical-height;
-    border-left: 1px solid $divider-vertical-border-left;
+    border-left: 1px solid $divider-border-color;
     margin: $divider-vertical-margin;
     width: auto;
   }

package/dist/packages/elevator/elevator.scss

@@ -3,53 +3,60 @@
   display: block;
   position: relative;
   overflow: hidden;
+
   &__list {
     display: block;
     position: relative;
-    top: 1px;
+    top: 0;
     overflow: hidden;
+    font-size: $elevator-list-font-size;
+    color: $elevator-list-color;
+
     &__inner {
       height: 100%;
       width: 100%;
       display: block;
-      background-color: $elevator-list-inner-bg-color;
+      background-color: $elevator-list-bg-color;
       overflow: auto;
     }
+
     &__item {
       display: block;
-      font-size: $elevator-list-item-font-size;
-      color: $elevator-list-item-font-color;
+
       &__code {
         display: flex;
         position: relative;
         height: $elevator-list-item-code-height;
         line-height: $elevator-list-item-code-line-height;
         font-size: $elevator-list-item-code-font-size;
-        color: $elevator-list-item-code-font-color;
-        padding: $elevator-list-item-code-padding;
+        color: $elevator-list-item-code-color;
+        padding: $elevator-list-item-padding;
         font-weight: $elevator-list-item-code-font-weight;
         box-sizing: border-box;
-        border-bottom: $elevator-list-item-code-border-bottom solid
-          $elevator-list-item-code-border-bottom-color;
+        border-bottom: $elevator-list-item-code-border-bottom;
+        background-color: $elevator-list-item-code-background-color;
       }
+
       &__name {
         display: flex;
         align-items: center;
-        padding: $elevator-list-item-name-padding;
+        padding: $elevator-list-item-padding;
         height: $elevator-list-item-name-height;
         line-height: $elevator-list-item-name-line-height;
+
         &--highcolor {
-          color: $elevator-list-item-highcolor;
+          color: $color-primary;
         }
       }
     }
+
     &__fixed {
       width: 100%;
       position: absolute;
       top: 0;
       left: 0;
       z-index: 1;
-      padding: $elevator-list-item-code-padding;
+      padding: $elevator-list-item-padding;
       height: $elevator-list-item-code-height;
       line-height: $elevator-list-item-code-line-height;
       font-size: $elevator-list-item-code-font-size;
@@ -60,11 +67,12 @@
       box-shadow: $elevator-list-fixed-box-shadow;
     }
   }
+
   &__code--current {
-    position: $elevator-list-item-code-current-position;
+    position: absolute;
     right: $elevator-list-item-code-current-right;
     top: $elevator-list-item-code-current-top;
-    transform: $elevator-list-item-code-current-transform;
+    transform: $elevator-bars-transform;
     width: $elevator-list-item-code-current-width;
     height: $elevator-list-item-code-current-height;
     line-height: $elevator-list-item-code-current-line-height;
@@ -73,24 +81,29 @@
     box-shadow: $elevator-list-item-code-current-box-shadow;
     text-align: $elevator-list-item-code-current-text-align;
   }
+
   &__bars {
-    position: $elevator-list-item-bars-position;
-    right: $elevator-list-item-bars-right;
-    top: $elevator-list-item-bars-top;
-    transform: $elevator-list-item-bars-transform;
-    padding: $elevator-list-item-bars-padding;
-    background-color: $elevator-list-item-bars-background-color;
-    border-radius: $elevator-list-item-bars-border-radius;
-    text-align: $elevator-list-item-bars-text-align;
-    z-index: $elevator-list-item-bars-z-index;
+    position: absolute;
+    right: $elevator-bars-right;
+    top: $elevator-bars-top;
+    font-size: $elevator-bars-font-size;
+    transform: $elevator-bars-transform;
+    padding: $elevator-bars-padding;
+    background-color: $elevator-bars-background-color;
+    border-radius: $elevator-bars-border-radius;
+    text-align: center;
+    z-index: $elevator-bars-z-index;
+
     &__inner {
       &__item {
         display: block;
-        padding: $elevator-list-item-bars-inner-item-padding;
-        font-size: $elevator-list-item-bars-inner-item-font-size;
+        padding: $elevator-bars-inner-item-padding;
+
         &--active {
-          color: $elevator-list-item-bars-inner-item-active-color;
+          font-weight: $font-weight-bold;
+          color: $elevator-bars-active-color;
         }
+
         cursor: pointer;
       }
     }

package/dist/packages/fixednav/fixednav.scss

@@ -97,7 +97,7 @@
         font-size: 10px;
         padding: 0 3px;
         color: white;
-        background: $primary-color;
+        background: $color-primary;
         border-radius: 7px;
         text-align: center;
         min-width: 12px;

package/dist/packages/menuitem/menuitem.scss

@@ -16,7 +16,7 @@
 
 .nut-menu-item__option {
   color: $title-color;
-  font-size: $font-size-2;
+  font-size: $font-size-base;
   padding-top: $menu-item-option-padding-top;
   padding-bottom: $menu-item-option-padding-bottom;
   display: flex;

package/dist/packages/price/price.scss

@@ -1,7 +1,7 @@
 .nut-price {
-  font-size: $font-size-3;
+  font-size: $font-size-large;
   display: inline;
-  color: $primary-color;
+  color: $color-primary;
   &--line {
     div {
       text-decoration: line-through;

package/dist/packages/range/range.scss

@@ -6,7 +6,7 @@
   align-items: center;
   .min,
   .max {
-    font-size: $font-size-1;
+    font-size: $font-size-small;
     color: $range-font-color;
     user-select: none;
   }
@@ -147,7 +147,7 @@
       align-items: center;
       justify-content: center;
       user-select: none;
-      font-size: $font-size-1;
+      font-size: $font-size-small;
       color: $range-font-color;
       transform: translate3d(0, -100%, 0);
     }

package/dist/packages/shortpassword/shortpassword.scss

@@ -2,7 +2,7 @@
 .nut-shortpassword {
   &__title {
     line-height: 1;
-    font-size: $font-size-3;
+    font-size: $font-size-large;
     color: $title-color;
   }
 
@@ -10,7 +10,7 @@
     margin-top: 12px;
     margin-bottom: 24px;
     line-height: 1;
-    font-size: $font-size-1;
+    font-size: $font-size-small;
     color: $text-color;
   }
 
@@ -75,13 +75,13 @@
 
     &__error {
       line-height: 1;
-      font-size: $font-size-0;
+      font-size: $font-size-xs;
       color: $shortpassword-error;
     }
 
     &__forget {
       line-height: 1;
-      font-size: $font-size-1;
+      font-size: $font-size-small;
       color: $shortpassword-forget;
       display: flex;
       align-items: center;
@@ -95,25 +95,25 @@
 
     &__cancel {
       background: $white;
-      border: 1px solid $primary-color;
+      border: 1px solid $color-primary;
       border-radius: 15px;
       padding: 8px 38px;
       line-height: 1;
-      font-size: $font-size-2;
-      color: $primary-color;
+      font-size: $font-size-base;
+      color: $color-primary;
     }
 
     &__sure {
       background: linear-gradient(
         135deg,
-        $primary-color 0%,
-        $primary-color-end 100%
+        $color-primary 0%,
+        $color-primary-stop-2 100%
       );
       border-radius: 15px;
       padding: 8px 38px;
       line-height: 1;
-      font-size: $font-size-2;
-      color: $primary-text-color;
+      font-size: $font-size-base;
+      color: $color-primary-text;
     }
   }
 }

package/dist/packages/step/step.scss

@@ -177,7 +177,7 @@
         margin-top: -7px;
         width: 14px;
         height: 14px;
-        background-color: $primary-color-end;
+        background-color: $color-primary-stop-2;
         border-radius: 50%;
         opacity: 0.23;
       }

package/dist/packages/switch/switch.scss

@@ -22,13 +22,13 @@
     align-items: center;
     justify-content: center;
     border-radius: 50%;
-    background: $primary-text-color;
+    background: $color-primary-text;
     transition: transform 0.3s;
   }
 
   &__label {
-    color: $primary-text-color;
-    font-size: $font-size-1;
+    color: $color-primary-text;
+    font-size: $font-size-small;
     &.open {
       transform: translateX(-16px);
     }

package/dist/packages/table/table.scss

@@ -2,7 +2,7 @@
   display: flex;
   width: 100%;
   flex-direction: column;
-  font-size: $font-size-2;
+  font-size: $font-size-base;
   color: $title-color;
 
   &__main {

package/dist/packages/tour/tour.scss

@@ -54,7 +54,7 @@
           &.active {
             color: #fff;
             border: 0;
-            background: $primary-color;
+            background: $color-primary;
           }
         }
       }