From 5f8783171078696349640f5a926cf1cad43f7b2e Mon Sep 17 00:00:00 2001 From: kooriookami <38392315+kooriookami@users.noreply.github.com> Date: Fri, 27 Aug 2021 20:28:56 +0800 Subject: [PATCH] style: checkbox support size prop both border or not (#3099) * style: checkbox support size prop both border or not * feat: update * style: update --- packages/components/checkbox/src/checkbox.vue | 2 +- packages/theme-chalk/src/checkbox.scss | 39 ++++++----- website/docs/en-US/checkbox.md | 50 +++++++++++--- website/docs/es/checkbox.md | 50 +++++++++++--- website/docs/fr-FR/checkbox.md | 50 +++++++++++--- website/docs/jp/checkbox.md | 66 ++++++++++++------- website/docs/zh-CN/checkbox.md | 50 +++++++++++--- 7 files changed, 233 insertions(+), 74 deletions(-) diff --git a/packages/components/checkbox/src/checkbox.vue b/packages/components/checkbox/src/checkbox.vue index 04d661d47e..737b7e0081 100644 --- a/packages/components/checkbox/src/checkbox.vue +++ b/packages/components/checkbox/src/checkbox.vue @@ -3,7 +3,7 @@ :id="id" class="el-checkbox" :class="[ - border && checkboxSize ? 'el-checkbox--' + checkboxSize : '', + checkboxSize ? 'el-checkbox--' + checkboxSize : '', { 'is-disabled': isDisabled }, { 'is-bordered': border }, { 'is-checked': isChecked } diff --git a/packages/theme-chalk/src/checkbox.scss b/packages/theme-chalk/src/checkbox.scss index edac825681..b0dd021035 100644 --- a/packages/theme-chalk/src/checkbox.scss +++ b/packages/theme-chalk/src/checkbox.scss @@ -6,13 +6,24 @@ @import 'mixins/_button'; @import 'mixins/utils'; +$--checkbox-height: () !default; +$--checkbox-height: map.merge( + ( + 'default': 40px, + 'medium': 36px, + 'small': 32px, + 'mini': 28px, + ), + $--checkbox-height +); + $--checkbox-bordered-padding: () !default; $--checkbox-bordered-padding: map.merge( ( - 'default': 9px 20px 9px 10px, - 'medium': 7px 20px 7px 10px, - 'small': 5px 15px 5px 10px, - 'mini': 3px 15px 3px 10px, + 'default': 0 20px 0 10px, + 'medium': 0 20px 0 10px, + 'small': 0 15px 0 10px, + 'mini': 0 15px 0 10px, ), $--checkbox-bordered-padding ); @@ -33,17 +44,6 @@ $--checkbox-bordered-input-width: map.merge( $--checkbox-bordered-input-width ); -$--checkbox-bordered-height: () !default; -$--checkbox-bordered-height: map.merge( - ( - 'default': 40px, - 'medium': 36px, - 'small': 32px, - 'mini': 28px, - ), - $--checkbox-bordered-height -); - @include b(checkbox) { @include set-component-css-var('checkbox', $--checkbox); } @@ -59,13 +59,19 @@ $--checkbox-bordered-height: map.merge( white-space: nowrap; user-select: none; margin-right: 30px; + height: map.get($--checkbox-height, 'default'); + + @each $size in (medium, small, mini) { + &.#{$namespace}-checkbox--#{$size} { + height: map.get($--checkbox-height, $size); + } + } @include when(bordered) { padding: map.get($--checkbox-bordered-padding, 'default'); border-radius: var(--el-border-radius-base); border: var(--el-border-base); box-sizing: border-box; - height: map.get($--checkbox-bordered-height, 'default'); &.is-checked { border-color: var(--el-color-primary); @@ -84,7 +90,6 @@ $--checkbox-bordered-height: map.merge( &.#{$namespace}-checkbox--#{$size} { padding: map.get($--checkbox-bordered-padding, $size); border-radius: map.get($--button-border-radius, $size); - height: map.get($--checkbox-bordered-height, $size); .#{$namespace}-checkbox__label { font-size: map.get($--button-font-size, $size); diff --git a/website/docs/en-US/checkbox.md b/website/docs/en-US/checkbox.md index 4c44043f67..520bf0cc4c 100644 --- a/website/docs/en-US/checkbox.md +++ b/website/docs/en-US/checkbox.md @@ -10,14 +10,35 @@ Checkbox can be used alone to switch between two states. ```html