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

package/dist/packages/button/button.scss

@@ -1,32 +1,26 @@
 .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;
-  height: $button-default-height;
+  line-height: $button-default-line-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-background-color;
+  background: $button-default-bg-color;
+  border: $button-border-width solid $button-default-border-color;
 
-  &-text {
-    margin-left: $button-text-icon-margin;
-
-    &.right {
-      margin-right: $button-text-icon-margin;
-    }
+  .nut-button-text {
+    margin-left: $button-text-icon-margin-left;
   }
 
   &::before {
@@ -35,9 +29,9 @@
     left: 50%;
     width: 100%;
     height: 100%;
-    background-color: $color-mask;
+    background-color: $black;
     border: inherit;
-    border-color: $color-mask;
+    border-color: $black;
     border-radius: inherit;
     transform: translate(-50%, -50%);
     opacity: 0;
@@ -52,8 +46,9 @@
     opacity: 0.1;
   }
 
-  &-warp {
+  &__warp {
     height: 100%;
+    width: 100%;
     display: flex;
     align-items: center;
     justify-content: center;
@@ -67,101 +62,55 @@
     }
   }
 
-  &.nut-button--icononly {
-    width: $button-default-height;
-    padding: 0;
-  }
-
-  &--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;
-      }
-    }
-  }
-
-  &--normal {
-    padding: $button-normal-padding;
-  }
-
-  &--large {
-    width: $button-large-width;
-    height: $button-large-height;
-    padding: $button-large-padding;
-    font-size: $button-large-font-size;
+  &--solid {
+    color: $button-primary-color;
+    background: $button-primary-background-color;
+    background-origin: border-box;
+    border: $button-border-width solid transparent;
   }
 
-  &--small {
-    height: $button-small-height;
-    padding: $button-small-padding;
-    font-size: $button-small-font-size;
+  &.nut-button--outline {
+    color: $button-primary-border-color;
+    border-color: $button-primary-border-color;
+    background: transparent;
   }
 
-  &--mini {
-    height: $button-mini-height;
-    padding: $button-mini-padding;
-    font-size: $button-mini-font-size;
+  &.nut-button--none {
+    background: transparent;
+    border-color: transparent;
   }
 
   &--primary {
     color: $button-primary-color;
     background: $button-primary-background-color;
     background-origin: border-box;
+    border: $button-border-width solid transparent;
 
-    &.nut-button--disabled {
-      background: $button-primary-disabled;
-      border-color: $button-primary-disabled;
+    &.nut-button--outline {
+      color: $button-primary-border-color;
+      border-color: $button-primary-border-color;
+      background: transparent;
     }
 
     &.nut-button--none {
-      background: transparent;
       color: $button-primary-border-color;
-
-      &.nut-button--disabled {
-        color: $button-primary-disabled;
-      }
     }
+  }
+
+  &--info {
+    color: $button-info-color;
+    background: $button-info-background-color;
+    background-origin: border-box;
+    border: $button-border-width solid transparent;
 
     &.nut-button--outline {
+      color: $button-info-border-color;
+      border-color: $button-info-border-color;
       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--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;
-      }
+    &.nut-button--none {
+      color: $button-info-border-color;
     }
   }
 
@@ -169,22 +118,12 @@
     color: $button-success-color;
     background: $button-success-background-color;
     background-origin: border-box;
+    border: $button-border-width solid transparent;
 
-    &.nut-button--disabled {
-      background: $button-success-disabled;
-      border-color: $button-success-disabled;
-    }
-
-    &.nut-button--outline,
-    &.nut-button--dashed {
+    &.nut-button--outline {
       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 {
@@ -196,22 +135,12 @@
     color: $button-danger-color;
     background: $button-danger-background-color;
     background-origin: border-box;
+    border: $button-border-width solid transparent;
 
-    &.nut-button--disabled {
-      background: $button-danger-disabled;
-      border-color: $button-danger-disabled;
-    }
-
-    &.nut-button--outline,
-    &.nut-button--dashed {
+    &.nut-button--outline {
       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 {
@@ -223,22 +152,12 @@
     color: $button-warning-color;
     background: $button-warning-background-color;
     background-origin: border-box;
+    border: $button-border-width solid transparent;
 
-    &.nut-button--disabled {
-      background: $button-warning-disabled;
-      border-color: $button-warning-disabled;
-    }
-
-    &.nut-button--outline,
-    &.nut-button--dashed {
+    &.nut-button--outline {
       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 {
@@ -246,40 +165,51 @@
     }
   }
 
-  &--block {
-    display: block;
+  &--large {
     width: 100%;
+    height: $button-large-height;
+    line-height: $button-large-line-height;
+
+    .text {
+      margin-left: $button-text-icon-large-margin-left;
+    }
   }
 
-  &--solid {
-    color: $button-primary-color;
-    background: $button-primary-background-color;
-    background-origin: border-box;
-    border: none;
+  &--normal {
+    padding: $button-default-padding;
+    font-size: $button-default-font-size;
+  }
 
-    &.nut-button--disabled {
-      color: #ffffff;
-      background: $button-default-disabled;
+  &--small {
+    height: $button-small-height;
+    line-height: $button-small-line-height;
+    padding: $button-small-padding;
+    font-size: $button-small-font-size;
+
+    .text {
+      margin-left: $button-text-icon-small-margin-left;
     }
   }
 
-  &.nut-button--outline,
-  &.nut-button--dashed {
-    background: transparent;
+  &--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--none {
-    background: transparent;
-    border-color: transparent;
-    background: transparent;
+  &--block {
+    display: block;
+    width: 100%;
   }
 
   &--disabled {
     cursor: not-allowed;
-    font-weight: 400;
-    color: #ffffff;
-    background: $button-default-disabled;
-    border-color: $button-default-disabled;
+    opacity: $button-disabled-opacity;
   }
 
   &--loading {
@@ -292,6 +222,6 @@
   }
 
   &--square {
-    border-radius: $button-square-border-radius;
+    border-radius: 0;
   }
 }

package/dist/packages/calendar/calendar.scss

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

package/dist/packages/calendarcard/calendarcard.scss

@@ -0,0 +1,104 @@
+.nut-calendarcard {
+  background: $white;
+  border-radius: 12px;
+  overflow: hidden;
+  font-size: $calendar-base-font-size;
+  color: $gray1;
+
+  &-header {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+    font-weight: normal;
+
+    &-left,
+    &-right {
+      display: flex;
+      flex-direction: row;
+      cursor: pointer;
+      margin: 16px;
+      line-height: 1;
+
+      .left {
+        margin-left: 8px;
+      }
+      .right {
+        margin-right: 8px;
+      }
+    }
+  }
+
+  &-days {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    align-items: center;
+  }
+
+  &-day {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+    position: relative;
+    width: $calendar-day-width;
+    height: 48px;
+    cursor: pointer;
+    margin-bottom: 4px;
+    text-align: center;
+
+    &.header {
+      cursor: auto;
+    }
+
+    &-top,
+    &-bottom {
+      width: 100%;
+      height: 12px;
+      font-size: 12px;
+      line-height: 12px;
+    }
+
+    &.active,
+    &.start,
+    &.end {
+      background-color: $calendar-active-background-color;
+      color: $primary-text-color !important;
+      border-radius: $calendar-day-active-border-radius;
+    }
+
+    &.start {
+      border-radius: 0px;
+      border-top-left-radius: $calendar-day-active-border-radius;
+      border-bottom-left-radius: $calendar-day-active-border-radius;
+    }
+
+    &.end {
+      border-radius: 0px;
+      border-top-right-radius: $calendar-day-active-border-radius;
+      border-bottom-right-radius: $calendar-day-active-border-radius;
+    }
+
+    &.mid {
+      background-color: $calendar-choose-background-color;
+      color: $calendar-choose-color;
+    }
+
+    &.weekend {
+      color: $calendar-choose-color;
+    }
+
+    .nut-calendar-day-info {
+      color: $primary-text-color;
+    }
+
+    // 上个月、下个月
+    &.prev,
+    &.next,
+    &.disabled {
+      color: $calendar-disable-color;
+      cursor: not-allowed;
+    }
+  }
+}

package/dist/packages/card/card.scss

@@ -3,56 +3,46 @@
 .nut-card {
   width: 100%;
   display: flex;
-  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 {
     flex: 1;
     padding: 0 10px 8px;
-
     .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 {
           font-size: 18px;
         }
-
         .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,
@@ -62,27 +52,23 @@
         }
       }
     }
-
     .nut-cardright-other {
       display: flex;
       align-items: center;
       padding: 5px 0 2px;
-
       .nut-tag {
         padding: 0 2px;
         margin-right: 5px;
-        font-size: $font-size-xs;
+        font-size: $font-size-0;
       }
     }
-
     .nut-cardright-shop {
       display: flex;
       justify-content: space-between;
       align-items: center;
-
       .nut-cardright-shop-name {
         line-height: 1.5;
-        color: $color-text;
+        color: #999;
         font-size: 12px;
         padding-top: 4px;
       }

package/dist/packages/cascader/cascader.scss

@@ -2,10 +2,11 @@
 .nut-cascader {
   width: 100%;
   font-size: $cascader-font-size;
+  line-height: $cascader-line-height;
 
   .nut-tabs__titles {
     padding: $cascader-tabs-item-padding;
-    background: $color-background-overlay;
+    background: $gray6;
   }
 
   .nut-tabs__titles-item {
@@ -18,7 +19,6 @@
 
   .nut-tabpane {
     padding: 0;
-    background: $color-background-overlay;
   }
 
   &-pane {