test/amis2
1
0
Fork 0
mirror of https://gitee.com/baidu/amis.git synced 2024-11-30 02:58:05 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix:popover&fieldset style (#2961)

Browse Source
This commit is contained in:
hsm-lv 2021-11-16 15:39:03 +08:00 committed by GitHub
parent 75d48ce94d
commit 5f20ad0b8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scss/components/_popover.scss
View File

@ -44,4 +44,11 @@
background: rgba(0, 0, 0, 0.3); background: rgba(0, 0, 0, 0.3);
} }
} }
&--leftBottomLeftTop {
transform: translateY(px2rem(4px));
}
&--leftTopLeftBottom {
transform: translateY(px2rem(-4px));
}
} }

5
scss/themes/_cxd-variables.scss
View File

@ -10,7 +10,7 @@ $primary: $B6;
$success: $S6; $success: $S6;
$warning: $W6; $warning: $W6;
$danger: $E6; $danger: $E6;
$light: #1ac5ff; $light: #eaf6fe;
$white: #fff; $white: #fff;
$secondary: $G6; $secondary: $G6;
@ -237,8 +237,7 @@ $R8: 50%;
--Collapse-header-bg: #{$G10}; --Collapse-header-bg: #{$G10};
--Collapse-header-onHover-bg: #{$G9}; --Collapse-header-onHover-bg: #{$G9};
--Collapse-header-collapsed-border: none; --Collapse-header-collapsed-border: none;
--Collapse-header-collapsed-borderTop: var(--borderWidth) solid --Collapse-header-collapsed-borderTop: none;
var(--Collapse-border-color);
--Collapse-header-collapsed-borderBottom: none; --Collapse-header-collapsed-borderBottom: none;
--Collapse-header-wrapper-direction: row-reverse; --Collapse-header-wrapper-direction: row-reverse;
--Collapse-content-padding: #{px2rem(16px)}; --Collapse-content-padding: #{px2rem(16px)};

28
scss/themes/cxd.scss
View File

@ -54,7 +54,6 @@
.#{$ns}Select { .#{$ns}Select {
.#{$ns}PopOver { .#{$ns}PopOver {
top: calc(var(--Form-input-height) + #{px2rem(4px)}) !important;
.#{$ns}Select-menu { .#{$ns}Select-menu {
border-radius: #{$R3}; border-radius: #{$R3};
.#{$ns}Select-option { .#{$ns}Select-option {
@ -67,7 +66,6 @@
.#{$ns}NestedSelectControl { .#{$ns}NestedSelectControl {
.#{$ns}PopOver { .#{$ns}PopOver {
top: calc(var(--Form-input-height) + #{px2rem(4px)}) !important;
.#{$ns}NestedSelect-menuOuter { .#{$ns}NestedSelect-menuOuter {
.#{$ns}NestedSelect-menu { .#{$ns}NestedSelect-menu {
border-radius: #{$R3}; border-radius: #{$R3};
@ -89,7 +87,6 @@
.#{$ns}TreeSelectControl { .#{$ns}TreeSelectControl {
.#{$ns}PopOver { .#{$ns}PopOver {
top: calc(var(--Form-input-height) + #{px2rem(4px)}) !important;
box-shadow: var(--boxShadow); box-shadow: var(--boxShadow);
.#{$ns}Tree { .#{$ns}Tree {
border-radius: #{$R3}; border-radius: #{$R3};
@ -100,7 +97,6 @@
.#{$ns}DropDown { .#{$ns}DropDown {
.#{$ns}DropDown-menu { .#{$ns}DropDown-menu {
top: calc(var(--Form-input-height) + #{px2rem(4px)}) !important;
border: none; border: none;
> li { > li {
color: #{$G2}; color: #{$G2};
@ -155,7 +151,6 @@
.#{$ns}ColorPicker { .#{$ns}ColorPicker {
.#{$ns}PopOver { .#{$ns}PopOver {
border: none; border: none;
top: calc(var(--Form-input-height) + #{px2rem(4px)}) !important;
box-shadow: var(--boxShadow); box-shadow: var(--boxShadow);
} }
} }
@ -164,7 +159,6 @@
.#{$ns}IconPickerControl-input--withAC { .#{$ns}IconPickerControl-input--withAC {
.#{$ns}IconPickerControl-sugsPanel { .#{$ns}IconPickerControl-sugsPanel {
border: none; border: none;
top: calc(var(--Form-input-height) + #{px2rem(4px)}) !important;
box-shadow: var(--boxShadow); box-shadow: var(--boxShadow);
border-radius: px2rem(3px); border-radius: px2rem(3px);
} }
@ -186,7 +180,6 @@
.#{$ns}LocationControl { .#{$ns}LocationControl {
.#{$ns}PopOver { .#{$ns}PopOver {
border: none; border: none;
top: calc(var(--Form-input-height) + #{px2rem(4px)}) !important;
box-shadow: var(--boxShadow); box-shadow: var(--boxShadow);
} }
} }
@ -244,6 +237,9 @@
} }
.#{$ns}Drawer--right { .#{$ns}Drawer--right {
.#{$ns}Drawer-header {
border-radius: #{$R4} 0 0 0;
}
.#{$ns}Drawer-footer { .#{$ns}Drawer-footer {
justify-content: flex-end; justify-content: flex-end;
.#{$ns}Button { .#{$ns}Button {
@ -253,6 +249,9 @@
} }
.#{$ns}Drawer--left { .#{$ns}Drawer--left {
.#{$ns}Drawer-header {
border-radius: 0 #{$R4} 0 0;
}
.#{$ns}Drawer-footer { .#{$ns}Drawer-footer {
.#{$ns}Button { .#{$ns}Button {
margin-left: #{px2rem(16px)}; margin-left: #{px2rem(16px)};
@ -260,8 +259,17 @@
} }
} }
.#{$ns}Drawer--top, .#{$ns}Drawer--top {
.#{$ns}Drawer-footer {
.#{$ns}Button {
margin-left: #{px2rem(16px)};
}
}
}
.#{$ns}Drawer--bottom { .#{$ns}Drawer--bottom {
.#{$ns}Drawer-header {
border-radius: #{$R4} #{$R4} 0 0;
}
.#{$ns}Drawer-footer { .#{$ns}Drawer-footer {
.#{$ns}Button { .#{$ns}Button {
margin-left: #{px2rem(16px)}; margin-left: #{px2rem(16px)};
@ -354,10 +362,6 @@
.#{$ns}Form { .#{$ns}Form {
.#{$ns}Collapse { .#{$ns}Collapse {
border: none; border: none;
&-arrow {
margin-left: px2rem(8px);
}
&-header { &-header {
background-color: var(--white); background-color: var(--white);
display: inline-flex; display: inline-flex;