@nutui/nutui-react 2.1.0-beta.1 → 2.1.1-beta.0

package/dist/packages/button/button.scss

@@ -1,26 +1,32 @@
 .nut-button {
   position: relative;
+  display: flex;
   display: inline-block;
+  justify-content: center;
+  align-items: center;
   flex-shrink: 0;
-  height: $button-default-height;
   box-sizing: border-box;
   margin: 0;
   padding: 0;
-  line-height: $button-default-line-height;
+  height: $button-default-height;
   font-size: $button-default-font-size;
+  font-weight: $button-default-font-weight;
   text-align: center;
   cursor: pointer;
   transition: opacity 0.2s;
   -webkit-appearance: none;
   user-select: none;
   touch-action: manipulation;
-  -webkit-tap-highlight-color: rgba(0,0,0,0);
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
   color: $button-default-color;
-  background: $button-default-bg-color;
-  border: $button-border-width solid $button-default-border-color;
+  background: $button-default-background-color;
+
+  &-text {
+    margin-left: $button-text-icon-margin;
 
-  .nut-button-text {
-    margin-left: $button-text-icon-margin-left;
+    &.right {
+      margin-right: $button-text-icon-margin;
+    }
   }
 
   &::before {
@@ -29,9 +35,9 @@
     left: 50%;
     width: 100%;
     height: 100%;
-    background-color: $black;
+    background-color: $color-mask;
     border: inherit;
-    border-color: $black;
+    border-color: $color-mask;
     border-radius: inherit;
     transform: translate(-50%, -50%);
     opacity: 0;
@@ -46,182 +52,246 @@
     opacity: 0.1;
   }
 
-  &__warp {
+  &-warp {
     height: 100%;
-    width: 100%;
     display: flex;
     align-items: center;
     justify-content: center;
     background: initial;
   }
 
-  &--loading,
-  &--disabled {
+  &-loading,
+  &-disabled {
     &::before {
       display: none;
     }
   }
 
-  &--solid {
-    color: $button-primary-color;
-    background: $button-primary-background-color;
-    background-origin: border-box;
-    border: $button-border-width solid transparent;
+  &.nut-button-icononly {
+    width: $button-default-height;
+    padding: 0;
   }
 
-  &.nut-button--outline {
-    color: $button-primary-border-color;
-    border-color: $button-primary-border-color;
-    background: transparent;
+  &-default {
+    padding: $button-default-padding;
+    border: $button-border-width solid $button-default-border-color;
+
+    &.nut-button-disabled {
+      color: $color-text-help;
+      background: transparent;
+    }
+
+    &.nut-button-none {
+      background: transparent;
+
+      &.nut-button-disabled {
+        color: $color-text-help;
+      }
+    }
+
+    &.nut-button-outline,
+    &.nut-button-dashed {
+      background: transparent;
+
+      &.nut-button-disabled {
+        color: $color-text-help;
+        border-color: $button-default-disabled;
+      }
+    }
   }
 
-  &.nut-button--none {
-    background: transparent;
-    border-color: transparent;
+  &-normal {
+    padding: $button-normal-padding;
+  }
+
+  &-large {
+    width: $button-large-width;
+    height: $button-large-height;
+    padding: $button-large-padding;
+    font-size: $button-large-font-size;
+  }
+
+  &-small {
+    height: $button-small-height;
+    padding: $button-small-padding;
+    font-size: $button-small-font-size;
   }
 
-  &--primary {
+  &-mini {
+    height: $button-mini-height;
+    padding: $button-mini-padding;
+    font-size: $button-mini-font-size;
+  }
+
+  &-primary {
     color: $button-primary-color;
     background: $button-primary-background-color;
     background-origin: border-box;
-    border: $button-border-width solid transparent;
 
-    &.nut-button--outline {
-      color: $button-primary-border-color;
-      border-color: $button-primary-border-color;
-      background: transparent;
+    &.nut-button-disabled {
+      background: $button-primary-disabled;
+      border-color: $button-primary-disabled;
     }
 
-    &.nut-button--none {
+    &.nut-button-none {
+      background: transparent;
       color: $button-primary-border-color;
-    }
-  }
 
-  &--info {
-    color: $button-info-color;
-    background: $button-info-background-color;
-    background-origin: border-box;
-    border: $button-border-width solid transparent;
+      &.nut-button-disabled {
+        color: $button-primary-disabled;
+      }
+    }
 
-    &.nut-button--outline {
-      color: $button-info-border-color;
-      border-color: $button-info-border-color;
+    &.nut-button-outline {
       background: transparent;
+      color: $button-primary-border-color;
+      border: $button-border-width solid $button-primary-border-color;
+
+      &.nut-button-disabled {
+        color: $button-primary-disabled;
+        border-color: $button-primary-disabled;
+      }
     }
 
-    &.nut-button--none {
-      color: $button-info-border-color;
+    &.nut-button-dashed {
+      background: transparent;
+      color: $button-primary-border-color;
+      border: $button-border-width dashed $button-primary-border-color;
+
+      &.nut-button-disabled {
+        color: $button-primary-disabled;
+        border-color: $button-primary-disabled;
+      }
     }
   }
 
-  &--success {
+  &-success {
     color: $button-success-color;
     background: $button-success-background-color;
     background-origin: border-box;
-    border: $button-border-width solid transparent;
 
-    &.nut-button--outline {
+    &.nut-button-disabled {
+      background: $button-success-disabled;
+      border-color: $button-success-disabled;
+    }
+
+    &.nut-button-outline,
+    &.nut-button-dashed {
       color: $button-success-border-color;
       border-color: $button-success-border-color;
       background: transparent;
+
+      &.nut-button-disabled {
+        color: $button-primary-disabled;
+        border-color: $button-primary-disabled;
+      }
     }
 
-    &.nut-button--none {
+    &.nut-button-none {
       color: $button-success-border-color;
     }
   }
 
-  &--danger {
+  &-danger {
     color: $button-danger-color;
     background: $button-danger-background-color;
     background-origin: border-box;
-    border: $button-border-width solid transparent;
 
-    &.nut-button--outline {
+    &.nut-button-disabled {
+      background: $button-danger-disabled;
+      border-color: $button-danger-disabled;
+    }
+
+    &.nut-button-outline,
+    &.nut-button-dashed {
       color: $button-danger-border-color;
       border-color: $button-danger-border-color;
       background: transparent;
+
+      &.nut-button-disabled {
+        color: $button-danger-disabled;
+        border-color: $button-danger-disabled;
+      }
     }
 
-    &.nut-button--none {
+    &.nut-button-none {
       color: $button-danger-border-color;
     }
   }
 
-  &--warning {
+  &-warning {
     color: $button-warning-color;
     background: $button-warning-background-color;
     background-origin: border-box;
-    border: $button-border-width solid transparent;
 
-    &.nut-button--outline {
+    &.nut-button-disabled {
+      background: $button-warning-disabled;
+      border-color: $button-warning-disabled;
+    }
+
+    &.nut-button-outline,
+    &.nut-button-dashed {
       color: $button-warning-border-color;
       border-color: $button-warning-border-color;
       background: transparent;
+
+      &.nut-button-disabled {
+        color: $button-warning-disabled;
+        border-color: $button-warning-disabled;
+      }
     }
 
-    &.nut-button--none {
+    &.nut-button-none {
       color: $button-warning-border-color;
     }
   }
 
-  &--large {
+  &-block {
+    display: block;
     width: 100%;
-    height: $button-large-height;
-    line-height: $button-large-line-height;
-
-    .text {
-      margin-left: $button-text-icon-large-margin-left;
-    }
   }
 
-  &--normal {
-    padding: $button-default-padding;
-    font-size: $button-default-font-size;
-  }
-
-  &--small {
-    height: $button-small-height;
-    line-height: $button-small-line-height;
-    padding: $button-small-padding;
-    font-size: $button-small-font-size;
+  &-solid {
+    color: $button-primary-color;
+    background: $button-primary-background-color;
+    background-origin: border-box;
+    border: none;
 
-    .text {
-      margin-left: $button-text-icon-small-margin-left;
+    &.nut-button-disabled {
+      color: #ffffff;
+      background: $button-default-disabled;
     }
   }
 
-  &--mini {
-    height: $button-mini-height;
-    line-height: $button-mini-line-height;
-    padding: $button-mini-padding;
-    font-size: $button-mini-font-size;
-
-    .text {
-      margin-left: $button-text-icon-mini-margin-left;
-    }
+  &.nut-button-outline,
+  &.nut-button-dashed {
+    background: transparent;
   }
 
-  &--block {
-    display: block;
-    width: 100%;
+  &.nut-button-none {
+    background: transparent;
+    border-color: transparent;
+    background: transparent;
   }
 
-  &--disabled {
+  &-disabled {
     cursor: not-allowed;
-    opacity: $button-disabled-opacity;
+    font-weight: 400;
+    color: #ffffff;
+    background: $button-default-disabled;
+    border-color: $button-default-disabled;
   }
 
-  &--loading {
+  &-loading {
     cursor: default;
     opacity: 0.9;
   }
 
-  &--round {
+  &-round {
     border-radius: $button-border-radius;
   }
 
-  &--square {
-    border-radius: 0;
+  &-square {
+    border-radius: $button-square-border-radius;
   }
 }

package/dist/packages/calendar/calendar.scss

@@ -5,8 +5,8 @@
   flex-direction: column;
   flex: 1;
   font-size: $calendar-base-font-size;
-  background-color: $white;
-  color: $gray1;
+  background-color: $color-background-overlay;
+  color: $color-title;
   overflow: hidden;
   height: 100%;
 
@@ -38,9 +38,10 @@
   }
 
   &-title {
+    color: $color-title;
     font-size: $calendar-title-font-size;
     font-weight: $calendar-title-font-weight;
-    line-height: 44px;
+    line-height: 50px;
   }
 
   &-sub-title {
@@ -65,7 +66,7 @@
   &-week-item {
     &:first-of-type,
     &:last-of-type {
-      color: $calendar-day67-color;
+      color: $color-primary;
     }
   }
 
@@ -92,8 +93,8 @@
       top: -50px;
       left: 0;
       right: 0;
-      font-size: $font-size-1;
-      color: $text-color;
+      font-size: $font-size-small;
+      color: $color-text;
     }
   }
 
@@ -127,7 +128,7 @@
 
     &:nth-child(7n + 0),
     &:nth-child(7n + 1) {
-      color: $calendar-day67-color;
+      color: $color-primary;
     }
 
     &-info-curr {
@@ -159,8 +160,8 @@
     }
 
     &-active {
-      background-color: $calendar-active-background-color;
-      color: $primary-text-color !important;
+      background-color: $color-primary;
+      color: $color-primary-text !important;
       border-radius: $calendar-day-active-border-radius;
 
       &.active-start {
@@ -176,12 +177,12 @@
       }
 
       .nut-calendar-day-info {
-        color: $primary-text-color;
+        color: $color-primary-text;
       }
     }
 
     &-disabled {
-      color: $calendar-disable-color !important;
+      color: $color-text-disabled !important;
 
       .nut-calendar-day-info-curr {
         display: none;
@@ -189,8 +190,8 @@
     }
 
     &-choose-disabled {
-      background-color: $calendar-choose-disable-background-color;
-      color: $calendar-disable-color !important;
+      background-color: $calendar-choose-background-color-disabled;
+      color: $color-text-disabled !important;
 
       .nut-calendar-day-info-curr {
         display: none;
@@ -199,7 +200,7 @@
 
     &-choose {
       background-color: $calendar-choose-background-color;
-      color: $calendar-choose-color;
+      color: $color-primary;
     }
   }
 
@@ -215,13 +216,13 @@
       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;
     }
   }
 }
 
-.nut-calendar-popup .nut-popup__close-icon {
+.nut-calendar-popup .nut-popup-title-right {
   top: 7px !important;
 }

package/dist/packages/calendarcard/calendarcard.scss

@@ -1,9 +1,9 @@
 .nut-calendarcard {
-  background: $white;
+  background: $color-background-overlay;
   border-radius: 12px;
   overflow: hidden;
   font-size: $calendar-base-font-size;
-  color: $gray1;
+  color: $color-title;
 
   &-header {
     display: flex;
@@ -63,8 +63,8 @@
     &.active,
     &.start,
     &.end {
-      background-color: $calendar-active-background-color;
-      color: $primary-text-color !important;
+      background-color: $color-primary;
+      color: $color-primary-text !important;
       border-radius: $calendar-day-active-border-radius;
     }
 
@@ -82,22 +82,22 @@
 
     &.mid {
       background-color: $calendar-choose-background-color;
-      color: $calendar-choose-color;
+      color: $color-primary;
     }
 
     &.weekend {
-      color: $calendar-choose-color;
+      color: $color-primary;
     }
 
     .nut-calendar-day-info {
-      color: $primary-text-color;
+      color: $color-primary-text;
     }
 
     // 上个月、下个月
     &.prev,
     &.next,
     &.disabled {
-      color: $calendar-disable-color;
+      color: $color-text-disabled;
       cursor: not-allowed;
     }
   }

package/dist/packages/card/card.scss

@@ -3,72 +3,86 @@
 .nut-card {
   width: 100%;
   display: flex;
-  .nut-card__left {
+  background-color: $color-background-overlay;
+
+  .nut-card-left {
     width: 120px;
     height: 120px;
     flex-shrink: 0;
-    background-color: $card-left-background-color;
     border-radius: $card-left-border-radius;
+
     > img {
       display: block;
       width: 100%;
       height: 100%;
     }
   }
-  .nut-card__right {
+
+  .nut-card-right {
     flex: 1;
     padding: 0 10px 8px;
-    .nut-card__right-title {
+
+    .nut-card-right-title {
       @include moreline-ellipsis();
       line-height: 1.5;
       font-size: 14px;
+      color: $color-title;
     }
+
     .nut-cardright-price {
       display: flex;
       align-items: center;
       height: 18px;
       line-height: 18px;
       margin-top: 9px;
+
       .nut-price {
-        .nut-price__big {
+        .nut-price-big {
           font-size: 18px;
         }
-        .nut-price__symbol,
-        .nut-price__point,
-        .nut-price__small {
+
+        .nut-price-symbol,
+        .nut-price-point,
+        .nut-price-small {
           font-size: 12px;
         }
       }
+
       .nut-cardright-price-origin {
         &.nut-price {
           margin-left: 2px;
           color: #d2a448;
-          .nut-price__big,
-          .nut-price__symbol,
-          .nut-price__point,
-          .nut-price__small {
+
+          .nut-price-big,
+          .nut-price-symbol,
+          .nut-price-point,
+          .nut-price-small {
             font-size: 12px;
           }
         }
       }
     }
+
     .nut-cardright-other {
       display: flex;
       align-items: center;
       padding: 5px 0 2px;
+
       .nut-tag {
         padding: 0 2px;
         margin-right: 5px;
-        font-size: $font-size-0;
+        font-size: $font-size-xs;
       }
     }
+
     .nut-cardright-shop {
       display: flex;
       justify-content: space-between;
       align-items: center;
+
       .nut-cardright-shop-name {
         line-height: 1.5;
-        color: #999;
+        color: $color-text;
         font-size: 12px;
         padding-top: 4px;
       }

package/dist/packages/cascader/cascader.scss

@@ -2,14 +2,13 @@
 .nut-cascader {
   width: 100%;
   font-size: $cascader-font-size;
-  line-height: $cascader-line-height;
 
-  .nut-tabs__titles {
+  .nut-tabs-titles {
     padding: $cascader-tabs-item-padding;
-    background: $gray6;
+    background: $color-background-overlay;
   }
 
-  .nut-tabs__titles-item {
+  .nut-tabs-titles-item {
     flex: initial;
     min-width: auto;
     width: auto;
@@ -19,6 +18,7 @@
 
   .nut-tabpane {
     padding: 0;
+    background: $color-background-overlay;
   }
 
   &-pane {
@@ -52,14 +52,14 @@
         color: $cascader-item-active-color;
       }
 
-      .nut-cascader-item__icon-check {
+      .nut-cascader-item-icon-check {
         visibility: visible;
         color: inherit;
       }
     }
   }
 
-  &-item__title {
+  &-item-title {
     flex: 1;
   }