hy-app 0.6.8 → 0.7.0

package/libs/css/_function.scss

@@ -44,22 +44,16 @@ $default-theme: #4d80f0 !default; // 正常色
  * @params $mix-color 自己设置的混色
  */
 @function themeColor($theme-color, $type: "", $mix-color: "") {
-  @if $default-theme == #4d80f0 {
-    @if $type=="dark" {
-      @return darken($theme-color, 10%);
-    }
-
-    @else if $type=="light" {
-      @return lighten($theme-color, 30%);
-    }
-
-    @else {
-      @return $theme-color;
-    }
+  @if $type=="dark" {
+    @return darken($theme-color, 10%);
+  }
+
+  @else if $type=="light" {
+    @return lighten($theme-color, 30%);
   }
 
   @else {
-    @return $mix-color;
+    @return $theme-color;
   }
 }
 

package/libs/css/_mixin.scss

@@ -151,13 +151,13 @@
 @mixin borderRadio($shape) {
   @include m($shape) {
     @if $shape == circle {
-      border-radius:  theme.$hy-border-radius-semicircle;
+      border-radius:  theme.$hy-radius-semicircle;
     }
     @else if($shape == square) {
-      border-radius: theme.$hy-border-radius-sm;
+      border-radius: theme.$hy-radius-sm;
     }
     @else {
-      border-radius: 28rpx theme.$hy-border-radius-sm;
+      border-radius: 28rpx theme.$hy-radius-sm;
     }
   }
 }

package/libs/css/common.scss

@@ -38,7 +38,7 @@
     width: 4px;
     height: 18px;
     background: $hy-primary;
-    border-radius: $hy-border-radius-semicircle;
+    border-radius: $hy-radius-semicircle;
   }
 }