fix(select): added pf-m-focus support for favorite __menu-items

patternfly · Aug 25, 2020 · 3fdaa5e · 3fdaa5e
1 parent 1a1a1a8
commit 3fdaa5e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 deletions.
diff --git a/src/patternfly/components/AppLauncher/app-launcher.scss b/src/patternfly/components/AppLauncher/app-launcher.scss
@@ -44,8 +44,6 @@
   --pf-c-app-launcher__menu-item--disabled--Color: var(--pf-global--Color--dark-200);
   --pf-c-app-launcher__menu-item--hover--BackgroundColor: var(--pf-global--BackgroundColor--light-300);
   --pf-c-app-launcher__menu-item--m-link--PaddingRight: 0;
-  --pf-c-app-launcher__menu-item--m-link--hover--BackgroundColor: transparent;
-  --pf-c-app-launcher__menu-item--m-action--hover--BackgroundColor: transparent;
   --pf-c-app-launcher__menu-item--m-action--Color: var(--pf-global--disabled-color--200);
   --pf-c-app-launcher__menu-item--m-action--Width: auto;
   --pf-c-app-launcher__menu-item--m-action--FontSize: var(--pf-global--icon--FontSize--sm);
@@ -177,12 +175,11 @@
     text-decoration: none;
   }
 
-  @at-root .pf-c-app-launcher__menu-wrapper,
-  & {
-    &:hover,
-    &:focus {
-      background-color: var(--pf-c-app-launcher__menu-item--hover--BackgroundColor);
-    }
+  @at-root .pf-c-app-launcher__menu-wrapper:hover,
+  .pf-c-app-launcher__menu-wrapper:focus-within,
+  &:hover,
+  &:focus {
+    background-color: var(--pf-c-app-launcher__menu-item--hover--BackgroundColor);
   }
 
   &:disabled,
@@ -215,11 +212,9 @@
 
   &.pf-m-link {
     --pf-c-app-launcher__menu-item--PaddingRight: var(--pf-c-app-launcher__menu-item--m-link--PaddingRight);
-    --pf-c-app-launcher__menu-item--hover--BackgroundColor: var(--pf-c-app-launcher__menu-item--m-link--hover--BackgroundColor);
   }
 
   &.pf-m-action {
-    --pf-c-app-launcher__menu-item--hover--BackgroundColor: var(--pf-c-app-launcher__menu-item--m-action--hover--BackgroundColor);
     --pf-c-app-launcher__menu-item--Color: var(--pf-c-app-launcher__menu-item--m-action--Color);
     --pf-c-app-launcher__menu-item--Width: var(--pf-c-app-launcher__menu-item--m-action--Width);
 

diff --git a/src/patternfly/components/Select/select.scss b/src/patternfly/components/Select/select.scss
@@ -94,9 +94,6 @@
   --pf-c-select__menu-item--focus--BackgroundColor: var(--pf-global--BackgroundColor--light-300);
   --pf-c-select__menu-item--disabled--BackgroundColor: transparent;
   --pf-c-select__menu-item--m-link--Width: auto;
-  --pf-c-select__menu-item--m-link--hover--BackgroundColor: transparent;
-  --pf-c-select__menu-item--m-link--focus--BackgroundColor: transparent;
-  --pf-c-select__menu-item--m-action--hover--BackgroundColor: transparent;
   --pf-c-select__menu-item--m-action--Color: var(--pf-global--disabled-color--200);
   --pf-c-select__menu-item--m-action--Width: auto;
   --pf-c-select__menu-item--m-action--FontSize: var(--pf-global--icon--FontSize--sm);
@@ -428,14 +425,11 @@
     --pf-c-select__menu-item-main--PaddingRight: 0;
     --pf-c-select__menu-item-description--PaddingRight: 0;
     --pf-c-select__menu-item--Width: var(--pf-c-select__menu-item--m-link--Width);
-    --pf-c-select__menu-item--hover--BackgroundColor: var(--pf-c-select__menu-item--m-link--hover--BackgroundColor);
-    --pf-c-select__menu-item--focus--BackgroundColor: var(--pf-c-select__menu-item--m-link--focus--BackgroundColor);
 
     flex-grow: 1;
   }
 
   &.pf-m-action {
-    --pf-c-select__menu-item--hover--BackgroundColor: var(--pf-c-select__menu-item--m-action--hover--BackgroundColor);
     --pf-c-select__menu-item--Color: var(--pf-c-select__menu-item--m-action--Color);
     --pf-c-select__menu-item--Width: var(--pf-c-select__menu-item--m-action--Width);