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

package/dist/packages/fixednav/fixednav.scss

@@ -10,11 +10,9 @@
     .nut-icon {
       transform: rotate(180deg);
     }
-
-    .nut-fixednav-list {
+    .nut-fixednav__list {
       transform: translateX(0%) !important;
     }
-
     &.left {
       .nut-icon {
         transform: rotate(0deg) !important;
@@ -22,15 +20,16 @@
     }
   }
 
-  &-btn {
+  &__btn {
     box-sizing: border-box;
     position: absolute;
     right: 0;
 
     z-index: $fixednav-index;
-    width: 70px;
+    width: 80px;
+    padding-left: 12px;
     height: 100%;
-    background: $fixednav-button-background;
+    background: $fixednav-btn-bg;
     border-radius: 45px 0px 0px 45px;
     box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.2);
     display: flex;
@@ -40,11 +39,10 @@
     .text {
       width: 24px;
       line-height: 13px;
-      font-size: $font-size-small;
-      color: #fff;
+      font-size: 10px;
+      color: $fixednav-bg-color;
       flex-shrink: 0;
     }
-
     .nut-icon {
       margin-right: 5px;
       transition: all 0.3s;
@@ -53,7 +51,7 @@
     }
   }
 
-  &-list {
+  &__list {
     position: absolute;
     right: 0;
     transform: translateX(100%);
@@ -62,17 +60,15 @@
     z-index: $fixednav-index;
     flex-shrink: 0;
     height: 100%;
-    background: $fixednav-background-color;
+    background: $fixednav-bg-color;
     display: flex;
     justify-content: space-between;
     border-radius: 25px 0px 0px 25px;
     box-shadow: 2px 2px 8px 0px rgba(0, 0, 0, 0.2);
-
     padding: {
       left: 20px;
       right: 80px;
     }
-
     &-item {
       position: relative;
       flex: 1;
@@ -83,18 +79,15 @@
       align-items: center;
       min-width: 50px;
       flex-shrink: 0;
-      color: $fixednav-color;
-
       img {
         width: 20px;
         height: 20px;
         margin-bottom: 2px;
       }
-
-      .nut-fixednav-list-text {
+      .nut-fixednav__list-text {
         font-size: 10px;
+        color: $fixednav-font-color;
       }
-
       .b {
         position: absolute;
         right: 0;
@@ -111,37 +104,31 @@
       }
     }
   }
-
   &.left {
     right: auto;
     left: 0;
 
-    .nut-fixednav-btn {
+    .nut-fixednav__btn {
       flex-direction: row-reverse;
       right: auto;
       left: 0;
       border-radius: 0 45px 45px 0;
-
       .nut-icon {
         transform: rotate(180deg);
       }
     }
-
-    .nut-fixednav-list {
+    .nut-fixednav__list {
       transform: translateX(-100%);
       right: auto;
       border-radius: 0px 25px 25px 0px;
-
       padding: {
         left: 80px;
         right: 20px;
       }
-
       margin: 0;
     }
   }
 }
-
 .nut-drag .nut-fixednav {
   position: inherit;
 }

package/dist/packages/form/form.scss

@@ -1,12 +1,12 @@
 
-.form-layout-right .nut-form-item-label {
+.form-layout-right .nut-form-item__label {
   text-align: right;
   font-size: 14px;
   padding-right: 24px;
   white-space: nowrap;
 }
 
-.form-layout-left .nut-form-item-label {
+.form-layout-left .nut-form-item__label {
   position: relative;
   text-align: left;
   font-size: 14px;
@@ -27,14 +27,14 @@
   white-space: nowrap;
 }
 
-.form-layout-top .nut-form-item-label {
+.form-layout-top .nut-form-item__label {
   padding-bottom: 4px;
   display: block;
   font-size: 14px;
   padding-right: 24px;
 }
 
-.form-layout-top .nut-form-item-body {
+.form-layout-top .nut-form-item__body {
   margin-left: 0;
   width: 100%;
 }

package/dist/packages/formitem/formitem.scss

@@ -11,7 +11,7 @@
     }
   }
 
-  &-label {
+  &__label {
     font-size: $form-item-label-font-size;
     font-weight: normal;
     width: $form-item-label-width;
@@ -30,12 +30,12 @@
     }
   }
 
-  &-body {
+  &__body {
     flex: 1;
     display: flex !important;
     flex-direction: column;
 
-    &-slots {
+    &__slots {
       text-align: $form-item-body-slots-text-align;
 
       .nut-input {
@@ -46,7 +46,7 @@
       .nut-input-text {
         font-size: $form-item-body-font-size;
         text-align: $form-item-body-input-text-align;
-        color: $color-title;
+        color: $black;
         width: 100%;
         outline: 0 none;
         border: 0;
@@ -61,14 +61,14 @@
       .nut-textarea {
         padding: 0 !important;
 
-        .nut-textarea-textarea {
+        .nut-textarea__textarea {
           font: inherit;
           text-align: $form-item-body-input-text-align;
         }
       }
     }
 
-    &-tips {
+    &__tips {
       text-align: $form-item-tip-text-align;
       font-size: $form-item-tip-font-size;
       color: $form-item-error-message-color;

package/dist/packages/grid/grid.scss

@@ -4,7 +4,7 @@
   flex-wrap: wrap;
   border: 0 solid $grid-border-color;
 
-  &-border {
+  &__border {
     border-top-width: 1px;
     border-left-width: 1px;
   }

package/dist/packages/griditem/griditem.scss

@@ -5,7 +5,7 @@
 
   $block: &;
 
-  &-text {
+  &__text {
     color: $grid-item-text-color;
     font-size: $grid-item-text-font-size;
     line-height: 1.5;
@@ -13,7 +13,7 @@
     margin: $grid-item-text-margin 0 0 0;
   }
 
-  &-content {
+  &__content {
     display: flex;
     flex-direction: column;
     box-sizing: border-box;
@@ -22,53 +22,52 @@
     background: $grid-item-content-bg-color;
     border: 0 solid $grid-border-color;
 
-    &-border {
+    &--border {
       border-right-width: 1px;
       border-bottom-width: 1px;
     }
 
-    &-surround {
+    &--surround {
       border-top-width: 1px;
       border-left-width: 1px;
     }
 
-    &-center {
+    &--center {
       align-items: center;
       justify-content: center;
     }
 
-    &-square {
+    &--square {
       position: absolute;
       top: 0;
       right: 0;
       left: 0;
     }
 
-    &-reverse {
+    &--reverse {
       flex-direction: column-reverse;
 
-      #{$block}-text {
+      #{$block}__text {
         margin: 0 0 $grid-item-text-margin;
       }
     }
 
-    &-horizontal {
+    &--horizontal {
       flex-direction: row;
 
-      #{$block}-text {
+      #{$block}__text {
         margin: 0 0 0 $grid-item-text-margin;
       }
     }
 
-    &-horizontal#{&}-reverse {
+    &--horizontal#{&}--reverse {
       flex-direction: row-reverse;
-
-      #{$block}-text {
+      #{$block}__text {
         margin: 0 $grid-item-text-margin 0 0;
       }
     }
 
-    &-clickable {
+    &--clickable {
       cursor: pointer;
 
       &::before {
@@ -77,9 +76,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;

package/dist/packages/image/image.scss

@@ -1,7 +1,6 @@
 .nut-image {
   display: block;
   position: relative;
-
   .nut-img {
     display: block;
     width: 100%;
@@ -23,10 +22,9 @@
     flex-direction: column;
     align-items: center;
     justify-content: center;
-    background: $color-background;
+    background: #f7f8fa;
     background-size: 100% 100%;
   }
-
   .nut-img-error {
     width: 100%;
     height: 100%;
@@ -37,7 +35,7 @@
     flex-direction: column;
     align-items: center;
     justify-content: center;
-    background: $color-background;
+    background: #f7f8fa;
     background-size: 100% 100%;
   }
 }

package/dist/packages/imagepreview/imagepreview.scss

@@ -17,7 +17,7 @@
     left: 0;
     right: 0;
     background: transparent;
-    color: white;
+    color: #fff;
 
     .arrow {
       position: absolute;
@@ -26,6 +26,16 @@
     }
   }
 
+  .popup-bg {
+    background: rgba(0, 0, 0, 0.9);
+  }
+
+  .popup-box {
+    height: 100%;
+    overflow: visible;
+    background-color: transparent;
+  }
+
   &-pop {
     height: 100%;
     background: transparent !important;

package/dist/packages/indicator/indicator.scss

@@ -4,7 +4,7 @@
   flex-wrap: nowrap;
   align-items: center;
 
-  &-dot {
+  &__dot {
     margin: 0 $indicator-dot-margin;
 
     &:first-child {
@@ -16,7 +16,7 @@
     }
   }
 
-  &-dot {
+  &__dot {
     display: inline-block;
     vertical-align: middle;
     width: $indicator-dot-size;
@@ -25,20 +25,20 @@
     background-color: $indicator-dot-color;
   }
 
-  &-active {
+  &__active {
     width: $indicator-dot-active-size;
-    border-radius: $indicator-border-radius-size;
-    background: $indicator-color;
+    border-radius: $indicator-border-size;
+    background-color: $indicator-color;
   }
 
-  &-vertical {
+  &__vertical {
     display: flex;
     flex-direction: column;
     align-items: center;
     justify-content: center;
 
-    .nut-indicator-dot {
-      margin: $indicator-dot-margin 0;
+    .nut-indicator__dot {
+      margin: $indicator-dot-vertical-margin 0;
 
       &:first-child {
         margin-top: 0px;
@@ -49,7 +49,7 @@
       }
     }
 
-    .nut-indicator-active {
+    .nut-indicator__active {
       width: $indicator-dot-size;
       height: $indicator-dot-active-size;
     }

package/dist/packages/infiniteloading/infiniteloading.scss

@@ -1,33 +1,26 @@
 .nut-infiniteloading {
   display: block;
   width: 100%;
-
   .nut-infinite-top {
     display: flex;
     align-items: center;
     justify-content: center;
     width: 100%;
     overflow: hidden;
-    font-size: $font-size-small;
-    color: $infiniteloading-color;
-
     .top-box {
       width: 100%;
       display: flex;
       flex-direction: column;
       align-items: center;
       justify-content: center;
-      &-icons {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        width: $pulltorefresh-top-icon-width;
-        height: $pulltorefresh-top-icon-height;
-        margin-bottom: 4px;
-      }
+      color: $text-color;
+    }
+  }
+  .nut-infinite-container {
+    .infiniteLi {
+      color: $title-color;
     }
   }
-
   .nut-infinite-bottom {
     display: flex;
     align-items: center;
@@ -35,19 +28,11 @@
     width: 100%;
     padding-top: 6px;
     font-size: $font-size-small;
-    color: $infiniteloading-color;
+    color: $infiniteloading-bottom-color;
     text-align: center;
 
     .bottom-box {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-
-      &-icons {
-        width: $infiniteloading-bottom-icon-size;
-        height: $infiniteloading-bottom-icon-size;
-        margin-right: 8px;
-      }
+      color: $text-color;
     }
   }
 }

package/dist/packages/input/input.scss

@@ -6,10 +6,9 @@
   width: 100%;
   padding: $input-padding;
   line-height: 24px;
+  background: $white;
   font-size: $input-font-size;
   box-sizing: border-box;
-  border-radius: $input-border-radius;
-  background-color: $input-background-color;
   border-bottom: $input-border-bottom-width solid $input-border-bottom;
 
   .nut-icon {
@@ -18,7 +17,7 @@
 
   .nut-input-native {
     width: 100%;
-    color: $input-color;
+    color: $gray1;
     flex: 1;
     background-color: transparent;
     padding: 0;
@@ -26,7 +25,6 @@
     outline: 0 none;
     font: inherit;
     text-decoration: none;
-    background-color: transparent;
   }
 
   &-disabled {

package/dist/packages/inputnumber/inputnumber.scss

@@ -1,5 +1,5 @@
 .nut-inputnumber {
-  display: flex;
+  display: $inputnumber-display;
   align-items: center;
 
   .nut-input-minus,
@@ -13,38 +13,35 @@
     border-radius: $inputnumber-button-border-radius;
   }
 
-  &-disabled {
+  &--disabled {
     input {
-      color: $inputnumber-disabled-color !important;
+      color: $inputnumber-icon-void-color !important;
     }
   }
 
-  &-icon {
+  &__icon {
     color: $inputnumber-icon-color;
     font-size: $inputnumber-icon-size;
     cursor: pointer;
 
-    &-disabled {
-      color: $inputnumber-disabled-color;
+    &--disabled {
+      color: $inputnumber-icon-disabled-color;
       cursor: not-allowed;
     }
   }
 
   input,
   .nut-number-input,
-  &-text-readonly {
-    display: flex;
-    justify-content: center;
-    align-items: center;
+  &__text--readonly {
     width: $inputnumber-input-width;
     height: $inputnumber-input-height;
     text-align: center;
     outline: none;
     border: $inputnumber-input-border;
-    border-radius: $inputnumber-input-border-radius;
     margin: $inputnumber-input-margin;
     color: $inputnumber-input-font-color;
     background-color: $inputnumber-input-background-color;
+    border-radius: $inputnumber-input-border-radius;
   }
 
   input::-webkit-outer-spin-button,
@@ -53,16 +50,16 @@
   .nut-number-input::-webkit-inner-spin-button {
     appearance: none;
   }
+}
 
-  .nut-icon-Minus,
-  .nut-icon-minus {
-    --nut-icon-width: 16px;
-    --nut-icon-height: 16px;
-  }
+.nut-icon-Minus,
+.nut-icon-minus {
+  --nut-icon-width: 20px;
+  --nut-icon-height: 20px;
+}
 
-  .nut-icon-Plus,
-  .nut-icon-plus {
-    --nut-icon-width: 16px;
-    --nut-icon-height: 16px;
-  }
+.nut-icon-Plus,
+.nut-icon-plus {
+  --nut-icon-width: 20px;
+  --nut-icon-height: 20px;
 }

package/dist/packages/loading/loading.scss

@@ -19,9 +19,9 @@
     }
   }
   .nut-loading-text {
-    padding: 8px;
-    color: $loading-color;
-    font-size: $loading-font-size;
+    padding: 4px;
+    color: $loading-text-color;
+    font-size: $loading-text-size;
   }
 }
 @keyframes nut-loading-rotation {

package/dist/packages/menu/menu.scss

@@ -1,7 +1,6 @@
 @import '../../styles/mixins/text-ellipsis.scss';
 
 .nut-menu {
-  position: relative;
   &.scroll-fixed {
     position: fixed;
     top: $menu-scroll-fixed-top;
@@ -10,47 +9,56 @@
   }
 }
 
-.nut-menu-bar {
+.nut-menu-relative {
+  position: relative;
+}
+
+.nut-menu__bar {
   position: relative;
   display: flex;
   line-height: $menu-bar-line-height;
-  background-color: $color-background-overlay;
+  background-color: $white;
   box-shadow: $menu-bar-box-shadow;
 
   &.opened {
     z-index: $menu-bar-opened-z-index;
   }
 }
-.nut-menu-title {
+
+.nut-menu__item {
   flex: 1;
   text-align: center;
-  font-size: $menu-title-font-size;
-  color: $menu-title-color;
+  font-size: $menu-item-font-size;
+  color: $menu-item-text-color;
   min-width: 0;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  max-width: 100%;
-
-  &-text {
-    @include text-ellipsis;
-    display: block;
-    padding: $menu-title-padding;
-  }
-
-  &-icon {
-    transition: all 0.2s linear;
-  }
 
   &.active {
-    color: $menu-item-active-color;
+    color: $menu-item-active-text-color;
   }
 
   &.disabled {
     color: $menu-item-disabled-color;
   }
+}
+
+.nut-menu__title-icon {
+  transition: all 0.2s linear;
+}
 
-  &.active .nut-menu-title-icon {
+.nut-menu__title {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  max-width: 100%;
+
+  &.active .nut-menu__title-icon {
     transform: rotate(180deg);
   }
 }
+
+.nut-menu__title-text {
+  @include text-ellipsis;
+  display: block;
+  padding-left: $menu-title-text-padding-left;
+  padding-right: $menu-title-text-padding-right;
+}