Skip to content

Commit

Permalink
fix: Disabled state button transition time (apache#13008)
Browse files Browse the repository at this point in the history
* button fix

* tooltips disabled when it is disabled, border width changed

* added isDisabled to tooltip

* worked on transition times

* cleaned up transition to be local instead of global

* made it local

* linted

* trying to resolve a conflict
  • Loading branch information
AAfghahi authored and amitmiran137 committed Feb 14, 2021
1 parent 390029b commit ecf6f87
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ const onClick = (
const StyledButton = styled.span`
button {
line-height: 13px;
// this is to over ride a previous transition built into the component
transition: background-color 0ms;
&:last-of-type {
margin-right: ${({ theme }) => theme.gridUnit * 2}px;
}
Expand Down
6 changes: 4 additions & 2 deletions superset-frontend/src/common/components/Dropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ const StyledDropdownButton = styled.div`
margin: 0;
width: 120px;
}
:disabled {
&:disabled {
background-color: ${({ theme }) => theme.colors.grayscale.light2};
color: ${({ theme }) => theme.colors.grayscale.base};
}
Expand All @@ -102,7 +103,8 @@ const StyledDropdownButton = styled.div`
top: ${({ theme }) => theme.gridUnit * 0.75}px;
width: ${({ theme }) => theme.gridUnit * 0.25}px;
}
:disabled:before {
&:disabled:before {
border-left: 1px solid ${({ theme }) => theme.colors.grayscale.base};
}
}
Expand Down

0 comments on commit ecf6f87

Please sign in to comment.