[superset] branch master updated: fix: Disabled state button transition time (#13008)

[erikrit]

This is an automated email from the ASF dual-hosted git repository.

erikrit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git


The following commit(s) were added to refs/heads/master by this push:
     new 6c9f315  fix: Disabled state button transition time (#13008)
6c9f315 is described below

commit 6c9f315b7764f332b5f2419f8b1685b269908da1
Author: AAfghahi <48933336+aafgh...@users.noreply.github.com>
AuthorDate: Wed Feb 10 23:36:33 2021 -0500

    fix: Disabled state button transition time (#13008)
    
    * 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
---
 superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx | 2 ++
 superset-frontend/src/common/components/Dropdown.tsx             | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx 
b/superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx
index c2534c6..18f2eba 100644
--- a/superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx
+++ b/superset-frontend/src/SqlLab/components/RunQueryActionButton.tsx
@@ -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;
     }
diff --git a/superset-frontend/src/common/components/Dropdown.tsx 
b/superset-frontend/src/common/components/Dropdown.tsx
index 0dc1883..001383e 100644
--- a/superset-frontend/src/common/components/Dropdown.tsx
+++ b/superset-frontend/src/common/components/Dropdown.tsx
@@ -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};
       }
@@ -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};
         }
       }