@nutui/nutui-react 2.0.0-beta.0 → 2.0.0-beta.2

package/dist/packages/badge/badge.scss

@@ -1,39 +1,42 @@
 .nut-badge {
   position: relative;
   display: inline-block;
-  width: 40px;
-  height: 40px;
-  margin-right: 40px;
-  .slot-icons {
+
+  &__icon {
+    display: flex;
     position: absolute;
     background: $badge-background-color;
-    border-radius: 7px;
     top: -20%;
     right: -20%;
-    padding: 0 5px;
+    padding: $badge-icon-padding;
     text-align: center;
-    border-radius: 14px;
-    z-index: 1;
+    border: $badge-border;
+    border-radius: $badge-border-radius;
+    z-index: $badge-z-index;
   }
-  .sup {
+
+  &__sup {
     position: absolute;
     background: $badge-background-color;
-    border-radius: 7px;
-    padding: 0 5px;
-    text-align: center;
-    border-radius: 14px;
+    color: $badge-color;
+    padding: $badge-padding;
     font-size: $badge-font-size;
     font-weight: normal;
-    color: $badge-default-background-color;
+    text-align: center;
     line-height: 16px;
+    border: $badge-border;
+    border-radius: $badge-border-radius;
   }
-  .nut-badge__content {
-    transform: translateY(-50%) translateX(100%);
+
+  &__content {
+    transform: $badge-content-transform;
   }
-  .is-dot {
-    width: 7px;
-    height: 7px;
-    border-radius: 7px;
+
+  &__dot {
+    width: $badge-dot-width;
+    height: $badge-dot-width;
+    border: $badge-border;
+    border-radius: $badge-dot-width;
     padding: 0;
   }
 }

package/dist/packages/barrage/barrage.scss

@@ -6,10 +6,10 @@
   height: 100%;
   overflow: hidden;
   box-sizing: border-box;
-  background-color: #f7f8fa;
+  background-color: $background-color;
+  color: $title-color;
   .barrage-item {
-    width: 100px;
-    // max-width: 150px;
+    width: 120px;
     display: block;
     position: absolute;
     right: 0;
@@ -19,7 +19,8 @@
     text-align: center;
     white-space: pre;
     transform: translateX(100%);
-    background: linear-gradient(to right, rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0));
+    background: linear-gradient(to right, $gray3, rgba(0, 0, 0, 0));
+    box-sizing: border-box;
     &.move {
       will-change: transform;
       animation-name: moving;
@@ -32,9 +33,7 @@
       transform: translateX(100%);
     }
     to {
-      transform: translateX(-250%);
-      // transform: translateX(-180%);
-      // transform: translateX(var(--move-distance));
+      transform: translateX(var(--move-distance));
     }
   }
   @-webkit-keyframes moving {
@@ -42,7 +41,7 @@
       -webkit-transform: translateX(100%);
     }
     to {
-      transform: translateX(-250%);
+      transform: translateX(var(--move-distance));
     }
   }
 }

package/dist/packages/button/button.scss

@@ -14,9 +14,15 @@
   -webkit-appearance: none;
   user-select: none;
   touch-action: manipulation;
-  .text {
-    margin-left: 5px;
+
+  color: $button-default-color;
+  background: $button-default-bg-color;
+  border: $button-border-width solid $button-default-border-color;
+
+  .nut-button-text {
+    margin-left: $button-text-icon-margin-left;
   }
+
   &::before {
     position: absolute;
     top: 50%;
@@ -31,15 +37,22 @@
     opacity: 0;
     content: ' ';
   }
+
+  &::after {
+    border: none;
+  }
+
   &:active::before {
     opacity: 0.1;
   }
+
   &__warp {
     height: 100%;
     width: 100%;
     display: flex;
     align-items: center;
     justify-content: center;
+    background: initial;
   }
 
   &--loading,
@@ -48,68 +61,112 @@
       display: none;
     }
   }
-  &--default {
-    color: $button-default-color;
-    background: $button-default-bg-color;
-    border: $button-border-width solid $button-default-border-color;
+
+  &--solid {
+    color: $button-primary-color;
+    background: $button-primary-background-color;
+    border: $button-border-width solid transparent;
+  }
+
+  &.nut-button--outline {
+    color: $button-primary-border-color;
+    border-color: $button-primary-border-color;
+    background: transparent;
+  }
+
+  &.nut-button--none {
+    color: $button-primary-border-color;
+    background: transparent;
+    border-color: transparent;
   }
 
   &--primary {
     color: $button-primary-color;
     background: $button-primary-background-color;
     border: $button-border-width solid transparent;
+
+    &.nut-button--outline {
+      color: $button-primary-border-color;
+      border-color: $button-primary-border-color;
+      background: transparent;
+    }
+
+    &.nut-button--none {
+      color: $button-primary-border-color;
+      background: transparent;
+      border-color: transparent;
+    }
   }
 
   &--info {
     color: $button-info-color;
     background: $button-info-background-color;
     border: $button-border-width solid transparent;
+
+    &.nut-button--outline {
+      color: $button-info-border-color;
+      border-color: $button-info-border-color;
+      background: transparent;
+    }
+
+    &.nut-button--none {
+      color: $button-info-border-color;
+      background: transparent;
+      border-color: transparent;
+    }
   }
 
   &--success {
     color: $button-success-color;
     background: $button-success-background-color;
     border: $button-border-width solid transparent;
+
+    &.nut-button--outline {
+      color: $button-success-border-color;
+      border-color: $button-success-border-color;
+      background: transparent;
+    }
+
+    &.nut-button--none {
+      color: $button-success-border-color;
+      background: transparent;
+      border-color: transparent;
+    }
   }
 
   &--danger {
     color: $button-danger-color;
     background: $button-danger-background-color;
     border: $button-border-width solid transparent;
+
+    &.nut-button--outline {
+      color: $button-danger-border-color;
+      border-color: $button-danger-border-color;
+      background: transparent;
+    }
+
+    &.nut-button--none {
+      color: $button-danger-border-color;
+      background: transparent;
+      border-color: transparent;
+    }
   }
 
   &--warning {
     color: $button-warning-color;
     background: $button-warning-background-color;
     border: $button-border-width solid transparent;
-  }
-
-  &--plain {
-    background: $button-plain-background-color;
-
-    &.nut-button--primary {
-      color: $button-primary-border-color;
-      border-color: $button-primary-border-color;
-    }
-
-    &.nut-button--info {
-      color: $button-info-border-color;
-      border-color: $button-info-border-color;
-    }
 
-    &.nut-button--success {
-      color: $button-success-border-color;
-      border-color: $button-success-border-color;
-    }
-
-    &.nut-button--danger {
-      color: $button-danger-border-color;
-      border-color: $button-danger-border-color;
+    &.nut-button--outline {
+      color: $button-warning-border-color;
+      border-color: $button-warning-border-color;
+      background: transparent;
     }
 
-    &.nut-button--warning {
+    &.nut-button--none {
       color: $button-warning-border-color;
-      border-color: $button-warning-border-color;
+      background: transparent;
+      border-color: transparent;
     }
   }
 
@@ -117,18 +174,37 @@
     width: 100%;
     height: $button-large-height;
     line-height: $button-large-line-height;
+
+    .text {
+      margin-left: $button-text-icon-large-margin-left;
+    }
   }
 
   &--normal {
-    padding: 0 18px;
+    padding: $button-default-padding;
     font-size: $button-default-font-size;
   }
 
   &--small {
     height: $button-small-height;
     line-height: $button-small-line-height;
-    padding: 0 $padding-xs;
-    font-size: $font-size-1;
+    padding: $button-small-padding;
+    font-size: $button-small-font-size;
+
+    .text {
+      margin-left: $button-text-icon-small-margin-left;
+    }
+  }
+
+  &--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;
+    }
   }
 
   &--block {

package/dist/packages/calendar/calendar.scss

@@ -1,22 +1,19 @@
+
 .nut-calendar {
   position: relative;
   display: flex;
+  flex-direction: column;
   flex: 1;
-  height: 728px;
-  padding-top: 132px;
-  padding-bottom: 78px;
-  color: $calendar-base-color;
-  font-size: $calendar-base-font;
+  font-size: $calendar-base-font-size;
   background-color: $white;
+  color: $gray1;
   overflow: hidden;
+  height: 100%;
 
-  &.nut-calendar-tile {
-    padding-top: 46px;
-    padding-bottom: 0;
-
+  &.nut-calendar-title {
     .nut-calendar-header {
       .calendar-title {
-        font-size: $calendar-base-font;
+        font-size: $calendar-base-font-size;
       }
     }
   }
@@ -24,175 +21,203 @@
   .nut-calendar-taro {
     height: 60vh;
   }
-  .nut-calendar-content {
-    overflow-y: auto;
+
+  .popup-box {
+    height: 100%;
   }
+
   ::-webkit-scrollbar {
     display: none;
   }
 
   // 头部导航
-  .nut-calendar-header {
-    position: absolute;
-    top: -1px;
-    left: 0;
-    right: 0;
+  &-header {
     display: flex;
     flex-direction: column;
     text-align: center;
-    padding-top: 1px;
-    background-color: $white;
-    z-index: 1;
+  }
 
-    .calendar-title {
-      padding-top: 22px;
-      font-size: $calendar-title-font;
-      line-height: 25px;
-      border-radius: 12px 12px 0 0;
-    }
+  &-title {
+    font-size: $calendar-title-font-size;
+    font-weight: $calendar-title-font-weight;
+    line-height: 44px;
+  }
 
-    .calendar-curr-month {
-      padding: 10px 0 7px;
-      line-height: 22px;
-    }
+  &-sub-title {
+    padding: 7px 0;
+    line-height: 22px;
+    font-size: $calendar-sub-title-font-size;
+  }
 
-    .calendar-weeks {
-      display: flex;
-      align-items: center;
-      justify-content: space-around;
-      height: 46px;
-      border-radius: 0px 0px 12px 12px;
-      box-shadow: 0px 4px 10px 0px rgba($color: #000000, $alpha: 0.06);
-
-      .calendar-week-item {
-        &:first-of-type,
-        &:last-of-type {
-          color: $calendar-primary-color;
-        }
-      }
+  &-header-buttons {
+    height: $calendar-header-height;
+  }
+
+  &-weeks {
+    display: flex;
+    align-items: center;
+    justify-content: space-around;
+    height: 36px;
+    border-radius: 0px 0px 12px 12px;
+    box-shadow: 0px 4px 10px 0px rgba($color: #000000, $alpha: 0.06);
+  }
+
+  &-week-item {
+    &:first-of-type,
+    &:last-of-type {
+      color: $calendar-day67-color;
     }
   }
 
-  // 月份
-  .nut-calendar-content {
+  // 内容区域
+  &-content {
     flex: 1;
+    width: 100%;
+    display: block;
+    overflow-y: auto;
+  }
+
+  &-pannel {
+    position: relative;
+    width: 100%;
+    height: auto;
+    display: block;
+    box-sizing: border-box;
 
-    .calendar-months-panel {
-      position: relative;
+    // .viewArea {
+    //   display: block;
+    // }
+
+    .calendar-loading-tip {
+      height: 50px;
+      line-height: 50px;
+      text-align: center;
+      position: absolute;
+      top: -50px;
+      left: 0;
+      right: 0;
+      font-size: $font-size-1;
+      color: $text-color;
+    }
+  }
+
+  &-month {
+    display: flex;
+    flex-direction: column;
+    text-align: center;
+  }
+
+  &-month-title {
+    height: 23px;
+    line-height: 23px;
+    margin: 8px 0;
+  }
+
+  &-days {
+    overflow: hidden;
+  }
+
+  &-day {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+    position: relative;
+    float: left;
+    width: $calendar-day-width;
+    height: $calendar-day-height;
+    font-weight: $calendar-day-font-weight;
+    margin-bottom: 4px;
+
+    &:nth-child(7n + 0),
+    &:nth-child(7n + 1) {
+      color: $calendar-day67-color;
+    }
+
+    &-info-curr {
+      position: absolute;
+      bottom: 5px;
       width: 100%;
-      height: auto;
-      display: block;
+      font-size: 12px;
+      line-height: 14px;
+    }
 
-      .calendar-month {
-        display: flex;
-        flex-direction: column;
-        text-align: center;
-      }
+    &-info {
+      position: absolute;
+      bottom: 5px;
+      width: 100%;
+      font-size: 12px;
+      line-height: 14px;
+    }
+
+    &-info-top {
+      position: absolute;
+      width: 100%;
+      top: 5px;
+    }
+
+    &-info-bottom {
+      position: absolute;
+      width: 100%;
+      bottom: 5px;
+    }
 
-      div:nth-of-type(2) {
-        .calendar-month-title {
-          padding-top: 0;
-        }
+    &-active {
+      background-color: $calendar-active-background-color;
+      color: $primary-text-color !important;
+      border-radius: $calendar-day-active-border-radius;
+
+      &.active-start {
+        border-radius: 0px;
+        border-top-left-radius: $calendar-day-active-border-radius;
+        border-bottom-left-radius: $calendar-day-active-border-radius;
       }
 
-      .calendar-loading-tip {
-        height: 50px;
-        line-height: 50px;
-        text-align: center;
-        position: absolute;
-        top: -50px;
-        left: 0;
-        right: 0;
-        font-size: $calendar-text-font;
-        color: $text-color;
+      &.active-end {
+        border-radius: 0px;
+        border-top-right-radius: $calendar-day-active-border-radius;
+        border-bottom-right-radius: $calendar-day-active-border-radius;
       }
 
-      .calendar-month-title {
-        height: 23px;
-        line-height: 23px;
-        margin: 8px 0;
+      .nut-calendar-day-info {
+        color: $primary-text-color;
       }
+    }
 
-      .calendar-month-con {
-        overflow: hidden;
-
-        .calendar-month-item {
-          .calendar-month-day:nth-child(7n + 0),
-          .calendar-month-day:nth-child(7n + 1) {
-            color: $calendar-primary-color;
-          }
-        }
-
-        .calendar-month-day {
-          float: left;
-          width: 14.28%;
-          height: 64px;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          flex-direction: column;
-          position: relative;
-
-          .curr-tips,
-          .calendar-day-tip {
-            position: absolute;
-            top: 10px;
-            width: 100%;
-            font-size: 11px;
-            line-height: 12px;
-            color: $calendar-primary-color;
-          }
-
-          &-active {
-            background-color: $calendar-primary-color;
-            color: $white !important;
-
-            .curr-tips {
-              visibility: hidden;
-            }
-
-            .calendar-day-tip {
-              color: $white;
-            }
-          }
-
-          &-disabled {
-            color: $calendar-disable-color !important;
-          }
-
-          &-choose {
-            background-color: $calendar-choose-color;
-          }
-
-          .calendar-day {
-            padding: 4px 0;
-            font-size: $calendar-day-font;
-          }
-        }
+    &-disabled {
+      color: $calendar-disable-color !important;
+
+      .nut-calendar-day-info-curr {
+        display: none;
       }
     }
+
+    &-choose {
+      background-color: $calendar-choose-background-color;
+      color: $calendar-choose-color;
+    }
   }
 
   // 底部导航
-  .nut-calendar-footer {
-    position: absolute;
-    left: 0;
-    right: 0;
-    bottom: -1px;
+  &-footer {
     display: flex;
-    height: 78px;
+    height: 62px;
     width: 100%;
     background-color: $white;
 
     .calendar-confirm-btn {
       height: 44px;
       width: 100%;
-      margin: 14px 18px;
+      margin: 10px 18px;
       border-radius: 22px;
       background: $button-primary-background-color;
-      color: $white;
+      color: $primary-text-color;
       text-align: center;
       line-height: 44px;
     }
   }
 }
+
+.nut-popup__close-icon {
+  top: 7px !important;
+}