Skip to content

fix(radio/checkbox): 修复 radio/checkbox group 按钮形态属性 direction="column" 时样式异常 #1353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 30, 2022
Merged

fix(radio/checkbox): 修复 radio/checkbox group 按钮形态属性 direction="column" 时样式异常 #1353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3c21d78
fix(radio): 修复 radio-group 按钮形态属性 direction="column" 时样式异常
Zz-ZzzZ Sep 21, 2022
1ed6c41
fix(checkbox): 修复 checkbox-group 按钮形态属性 direction="column" 时样式异常
Zz-ZzzZ Sep 21, 2022
aee6968
fix(checkbox): 修复 checkbox-group 按钮形态属性 direction="column" 时样式异常
Zz-ZzzZ Sep 28, 2022
f57b722
fix(radio): 修复 radio-group 按钮形态属性 direction="column" 时样式异常
Zz-ZzzZ Sep 28, 2022
87c9404
fix(radio): 移除group中无用的box-shadow: none（因为radio-button并没有未定义box-shadow）
Zz-ZzzZ Sep 28, 2022
458e6bf
fix(checkbox): 将checkbox-button的box-shadow更改到group中(若不使用group时则不需要box…
Zz-ZzzZ Sep 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 50 additions & 12 deletions packages/devui-vue/devui/checkbox/src/checkbox-button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,9 @@ $checkbox-label-height-map: (
padding: 10px 20px;
cursor: pointer;
border: 1px solid $devui-disabled-line;
border-left: none;
display: inline-block;
line-height: 1;
user-select: none;
box-shadow: -1px 0 0 0 $devui-disabled-line;
@each $size in ('lg', 'md', 'sm') {
&.#{$devui-prefix}-checkbox-button--#{$size} {
font-size: map-get($font-size-map, #{$size});
Expand Down Expand Up @@ -81,20 +79,60 @@ $checkbox-label-height-map: (
border-color: $devui-disabled-line;
}
}
}

&:first-child {
.#{$devui-prefix}-checkbox-button__content {
border-top-left-radius: $devui-border-radius;
border-bottom-left-radius: $devui-border-radius;
border-left: 1px solid $devui-disabled-line;
box-shadow: none;
.#{$devui-prefix}-checkbox__group {
&.is-row {
.#{$devui-prefix}-checkbox-button {
&__content {
border-left: none;
box-shadow: -1px 0 0 0 $devui-disabled-line;
}

&:first-child {
.#{$devui-prefix}-checkbox-button__content {
border-top-left-radius: $devui-border-radius;
border-bottom-left-radius: $devui-border-radius;
border-left: 1px solid $devui-disabled-line;
box-shadow: none;
}
}

&:last-child {
.#{$devui-prefix}-checkbox-button__content {
border-top-right-radius: $devui-border-radius;
border-bottom-right-radius: $devui-border-radius;
}
}
}
}

&:last-child {
.#{$devui-prefix}-checkbox-button__content {
border-top-right-radius: $devui-border-radius;
border-bottom-right-radius: $devui-border-radius;
&.is-column {
.#{$devui-prefix}-checkbox-button {
width: 100%;
margin-top: 0;

&__content {
width: 100%;
border-top: none;
box-shadow: 0 -1px 0 0 $devui-disabled-line;
}

&:first-child {
.#{$devui-prefix}-checkbox-button__content {
border-top-left-radius: $devui-border-radius;
border-top-right-radius: $devui-border-radius;
border-top: 1px solid $devui-disabled-line;
box-shadow: none;
}
}

&:last-child {
.#{$devui-prefix}-checkbox-button__content {
border-bottom-left-radius: $devui-border-radius;
border-bottom-right-radius: $devui-border-radius;
}
}
}
}
}
42 changes: 33 additions & 9 deletions packages/devui-vue/devui/radio/src/radio-button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ $button-padding-map: (
color: $devui-text;
cursor: pointer;
border: 1px solid $devui-line;
border-left: none;
user-select: none;
@each $size in ('lg', 'md', 'sm') {
&.#{$devui-prefix}-radio-button--#{$size} {
Expand Down Expand Up @@ -69,16 +68,41 @@ $button-padding-map: (
background-color: #ffffff;
border-color: $devui-disabled-line;
}
}

.#{$devui-prefix}-radio-group {
&.is-row {
.#{$devui-prefix}-radio-button {
border-left: none;

&:first-child {
border-top-left-radius: $devui-border-radius;
border-bottom-left-radius: $devui-border-radius;
border-left: 1px solid $devui-disabled-line;
box-shadow: none;
&:first-child {
border-top-left-radius: $devui-border-radius;
border-bottom-left-radius: $devui-border-radius;
border-left: 1px solid $devui-disabled-line;
}

&:last-child {
border-top-right-radius: $devui-border-radius;
border-bottom-right-radius: $devui-border-radius;
}
}
}

&:last-child {
border-top-right-radius: $devui-border-radius;
border-bottom-right-radius: $devui-border-radius;
&.is-column {
.#{$devui-prefix}-radio-button {
width: 100%;
border-top: none;

&:first-child {
border-top-left-radius: $devui-border-radius;
border-top-right-radius: $devui-border-radius;
border-top: 1px solid $devui-disabled-line;
}

&:last-child {
border-bottom-left-radius: $devui-border-radius;
border-bottom-right-radius: $devui-border-radius;
}
}
}
}