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

package/dist/packages/switch/switch.scss

@@ -2,21 +2,44 @@
   cursor: pointer;
   display: flex;
   align-items: center;
-  background-color: $switch-open-background-color;
+  background-color: $switch-active-background-color;
   border-radius: $switch-border-radius;
   background-size: 100% 100%;
   background-repeat: no-repeat;
   background-position: center center;
   flex: 0 0 auto; // 防止被压缩
 
+  &.switch-close {
+    background-color: $switch-inactive-background-color;
+    .close-line {
+      background: $switch-close-line-background-color;
+      border-radius: 2px;
+    }
+  }
+
   .switch-button {
     display: flex;
     align-items: center;
     justify-content: center;
     border-radius: 50%;
-    background: $color-primary-text;
+    background: $primary-text-color;
     transition: transform 0.3s;
-    box-shadow: $switch-button-box-shadow;
+  }
+
+  &__label {
+    color: $primary-text-color;
+    font-size: $font-size-1;
+    &.open {
+      transform: translateX(-16px);
+    }
+
+    &.close {
+      transform: translateX(16px);
+    }
+  }
+
+  &-disabled {
+    opacity: 0.6;
   }
 
   &-base {
@@ -30,51 +53,17 @@
       transform: $switch-inside-close-transform;
     }
 
-    &.nut-switch-open {
+    &.switch-open {
       .switch-button {
         transform: $switch-inside-open-transform;
       }
-
-      &.nut-switch-disabled {
-        background-color: $switch-open-disabled-background-color;
-      }
     }
 
-    &.nut-switch-close {
+    &.switch-close {
       .close-line {
         width: 8px;
         height: 2px;
       }
-
-      &.nut-switch-disabled {
-        background-color: $switch-close-disabled-background-color;
-      }
-    }
-  }
-
-  &-close {
-    background-color: $switch-close-background-color;
-
-    .close-line {
-      background: $switch-close-line-background-color;
-      border-radius: 2px;
     }
   }
-
-  &-label {
-    color: $color-primary-text;
-    font-size: $font-size-small;
-
-    &.open {
-      transform: translateX(-16px);
-    }
-
-    &.close {
-      transform: translateX(16px);
-    }
-  }
-
-  // &-disabled {
-  //   opacity: 0.5;
-  // }
 }

package/dist/packages/tabbar/tabbar.scss

@@ -10,7 +10,7 @@
   justify-content: center;
   align-items: center;
   box-sizing: border-box;
-  background: $color-background-overlay;
+  background: $white;
 
   &__wrap {
     width: 100%;

package/dist/packages/tabbaritem/tabbaritem.scss

@@ -21,12 +21,6 @@
     align-items: center;
     position: relative;
 
-    .nut-icon {
-      width: 24px;
-      height: 24px;
-      font-size: 24px;
-    }
-
     &-nav {
       display: block;
       font-size: $tabbar-text-font-size;
@@ -37,7 +31,6 @@
       font-size: $tabbar-text-large-font-size;
       margin-top: 0;
       line-height: $tabbar-text-line-height;
-      font-weight: $tabbar-text-large-font-weight;
     }
   }
 }

package/dist/packages/table/table.scss

@@ -2,16 +2,16 @@
   display: flex;
   width: 100%;
   flex-direction: column;
-  font-size: $font-size-base;
-  color: $color-title;
+  font-size: $font-size-2;
+  color: $title-color;
 
   &__main {
     display: table;
     width: 100%;
     border-collapse: collapse;
     overflow-x: hidden;
-    color: $color-title;
-    background-color: $color-background-overlay;
+    color: $title-color;
+    background-color: $background-color3;
 
     &--striped {
       .nut-table__main__head {
@@ -84,8 +84,8 @@
   }
 
   &__summary {
-    color: $color-title;
-    background-color: $color-background-overlay;
+    color: $title-color;
+    background-color: $background-color3;
     display: flex;
     align-items: center;
     justify-content: center;

package/dist/packages/tabpane/tabpane.scss

@@ -2,8 +2,8 @@
   width: 100%;
   flex-shrink: 0;
   display: block;
-  background-color: $color-background-overlay;
-  color: $color-title;
+  background-color: $gray6;
+  color: $gray1;
   padding: 24px 20px;
   box-sizing: border-box;
   overflow: auto;

package/dist/packages/tabs/tabs.scss

@@ -7,11 +7,12 @@
 .nut-tabs__titles {
   display: flex;
   box-sizing: border-box;
-  height: $tabs-titles-height;
-  padding: 0 16px;
+  height: $tabs-horizontal-titles-height;
+  padding: 0 10px;
   user-select: none;
-  overflow: hidden;
   background: $tabs-titles-background-color;
+  border-radius: $tabs-titles-border-radius;
+  overflow: hidden;
 
   &::-webkit-scrollbar {
     display: none;
@@ -25,111 +26,100 @@
     display: flex;
     flex-shrink: 0;
   }
+}
 
-  &--left {
-    justify-content: flex-start;
-  }
-
-  &--right {
-    justify-content: flex-end;
-  }
-
-  &--scrollable {
-    overflow-x: auto;
-    overflow-y: hidden;
-  }
+.nut-tabs__titles--left {
+  justify-content: flex-start;
+}
 
-  &-item {
-    position: relative;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    flex: 1 0 auto;
-    padding: 0 10px;
-    margin: 0 $tabs-titles-gap;
-    min-width: $tabs-titles-item-min-width;
-    font-size: $tabs-titles-font-size;
-    color: $color-title;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-
-    &.taro {
-      height: 44px;
-      line-height: 44px;
-    }
+.nut-tabs__titles--right {
+  justify-content: flex-end;
+}
 
-    &--left,
-    &--right {
-      flex: none;
-    }
+.nut-tabs__titles--scrollable {
+  overflow-x: auto;
+  overflow-y: hidden;
+}
 
-    &__text {
-      text-align: center;
-    }
+.nut-tabs__titles-item {
+  position: relative;
+  min-width: $tabs-horizontal-titles-item-min-width;
+  display: flex;
+  flex: 1 0 auto;
+  padding: 0 10px;
+  align-items: center;
+  justify-content: center;
+  margin: 0 $nut-tabs-title-gap;
+  font-size: $tabs-titles-item-font-size;
+  color: $tabs-titles-item-color;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+
+  &.taro {
+    height: 46px;
+    line-height: 46px;
+  }
+}
 
-    &__smile,
-    &__line {
-      position: absolute;
-      transition: width 0.3s ease;
-      width: 0;
-      height: 0;
-      content: ' ';
-      bottom: $tabs-tab-line-bottom;
-      left: 50%;
-      transform: translate(-50%, 0);
-      border-radius: $tabs-tab-line-border-radius;
-      opacity: $tabs-tab-line-opacity;
-      overflow: hidden;
-    }
+.nut-tabs__titles-item--left,
+.nut-tabs__titles-item--right {
+  flex: none;
+}
 
-    &__smile {
-      bottom: -2%;
+.nut-tabs__titles-item__text {
+  text-align: center;
+}
 
-      .nut-icon {
-        position: absolute;
-        font-size: 12px;
-        width: 100%;
-        height: 100%;
-        color: $color-primary;
-      }
-    }
+.nut-tabs__titles-item__smile,
+.nut-tabs__titles-item__line {
+  position: absolute;
+  transition: width 0.3s ease;
+  width: 0;
+  height: 0;
+  content: ' ';
+  bottom: $tabs-horizontal-tab-line-bottom;
+  left: 50%;
+  transform: translate(-50%, 0);
+  border-radius: $tabs-horizontal-tab-line-border-radius;
+  opacity: $tabs-horizontal-tab-line-opacity;
+  overflow: hidden;
+}
 
-    &--active {
-      color: $tabs-titles-item-active-color;
-      font-weight: $tabs-titles-item-active-font-weight;
+.nut-tabs__titles-item__smile {
+  bottom: -2%;
 
-      .nut-tabs__titles-item__line {
-        overflow: unset;
-        content: ' ';
-        width: $tabs-tab-line-width;
-        height: $tabs-tab-line-height;
-        background: $tabs-tab-line-color;
-      }
-
-      .nut-tabs__titles-item__smile {
-        overflow: unset;
-        width: 40px;
-        height: 20px;
-      }
-    }
+  .nut-icon {
+    position: absolute;
+    font-size: 12px;
+    width: 100%;
+    height: 100%;
+    color: $tabs-tab-smile-color;
+  }
+}
 
-    &--disabled {
-      color: $color-text-disabled;
-    }
+.nut-tabs__titles-item--active {
+  color: $tabs-titles-item-active-color;
+  font-weight: $tabs-titles-item-active-font-weight;
 
-    &:first-child {
-      margin-left: 0;
-    }
+  .nut-tabs__titles-item__smile {
+    overflow: unset;
+    width: 40px;
+    height: 20px;
   }
 
-  &--simple {
-    .nut-tabs__titles-item--active {
-      color: $color-title;
-      font-size: $tabs-titles-item-active-font-size;
-    }
+  .nut-tabs__titles-item__line {
+    overflow: unset;
+    content: ' ';
+    width: $tabs-horizontal-titles-item-active-line-width;
+    height: $tabs-horizontal-titles-item-active-line-height;
+    background: $tabs-horizontal-tab-line-color;
   }
 }
 
+.nut-tabs__titles-item--disabled {
+  color: $disable-color;
+}
+
 .nut-tabs--horizontal {
   flex-direction: column;
 }
@@ -162,43 +152,39 @@
   .nut-tabs__titles-item {
     height: $tabs-vertical-titles-item-height;
     flex: none;
+  }
 
-    &__smile {
-      width: 0;
-      height: 0;
-      overflow: hidden;
-      transition: width 0.3s ease;
-    }
-
-    &__line {
-      width: 0;
-      height: 0;
-      transform: translate(0, -50%);
-      transition: height 0.3s ease;
-    }
+  .nut-tabs__titles-item__smile {
+    width: 0;
+    height: 0;
+    overflow: hidden;
+    transition: width 0.3s ease;
+  }
 
-    &--active {
-      background-color: $tabs-titles-item-active-background-color;
+  .nut-tabs__titles-item__line {
+    width: 0;
+    height: 0;
+    transform: translate(0, -50%);
+    transition: height 0.3s ease;
+  }
 
-      .nut-tabs__titles-item__line {
-        left: 10px;
-        width: $tabs-vertical-tab-line-width;
-        height: $tabs-vertical-tab-line-height;
-        background: $tabs-vertical-tab-line-color;
-      }
+  .nut-tabs__titles-item--active {
+    background-color: $tabs-horizontal-titles-item-active-background-color;
 
-      .nut-tabs__titles-item__smile {
-        right: -5px;
-        bottom: 2%;
-        left: auto;
-        width: 40px;
-        height: 20px;
-        transform: rotate(320deg);
-      }
+    .nut-tabs__titles-item__line {
+      left: 10px;
+      width: $tabs-vertical-titles-item-active-line-width;
+      height: $tabs-vertical-titles-item-active-line-height;
+      background: $tabs-vertical-tab-line-color;
     }
 
-    &:first-child {
-      margin: 0 $tabs-titles-gap;
+    .nut-tabs__titles-item__smile {
+      right: -5px;
+      bottom: 2%;
+      left: auto;
+      width: 40px;
+      height: 20px;
+      transform: rotate(320deg);
     }
   }
 
@@ -207,7 +193,7 @@
       flex-direction: row;
       overflow-x: auto;
       overflow-y: hidden;
-      height: $tabs-titles-height;
+      height: $tabs-horizontal-titles-height;
 
       .nut-tabs__list {
         width: 100%;
@@ -265,15 +251,14 @@
         flex: 1 0 auto;
 
         &--active {
-          color: $color-primary;
+          color: $tabs-titles-item-active-color;
           font-weight: $tabs-titles-item-active-font-weight;
-          font-size: $tabs-titles-item-active-font-size;
 
           .nut-tabs__titles-item__line {
             content: ' ';
-            width: $tabs-tab-line-width;
-            height: $tabs-tab-line-height;
-            background: $tabs-tab-line-color;
+            width: $tabs-horizontal-titles-item-active-line-width;
+            height: $tabs-horizontal-titles-item-active-line-height;
+            background: $tabs-horizontal-tab-line-color;
           }
         }
       }

package/dist/packages/tag/tag.scss

@@ -16,9 +16,9 @@
 
   @mixin plain {
     &.nut-tag--plain {
-      color: $color-title;
+      color: $tag-background-color;
       background-color: #fff;
-      border: $tag-border-width solid $color-title;
+      border: $tag-border-width solid $tag-background-color;
     }
   }
 

package/dist/packages/textarea/textarea.scss

@@ -3,7 +3,7 @@
   width: 100%;
   box-sizing: border-box;
   display: flex;
-  background: $color-background-overlay;
+  background: $white;
   font-size: $textarea-font;
   padding: $textarea-padding;
 

package/dist/packages/timedetail/timedetail.scss

@@ -2,24 +2,25 @@
   display: flex;
   align-content: flex-start;
   flex-wrap: wrap;
-  padding: 0 0 50px 12px;
+  padding: 0 0 50px 13px;
 
   &__item {
     width: $timeselect-time-width;
     height: $timeselect-time-height;
-    line-height: $timeselect-time-height;
+    line-height: $timeselect-time-line-height;
     text-align: center;
     margin: $timeselect-time-margin;
     background: $timeselect-time-background;
+    color: $timeselect-time-color;
     border-radius: 5px;
-    font-size: $font-size-base;
+    font-size: $timeselect-time-font-size;
     border: 1px solid transparent;
+    font-weight: 700;
 
     &.active {
-      background-color: $color-primary-light;
-      border: 1px solid $color-primary;
-      color: $color-primary;
-      font-weight: $font-weight-bold;
+      background-color: $timeselect-time-active-background;
+      border: 1px solid $timeselect-time-active-color;
+      color: $timeselect-time-active-color;
     }
   }
 }

package/dist/packages/timeselect/timeselect.scss

@@ -1,9 +1,19 @@
 
 .nut-timeselect {
-  background-color: $color-background-overlay;
+  background-color: $background-color3;
   display: flex;
   flex-direction: column;
-  height: calc(100% - 50px);
+  height: 100%;
+
+  &__title {
+    height: $timeselect-title-height;
+    line-height: $timeselect-title-line-height;
+    margin-bottom: 10px;
+    font-size: $timeselect-title-font-size;
+    background: $timeselect-title-background;
+    color: $title-color;
+    text-align: center;
+  }
 
   &__content {
     display: flex;
@@ -15,21 +25,20 @@
     min-width: $timeselect-date-width;
     height: 100%;
     overflow: auto;
-    background: $color-background-sunken;
+    background: $background-color2;
   }
 }
 
 .nut-timepannel {
-  padding: 0 16px;
   height: $timeselect-date-height;
-  line-height: $timeselect-date-height;
-  text-align: left;
-  color: $color-text;
-  font-size: $font-size-base;
+  line-height: $timeselect-date-line-height;
+  text-align: center;
+  color: $timeselect-date-color;
+  font-size: $timeselect-date-font-size;
 
   &.active {
-    background: $color-background-overlay;
+    background: $background-color3;
     color: $timeselect-date-active-color;
-    font-weight: $font-weight-bold;
+    font-weight: 700;
   }
 }