fix(button): disable :hover on non supported devices (#15705)

ionic-team · Sep 24, 2018 · 67eb661 · 67eb661
1 parent f68c457
commit 67eb661
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 12 deletions.
diff --git a/core/src/components/button/button.ios.scss b/core/src/components/button/button.ios.scss
@@ -26,9 +26,10 @@
 
 // iOS Solid Button
 // --------------------------------------------------
-
-:host(.button-solid:hover) {
-  --opacity: #{$button-ios-opacity-hover};
+@media (any-hover: hover) {
+  :host(.button-solid:hover) {
+    --opacity: #{$button-ios-opacity-hover};
+  }
 }
 
 :host(.button-solid.activated) {
@@ -55,9 +56,10 @@
 
 // iOS Clear Button
 // --------------------------------------------------
-
-:host(.button-clear:hover) {
-  --opacity: #{$button-ios-clear-opacity-hover};
+@media (any-hover: hover) {
+  :host(.button-clear:hover) {
+    --opacity: #{$button-ios-clear-opacity-hover};
+  }
 }
 
 :host(.button-clear.activated) {

diff --git a/core/src/components/buttons/buttons.ios.scss b/core/src/components/buttons/buttons.ios.scss
@@ -40,8 +40,10 @@
 // iOS Toolbar Button Solid
 // --------------------------------------------------
 
-::slotted(*) .button-solid-ios:hover {
-  opacity: .4;
+@media (any-hover: hover) {
+  ::slotted(*) .button-solid-ios:hover {
+    opacity: .4;
+  }
 }
 
 

diff --git a/core/src/components/searchbar/searchbar.ios.scss b/core/src/components/searchbar/searchbar.ios.scss
@@ -151,8 +151,10 @@
   color: #{current-color(base)};
 }
 
-:host(.ion-color) .searchbar-cancel-button:hover {
-  color: #{current-color(tint)};
+@media (any-hover: hover) {
+  :host(.ion-color) .searchbar-cancel-button:hover {
+    color: #{current-color(tint)};
+  }
 }
 
 // Searchbar in Toolbar Color

diff --git a/core/src/components/tabbar/tab-button.scss b/core/src/components/tabbar/tab-button.scss
@@ -34,7 +34,12 @@
   background: var(--background-focused);
 }
 
-.tab-btn:hover,
+@media (any-hover: hover) {
+  .tab-btn:hover {
+    color: var(--color-selected);
+  }
+}
+
 .tab-btn-selected {
   color: var(--color-selected);
 }
@@ -125,4 +130,4 @@
 
 .tab-btn-selected .tab-btn-icon {
   transform: var(--icon-transform-selected);
-}
+}