Browse Source

style(form、grid、indicator、calendar、textarea): add sass param

richard1015 3 years ago
parent
commit
2a091b8a6f

+ 9 - 4
src/packages/__VUE/calendar/index.scss

@@ -38,6 +38,7 @@
 
     .calendar-title {
       font-size: $calendar-title-font;
+      font-weight: $calendar-title-font-weight;
       line-height: 44px;
     }
     .calendar-top-slot {
@@ -46,6 +47,7 @@
     .calendar-curr-month {
       padding: 7px 0;
       line-height: 22px;
+      font-size: $calendar-sub-title-font;
     }
 
     .calendar-weeks {
@@ -59,7 +61,7 @@
       .calendar-week-item {
         &:first-of-type,
         &:last-of-type {
-          color: $calendar-primary-color;
+          color: $calendar-day67-font-color;
         }
       }
     }
@@ -114,13 +116,14 @@
         .calendar-month-item {
           .calendar-month-day:nth-child(7n + 0),
           .calendar-month-day:nth-child(7n + 1) {
-            color: $calendar-primary-color;
+            color: $calendar-day67-font-color;
           }
         }
         .calendar-month-day {
           float: left;
-          width: 14.28%;
-          height: 64px;
+          width: $calendar-day-width;
+          height: $calendar-day-height;
+          font-weight: $calendar-day-font-weight;
           display: flex;
           align-items: center;
           justify-content: center;
@@ -156,6 +159,7 @@
           &-active {
             background-color: $calendar-primary-color;
             color: $white !important;
+            border-radius: $calendar-day-active-border-radius;
 
             .calendar-curr-tips {
               // color: $white !important;
@@ -175,6 +179,7 @@
 
           &-choose {
             background-color: $calendar-choose-color;
+            color: $calendar-choose-font-color;
           }
 
           .calendar-day {

+ 207 - 0
src/packages/__VUE/calendaritem/index-old.scss

@@ -0,0 +1,207 @@
+.nut-calendar {
+  position: relative;
+  display: flex;
+  flex: 1;
+  color: #333333;
+  font-size: 16px;
+  background-color: #fff;
+  overflow: hidden;
+  height: 100%;
+  flex-direction: column;
+  &.nut-calendar-tile {
+    .nut-calendar-header {
+      .calendar-title {
+        font-size: $calendar-base-font;
+      }
+    }
+  }
+  .nut-calendar-taro {
+    height: 60vh;
+  }
+  .popup-box {
+    height: 100%;
+  }
+  .nut-calendar-content {
+    overflow-y: auto;
+  }
+  ::-webkit-scrollbar {
+    display: none;
+  }
+
+  // 头部导航
+  .nut-calendar-header {
+    display: flex;
+    flex-direction: column;
+    text-align: center;
+    padding-top: 1px;
+    background-color: $white;
+
+    .calendar-title {
+      font-size: $calendar-title-font;
+      line-height: 44px;
+    }
+    .calendar-top-slot {
+      height: 24px;
+    }
+    .calendar-curr-month {
+      padding: 7px 0;
+      line-height: 22px;
+    }
+
+    .calendar-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);
+
+      .calendar-week-item {
+        &:first-of-type,
+        &:last-of-type {
+          color: $calendar-primary-color;
+        }
+      }
+    }
+  }
+
+  // 月份
+  .nut-calendar-content {
+    flex: 1;
+    width: 100%;
+    display: block;
+    .calendar-months-panel {
+      position: relative;
+      width: 100%;
+      height: auto;
+      display: block;
+      box-sizing: border-box;
+      .viewArea {
+        display: block;
+      }
+      .calendar-month {
+        display: flex;
+        flex-direction: column;
+        text-align: center;
+      }
+
+      div:nth-of-type(2) {
+        .calendar-month-title {
+          padding-top: 0;
+        }
+      }
+
+      .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;
+      }
+
+      .calendar-month-title {
+        height: 23px;
+        line-height: 23px;
+        margin: 8px 0;
+      }
+
+      .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;
+
+          .calendar-curr-tips {
+            position: absolute;
+            width: 100%;
+          }
+
+          .calendar-curr-tip-curr {
+            position: absolute;
+            bottom: 6px;
+            width: 100%;
+            font-size: 12px;
+            line-height: 14px;
+          }
+          .calendar-day-tip {
+            position: absolute;
+            bottom: 6px;
+            width: 100%;
+            font-size: 12px;
+            line-height: 14px;
+            color: $calendar-primary-color;
+          }
+          .calendar-curr-tips-top {
+            top: 6px;
+          }
+          .calendar-curr-tips-bottom {
+            bottom: 6px;
+          }
+          &-active {
+            background-color: $calendar-primary-color;
+            color: $white !important;
+
+            .calendar-curr-tips {
+              // color: $white !important;
+              visibility: hidden;
+            }
+            .calendar-curr-tip-curr {
+              visibility: hidden;
+            }
+            .calendar-day-tip {
+              color: $white;
+            }
+          }
+
+          &-disabled {
+            color: $calendar-disable-color !important;
+          }
+
+          &-choose {
+            background-color: $calendar-choose-color;
+          }
+
+          .calendar-day {
+            padding: 2px 0;
+            font-size: $calendar-day-font;
+          }
+        }
+      }
+    }
+  }
+
+  // 底部导航
+  .nut-calendar-footer {
+    display: flex;
+    height: 62px;
+    width: 100%;
+    background-color: $white;
+
+    .calendar-confirm-btn {
+      height: 44px;
+      width: 100%;
+      margin: 10px 18px;
+      border-radius: 22px;
+      background: $button-primary-background-color;
+      color: $white;
+      text-align: center;
+      line-height: 44px;
+    }
+  }
+}

+ 0 - 207
src/packages/__VUE/calendaritem/index.scss

@@ -1,207 +0,0 @@
-.nut-calendar {
-  position: relative;
-  display: flex;
-  flex: 1;
-  color: #333333;
-  font-size: 16px;
-  background-color: #fff;
-  overflow: hidden;
-  height: 100%;
-  flex-direction: column;
-  &.nut-calendar-tile {
-    .nut-calendar-header {
-      .calendar-title {
-        font-size: $calendar-base-font;
-      }
-    }
-  }
-  .nut-calendar-taro {
-    height: 60vh;
-  }
-  .popup-box {
-    height: 100%;
-  }
-  .nut-calendar-content {
-    overflow-y: auto;
-  }
-  ::-webkit-scrollbar {
-    display: none;
-  }
-
-  // 头部导航
-  .nut-calendar-header {
-    display: flex;
-    flex-direction: column;
-    text-align: center;
-    padding-top: 1px;
-    background-color: $white;
-
-    .calendar-title {
-      font-size: $calendar-title-font;
-      line-height: 44px;
-    }
-    .calendar-top-slot {
-      height: 24px;
-    }
-    .calendar-curr-month {
-      padding: 7px 0;
-      line-height: 22px;
-    }
-
-    .calendar-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);
-
-      .calendar-week-item {
-        &:first-of-type,
-        &:last-of-type {
-          color: $calendar-primary-color;
-        }
-      }
-    }
-  }
-
-  // 月份
-  .nut-calendar-content {
-    flex: 1;
-    width: 100%;
-    display: block;
-    .calendar-months-panel {
-      position: relative;
-      width: 100%;
-      height: auto;
-      display: block;
-      box-sizing: border-box;
-      .viewArea {
-        display: block;
-      }
-      .calendar-month {
-        display: flex;
-        flex-direction: column;
-        text-align: center;
-      }
-
-      div:nth-of-type(2) {
-        .calendar-month-title {
-          padding-top: 0;
-        }
-      }
-
-      .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;
-      }
-
-      .calendar-month-title {
-        height: 23px;
-        line-height: 23px;
-        margin: 8px 0;
-      }
-
-      .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;
-
-          .calendar-curr-tips {
-            position: absolute;
-            width: 100%;
-          }
-
-          .calendar-curr-tip-curr {
-            position: absolute;
-            bottom: 6px;
-            width: 100%;
-            font-size: 12px;
-            line-height: 14px;
-          }
-          .calendar-day-tip {
-            position: absolute;
-            bottom: 6px;
-            width: 100%;
-            font-size: 12px;
-            line-height: 14px;
-            color: $calendar-primary-color;
-          }
-          .calendar-curr-tips-top {
-            top: 6px;
-          }
-          .calendar-curr-tips-bottom {
-            bottom: 6px;
-          }
-          &-active {
-            background-color: $calendar-primary-color;
-            color: $white !important;
-
-            .calendar-curr-tips {
-              // color: $white !important;
-              visibility: hidden;
-            }
-            .calendar-curr-tip-curr {
-              visibility: hidden;
-            }
-            .calendar-day-tip {
-              color: $white;
-            }
-          }
-
-          &-disabled {
-            color: $calendar-disable-color !important;
-          }
-
-          &-choose {
-            background-color: $calendar-choose-color;
-          }
-
-          .calendar-day {
-            padding: 2px 0;
-            font-size: $calendar-day-font;
-          }
-        }
-      }
-    }
-  }
-
-  // 底部导航
-  .nut-calendar-footer {
-    display: flex;
-    height: 62px;
-    width: 100%;
-    background-color: $white;
-
-    .calendar-confirm-btn {
-      height: 44px;
-      width: 100%;
-      margin: 10px 18px;
-      border-radius: 22px;
-      background: $button-primary-background-color;
-      color: $white;
-      text-align: center;
-      line-height: 44px;
-    }
-  }
-}

+ 13 - 6
src/packages/__VUE/formitem/index.scss

@@ -21,18 +21,19 @@
   }
 
   &__label {
-    font-size: 14px;
+    font-size: $form-item-label-font-size;
     font-weight: normal;
-    width: 90px;
-    margin-right: 10px;
+    width: $form-item-label-width;
+    margin-right: $form-item-label-margin-right;
     flex: none !important;
     display: inline-block;
     word-wrap: break-word;
+    text-align: $form-item-label-text-align;
     &.required {
       &::before {
         content: '*';
         color: $form-item-required-color;
-        margin-right: 4px;
+        margin-right: $form-item-required-margin-right;
       }
     }
   }
@@ -41,8 +42,10 @@
     display: flex;
     flex-direction: column;
     &__slots {
+      text-align: $form-item-body-slots-text-align;
       .nut-input-text {
-        font-size: 14px;
+        font-size: $form-item-body-font-size;
+        text-align: $form-item-body-input-text-align;
         width: 100%;
         outline: 0 none;
         border: 0;
@@ -53,10 +56,14 @@
       }
       .nut-textarea {
         padding: 0 !important;
+        .nut-textarea__textarea {
+          text-align: $form-item-body-input-text-align;
+        }
       }
     }
     &__tips {
-      font-size: 10px;
+      text-align: $form-item-tip-text-align;
+      font-size: $form-item-tip-font-size;
       color: $form-item-error-message-color;
     }
   }

+ 3 - 3
src/packages/__VUE/formitem/index.vue

@@ -54,15 +54,15 @@ export default create({
     },
     labelAlign: {
       type: String,
-      default: 'left'
+      default: ''
     },
     errorMessageAlign: {
       type: String,
-      default: 'left'
+      default: ''
     },
     bodyAlign: {
       type: String,
-      default: 'left'
+      default: ''
     }
   },
   components: {},

+ 1 - 1
src/packages/__VUE/indicator/index.scss

@@ -36,7 +36,7 @@
     width: $indicator-size;
     height: $indicator-size;
     text-align: center;
-    font-size: 10px;
+    font-size: $indicator-number-font-size;
     line-height: $indicator-size;
     color: $indicator-white;
     vertical-align: middle;

+ 1 - 1
src/packages/__VUE/textarea/index.taro.vue

@@ -35,7 +35,7 @@ export default create({
     },
     textAlign: {
       type: String,
-      default: 'left'
+      default: ''
     },
     limitShow: {
       type: Boolean,

+ 1 - 1
src/packages/__VUE/textarea/index.vue

@@ -31,7 +31,7 @@ export default create({
     },
     textAlign: {
       type: String,
-      default: 'left'
+      default: ''
     },
     limitShow: {
       type: Boolean,

+ 21 - 2
src/packages/styles/variables.scss

@@ -237,13 +237,21 @@ $backtop-border-color: #e0e0e0 !default;
 
 // calendar
 $calendar-primary-color: $primary-color !default;
-$calendar-choose-color: #fef6f6 !default;
+$calendar-choose-color: rgba($primary-color, 0.09) !default;
+$calendar-choose-font-color: $primary-color !default;
 $calendar-base-color: #333333 !default;
 $calendar-disable-color: #d1d0d0 !default;
-$calendar-title-font: $font-size-4 !default;
 $calendar-base-font: $font-size-3 !default;
+$calendar-title-font: $font-size-4 !default;
+$calendar-title-font-weight: 500 !default;
+$calendar-sub-title-font: $font-size-2 !default;
 $calendar-text-font: $font-size-1 !default;
 $calendar-day-font: 16px !default;
+$calendar-day-active-border-radius: 0px !default;
+$calendar-day-width: 14.28% !default;
+$calendar-day-height: 64px !default;
+$calendar-day-font-weight: 500 !default;
+$calendar-day67-font-color: $primary-color !default;
 
 //overlay
 $overlay-bg-color: rgba(0, 0, 0, 0.7) !default;
@@ -479,6 +487,7 @@ $indicator-white: $white !default;
 $indicator-size: 18px !default;
 $indicator-dot-size: $indicator-size / 3 !default;
 $indicator-border-size: $indicator-size + 2 !default;
+$indicator-number-font-size: 10px !default;
 
 // menu
 $menu-bar-line-height: 46px !default;
@@ -525,6 +534,16 @@ $cascader-item-active-color: $primary-color !default;
 $form-item-error-line-color: $primary-color !default;
 $form-item-required-color: $primary-color !default;
 $form-item-error-message-color: $primary-color !default;
+$form-item-label-font-size: 14px !default;
+$form-item-label-width: 90px !default;
+$form-item-label-margin-right: 10px !default;
+$form-item-label-text-align: left !default;
+$form-item-required-margin-right: 4px !default;
+$form-item-body-font-size: 14px !default;
+$form-item-body-slots-text-align: left !default;
+$form-item-body-input-text-align: left !default;
+$form-item-tip-font-size: 10px !default;
+$form-item-tip-text-align: left !default;
 
 // sku
 $sku-item-border: 1px solid $primary-color !default;