@kengic/uni 0.5.1 → 0.5.2-beta.1

package/dist/uni/uni-ui/uni-scss/styles/setting/_color.scss

@@ -1,4 +1,3 @@
-
 // TODO 暂时不需要 class ，需要用户使用变量实现 ，如果使用类名其实并不推荐
 // @mixin get-styles($k,$c) {
 // 	@if $k == size or $k == weight{
@@ -7,60 +6,60 @@
 // 		#{$k}:#{$c}
 // 	}
 // }
-$uni-ui-color:(
-	// 主色
-	primary: $uni-primary,
-	primary-disable: $uni-primary-disable,
-	primary-light: $uni-primary-light,
-	// 辅助色
-	success: $uni-success,
-	success-disable: $uni-success-disable,
-	success-light: $uni-success-light,
-	warning: $uni-warning,
-	warning-disable: $uni-warning-disable,
-	warning-light: $uni-warning-light,
-	error: $uni-error,
-	error-disable: $uni-error-disable,
-	error-light: $uni-error-light,
-	info: $uni-info,
-	info-disable: $uni-info-disable,
-	info-light: $uni-info-light,
-	// 中性色
-	main-color: $uni-main-color,
-	base-color: $uni-base-color,
-	secondary-color: $uni-secondary-color,
-	extra-color: $uni-extra-color,
-	// 背景色
-	bg-color: $uni-bg-color,
-	// 边框颜色
-	border-1: $uni-border-1,
-	border-2: $uni-border-2,
-	border-3: $uni-border-3,
-	border-4: $uni-border-4,
-	// 黑色
-	black:$uni-black,
-	// 白色
-	white:$uni-white,
-	// 透明
-	transparent:$uni-transparent
+$uni-ui-color: (
+    // 主色
+    primary: $uni-primary,
+    primary-disable: $uni-primary-disable,
+    primary-light: $uni-primary-light,
+    // 辅助色
+    success: $uni-success,
+    success-disable: $uni-success-disable,
+    success-light: $uni-success-light,
+    warning: $uni-warning,
+    warning-disable: $uni-warning-disable,
+    warning-light: $uni-warning-light,
+    error: $uni-error,
+    error-disable: $uni-error-disable,
+    error-light: $uni-error-light,
+    info: $uni-info,
+    info-disable: $uni-info-disable,
+    info-light: $uni-info-light,
+    // 中性色
+    main-color: $uni-main-color,
+    base-color: $uni-base-color,
+    secondary-color: $uni-secondary-color,
+    extra-color: $uni-extra-color,
+    // 背景色
+    bg-color: $uni-bg-color,
+    // 边框颜色
+    border-1: $uni-border-1,
+    border-2: $uni-border-2,
+    border-3: $uni-border-3,
+    border-4: $uni-border-4,
+    // 黑色
+    black: $uni-black,
+    // 白色
+    white: $uni-white,
+    // 透明
+    transparent: $uni-transparent
 ) !default;
 @each $key, $child in $uni-ui-color {
-	.uni-#{"" + $key} {
-		color: $child;
-	}
-	.uni-#{"" + $key}-bg {
-		background-color: $child;
-	}
+    .uni-#{'' + $key} {
+        color: $child;
+    }
+    .uni-#{'' + $key}-bg {
+        background-color: $child;
+    }
 }
 .uni-shadow-sm {
-	box-shadow: $uni-shadow-sm;
+    box-shadow: $uni-shadow-sm;
 }
 .uni-shadow-base {
-	box-shadow: $uni-shadow-base;
+    box-shadow: $uni-shadow-base;
 }
 .uni-shadow-lg {
-	box-shadow: $uni-shadow-lg;
+    box-shadow: $uni-shadow-lg;
 }
 .uni-mask {
-	background-color:$uni-mask;
+    background-color: $uni-mask;
 }

package/dist/uni/uni-ui/uni-scss/styles/setting/_radius.scss

@@ -1,55 +1,55 @@
-@mixin radius($r,$d:null ,$important: false){
-  $radius-value:map-get($uni-radius, $r) if($important, !important, null);
-  // Key exists within the $uni-radius variable
-  @if (map-has-key($uni-radius, $r) and  $d){
-		@if $d == t {
-				border-top-left-radius:$radius-value;
-				border-top-right-radius:$radius-value;
-		}@else if $d == r {
-				border-top-right-radius:$radius-value;
-				border-bottom-right-radius:$radius-value;
-		}@else if $d == b {
-				border-bottom-left-radius:$radius-value;
-				border-bottom-right-radius:$radius-value;
-		}@else if $d == l {
-				border-top-left-radius:$radius-value;
-				border-bottom-left-radius:$radius-value;
-		}@else if $d == tl {
-				border-top-left-radius:$radius-value;
-		}@else if $d == tr {
-				border-top-right-radius:$radius-value;
-		}@else if $d == br {
-				border-bottom-right-radius:$radius-value;
-		}@else if $d == bl {
-				border-bottom-left-radius:$radius-value;
-		}
-  }@else{
-		border-radius:$radius-value;
-  }
+@mixin radius($r, $d: null, $important: false) {
+    $radius-value: map-get($uni-radius, $r) if($important, !important, null);
+    // Key exists within the $uni-radius variable
+    @if (map-has-key($uni-radius, $r) and $d) {
+        @if $d == t {
+            border-top-left-radius: $radius-value;
+            border-top-right-radius: $radius-value;
+        } @else if $d == r {
+            border-top-right-radius: $radius-value;
+            border-bottom-right-radius: $radius-value;
+        } @else if $d == b {
+            border-bottom-left-radius: $radius-value;
+            border-bottom-right-radius: $radius-value;
+        } @else if $d == l {
+            border-top-left-radius: $radius-value;
+            border-bottom-left-radius: $radius-value;
+        } @else if $d == tl {
+            border-top-left-radius: $radius-value;
+        } @else if $d == tr {
+            border-top-right-radius: $radius-value;
+        } @else if $d == br {
+            border-bottom-right-radius: $radius-value;
+        } @else if $d == bl {
+            border-bottom-left-radius: $radius-value;
+        }
+    } @else {
+        border-radius: $radius-value;
+    }
 }
 
 @each $key, $child in $uni-radius {
-	@if($key){
-		.uni-radius-#{"" + $key} {
-				@include radius($key)
-		}
-	}@else{
-		.uni-radius {
-				@include radius($key)
-		}
-	}
+    @if ($key) {
+        .uni-radius-#{'' + $key} {
+            @include radius($key);
+        }
+    } @else {
+        .uni-radius {
+            @include radius($key);
+        }
+    }
 }
 
-@each $direction in t, r, b, l,tl, tr, br, bl {
-	@each $key, $child in $uni-radius {
-		@if($key){
-			.uni-radius-#{"" + $direction}-#{"" + $key} {
-				@include radius($key,$direction,false)
-			}
-		}@else{
-			.uni-radius-#{$direction} {
-				@include radius($key,$direction,false)
-			}
-		}
-	}
+@each $direction in t, r, b, l, tl, tr, br, bl {
+    @each $key, $child in $uni-radius {
+        @if ($key) {
+            .uni-radius-#{'' + $direction}-#{'' + $key} {
+                @include radius($key, $direction, false);
+            }
+        } @else {
+            .uni-radius-#{$direction} {
+                @include radius($key, $direction, false);
+            }
+        }
+    }
 }

package/dist/uni/uni-ui/uni-scss/styles/setting/_space.scss

@@ -1,56 +1,55 @@
-
-@mixin fn($space,$direction,$size,$n) {
-	@if $n {
-		#{$space}-#{$direction}: #{$size*$uni-space-root}px
-	} @else {
-		 #{$space}-#{$direction}: #{-$size*$uni-space-root}px
-	}
+@mixin fn($space, $direction, $size, $n) {
+    @if $n {
+        #{$space}-#{$direction}: #{$size * $uni-space-root}px;
+    } @else {
+        #{$space}-#{$direction}: #{-$size * $uni-space-root}px;
+    }
 }
-@mixin get-styles($direction,$i,$space,$n){
-	@if $direction == t {
-		@include fn($space, top,$i,$n);
-	} 
-	@if $direction == r {
-		@include fn($space, right,$i,$n);
-	} 
-	@if $direction == b {
-		@include fn($space, bottom,$i,$n);
-	} 
-	@if $direction == l {
-	 @include fn($space, left,$i,$n);
-	} 
-	@if $direction == x {
-		@include fn($space, left,$i,$n);
-		@include fn($space, right,$i,$n);
-	} 
-	@if $direction == y {
-		@include fn($space, top,$i,$n);
-		@include fn($space, bottom,$i,$n);
-	} 
-	@if $direction == a {
-		@if $n {
-			#{$space}:#{$i*$uni-space-root}px;
-		} @else {
-			#{$space}:#{-$i*$uni-space-root}px;
-		}
-	} 
+@mixin get-styles($direction, $i, $space, $n) {
+    @if $direction == t {
+        @include fn($space, top, $i, $n);
+    }
+    @if $direction == r {
+        @include fn($space, right, $i, $n);
+    }
+    @if $direction == b {
+        @include fn($space, bottom, $i, $n);
+    }
+    @if $direction == l {
+        @include fn($space, left, $i, $n);
+    }
+    @if $direction == x {
+        @include fn($space, left, $i, $n);
+        @include fn($space, right, $i, $n);
+    }
+    @if $direction == y {
+        @include fn($space, top, $i, $n);
+        @include fn($space, bottom, $i, $n);
+    }
+    @if $direction == a {
+        @if $n {
+            #{$space}: #{$i * $uni-space-root}px;
+        } @else {
+            #{$space}: #{-$i * $uni-space-root}px;
+        }
+    }
 }
 
-@each $orientation in m,p {
-	$space: margin;
-	@if $orientation == m {
-		$space: margin;
-	} @else {
-		$space: padding;
-	}
-	@for $i from 0 through 16 {
-		@each $direction in t, r, b, l, x, y, a {
-			.uni-#{$orientation}#{$direction}-#{$i} { 
-				@include  get-styles($direction,$i,$space,true);
-			} 
-			.uni-#{$orientation}#{$direction}-n#{$i} { 
-				@include  get-styles($direction,$i,$space,false);
-			}
-		}
-	}
-}
+@each $orientation in m, p {
+    $space: margin;
+    @if $orientation == m {
+        $space: margin;
+    } @else {
+        $space: padding;
+    }
+    @for $i from 0 through 16 {
+        @each $direction in t, r, b, l, x, y, a {
+            .uni-#{$orientation}#{$direction}-#{$i} {
+                @include get-styles($direction, $i, $space, true);
+            }
+            .uni-#{$orientation}#{$direction}-n#{$i} {
+                @include get-styles($direction, $i, $space, false);
+            }
+        }
+    }
+}

package/dist/uni/uni-ui/uni-scss/styles/setting/_styles.scss

@@ -1,167 +1,162 @@
 /* #ifndef APP-NVUE */
 
-$-color-white:#fff;
-$-color-black:#000;
+$-color-white: #fff;
+$-color-black: #000;
 @mixin base-style($color) {
-	color: #fff;
-	background-color: $color;
-	border-color: mix($-color-black, $color, 8%);
-	&:not([hover-class]):active {
-		background: mix($-color-black, $color, 10%);
-		border-color: mix($-color-black, $color, 20%);
-		color: $-color-white;
-		outline: none;
-	}
+    color: #fff;
+    background-color: $color;
+    border-color: mix($-color-black, $color, 8%);
+    &:not([hover-class]):active {
+        background: mix($-color-black, $color, 10%);
+        border-color: mix($-color-black, $color, 20%);
+        color: $-color-white;
+        outline: none;
+    }
 }
 @mixin is-color($color) {
-	@include base-style($color);
-	&[loading] {
-		@include base-style($color);
-		&::before {
-			margin-right:5px;
-		}
-	}
-	&[disabled] {
-	  &,
-		&[loading],
-	  &:not([hover-class]):active {
-	    color: $-color-white;
-			border-color: mix(darken($color,10%), $-color-white);
-	    background-color: mix($color, $-color-white);
-	  }
-	}
-
+    @include base-style($color);
+    &[loading] {
+        @include base-style($color);
+        &::before {
+            margin-right: 5px;
+        }
+    }
+    &[disabled] {
+        &,
+        &[loading],
+        &:not([hover-class]):active {
+            color: $-color-white;
+            border-color: mix(darken($color, 10%), $-color-white);
+            background-color: mix($color, $-color-white);
+        }
+    }
 }
 @mixin base-plain-style($color) {
-	color:$color;
-	background-color: mix($-color-white, $color, 90%);
-	border-color: mix($-color-white, $color, 70%);
-	&:not([hover-class]):active {
-	  background: mix($-color-white, $color, 80%);
-	  color: $color;
-	  outline: none;
-		border-color: mix($-color-white, $color, 50%);
-	}
+    color: $color;
+    background-color: mix($-color-white, $color, 90%);
+    border-color: mix($-color-white, $color, 70%);
+    &:not([hover-class]):active {
+        background: mix($-color-white, $color, 80%);
+        color: $color;
+        outline: none;
+        border-color: mix($-color-white, $color, 50%);
+    }
 }
-@mixin is-plain($color){
-	&[plain] {
-		@include base-plain-style($color);
-		&[loading] {
-			@include base-plain-style($color);
-			&::before {
-				margin-right:5px;
-			}
-		}
-		&[disabled] {
-		  &,
-		  &:active {
-		    color: mix($-color-white, $color, 40%);
-		    background-color: mix($-color-white, $color, 90%);
-				border-color: mix($-color-white, $color, 80%);
-		  }
-		}
-	}
+@mixin is-plain($color) {
+    &[plain] {
+        @include base-plain-style($color);
+        &[loading] {
+            @include base-plain-style($color);
+            &::before {
+                margin-right: 5px;
+            }
+        }
+        &[disabled] {
+            &,
+            &:active {
+                color: mix($-color-white, $color, 40%);
+                background-color: mix($-color-white, $color, 90%);
+                border-color: mix($-color-white, $color, 80%);
+            }
+        }
+    }
 }
 
-
 .uni-btn {
-	margin: 5px;
-	color: #393939;
-	border:1px solid #ccc;
-	font-size: 16px;
-	font-weight: 200;
-	background-color: #F9F9F9;
-	// TODO 暂时处理边框隐藏一边的问题
-	overflow: visible;
-	&::after{
-		border: none;
-	}
-
-	&:not([type]),&[type=default] {
-		color: #999;
-		&[loading] {
-			background: none;
-			&::before {
-				margin-right:5px;
-			}
-		}
-
-
-
-		&[disabled]{
-			color: mix($-color-white, #999, 60%);
-		  &,
-			&[loading],
-		  &:active {
-				color: mix($-color-white, #999, 60%);
-		    background-color: mix($-color-white,$-color-black , 98%);
-				border-color: mix($-color-white,  #999, 85%);
-		  }
-		}
+    margin: 5px;
+    color: #393939;
+    border: 1px solid #ccc;
+    font-size: 16px;
+    font-weight: 200;
+    background-color: #f9f9f9;
+    // TODO 暂时处理边框隐藏一边的问题
+    overflow: visible;
+    &::after {
+        border: none;
+    }
 
-		&[plain] {
-			color: #999;
-			background: none;
-			border-color: $uni-border-1;
-			&:not([hover-class]):active {
-				background: none;
-			  color: mix($-color-white, $-color-black, 80%);
-				border-color: mix($-color-white, $-color-black, 90%);
-			  outline: none;
-			}
-			&[disabled]{
-			  &,
-				&[loading],
-			  &:active {
-			    background: none;
-					color: mix($-color-white, #999, 60%);
-					border-color: mix($-color-white,  #999, 85%);
-			  }
-			}
-		}
-	}
+    &:not([type]),
+    &[type='default'] {
+        color: #999;
+        &[loading] {
+            background: none;
+            &::before {
+                margin-right: 5px;
+            }
+        }
 
-	&:not([hover-class]):active {
-	  color: mix($-color-white, $-color-black, 50%);
-	}
+        &[disabled] {
+            color: mix($-color-white, #999, 60%);
+            &,
+            &[loading],
+            &:active {
+                color: mix($-color-white, #999, 60%);
+                background-color: mix($-color-white, $-color-black, 98%);
+                border-color: mix($-color-white, #999, 85%);
+            }
+        }
 
-	&[size=mini] {
-		font-size: 16px;
-		font-weight: 200;
-		border-radius: 8px;
-	}
+        &[plain] {
+            color: #999;
+            background: none;
+            border-color: $uni-border-1;
+            &:not([hover-class]):active {
+                background: none;
+                color: mix($-color-white, $-color-black, 80%);
+                border-color: mix($-color-white, $-color-black, 90%);
+                outline: none;
+            }
+            &[disabled] {
+                &,
+                &[loading],
+                &:active {
+                    background: none;
+                    color: mix($-color-white, #999, 60%);
+                    border-color: mix($-color-white, #999, 85%);
+                }
+            }
+        }
+    }
 
+    &:not([hover-class]):active {
+        color: mix($-color-white, $-color-black, 50%);
+    }
 
+    &[size='mini'] {
+        font-size: 16px;
+        font-weight: 200;
+        border-radius: 8px;
+    }
 
-	&.uni-btn-small {
-		font-size: 14px;
-	}
-	&.uni-btn-mini {
-		font-size: 12px;
-	}
+    &.uni-btn-small {
+        font-size: 14px;
+    }
+    &.uni-btn-mini {
+        font-size: 12px;
+    }
 
-	&.uni-btn-radius {
-		border-radius: 999px;
-	}
-	&[type=primary] {
-		@include is-color($uni-primary);
-		@include is-plain($uni-primary)
-	}
-	&[type=success] {
-		@include is-color($uni-success);
-		@include is-plain($uni-success)
-	}
-	&[type=error] {
-		@include is-color($uni-error);
-		@include is-plain($uni-error)
-	}
-	&[type=warning] {
-		@include is-color($uni-warning);
-		@include is-plain($uni-warning)
-	}
-	&[type=info] {
-		@include is-color($uni-info);
-		@include is-plain($uni-info)
-	}
+    &.uni-btn-radius {
+        border-radius: 999px;
+    }
+    &[type='primary'] {
+        @include is-color($uni-primary);
+        @include is-plain($uni-primary);
+    }
+    &[type='success'] {
+        @include is-color($uni-success);
+        @include is-plain($uni-success);
+    }
+    &[type='error'] {
+        @include is-color($uni-error);
+        @include is-plain($uni-error);
+    }
+    &[type='warning'] {
+        @include is-color($uni-warning);
+        @include is-plain($uni-warning);
+    }
+    &[type='info'] {
+        @include is-color($uni-info);
+        @include is-plain($uni-info);
+    }
 }
 /* #endif */