Skip to content
This repository has been archived by the owner on Nov 14, 2023. It is now read-only.

fix: ui problems #280

Merged
merged 3 commits into from
Aug 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 36 additions & 0 deletions src/components/Button/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -146,3 +146,39 @@
box-shadow: none;
}

.btn-default[disabled]:hover,
.btn-default.disabled:hover,
.btn-default[disabled]:active,
.btn-default.disabled:active{
background-color: $white;
border-color: $border-2;
color: $text-2;
box-shadow: none;
}

.btn-success[disabled]:hover,
.btn-success.disabled:hover,
.btn-success[disabled]:active,
.btn-success.disabled:active{
background-color: $success-normal;
box-shadow: none;
}

.btn-warning[disabled]:hover,
.btn-warning.disabled:hover,
.btn-warning[disabled]:active,
.btn-warning.disabled:active{
background-color: $warning-normal;
box-shadow: none;
}

.btn-link.disabled,
.btn-link[disabled],
.btn-link[disabled]:hover,
.btn-link.disabled:hover,
.btn-link[disabled]:active,
.btn-link.disabled:active{
color: $primary-normal;
text-decoration: none;
}

2 changes: 1 addition & 1 deletion src/components/DatePicker/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
}
}
.rc-calendar{
top: 34px;
top: 32px;
}
}
10 changes: 10 additions & 0 deletions src/components/Popover/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,16 @@ const Popover: React.FC<PopoverProps> = props => {
target={wrapper.current || null}
show={show}
onHide={handleHide}
popperConfig={{
modifiers:[
{
name: 'offset',
options: {
offset: [0, 11],
},
},
]
}}
>
<BasePopover
id="popover"
Expand Down
2 changes: 1 addition & 1 deletion src/components/RangePicker/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
.rc-calendar {
border-color: $border-2;
box-shadow: $shadow-timePicker;
top: 44px;
top: 43px;
}

.rc-calendar-year-panel-selected-cell .rc-calendar-year-panel-year,
Expand Down
2 changes: 1 addition & 1 deletion src/components/TimePicker/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@
}

.rc-time-picker-panel-inner{
top: 42px;
top: 41px;
}