javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-20 20:33:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Juan Miguel
2018-09-24 20:57:19 +02:00
committed by Manu MA
parent f68c457c06
commit 67eb661537
4 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/components/button/button.ios.scss
View File

@ -26,10 +26,11 @@
// iOS Solid Button // iOS Solid Button
// -------------------------------------------------- // --------------------------------------------------
@media (any-hover: hover) {
:host(.button-solid:hover) { :host(.button-solid:hover) {
--opacity: #{$button-ios-opacity-hover}; --opacity: #{$button-ios-opacity-hover};
} }
}
:host(.button-solid.activated) { :host(.button-solid.activated) {
--opacity: #{$button-ios-opacity-activated}; --opacity: #{$button-ios-opacity-activated};
@ -55,10 +56,11 @@
// iOS Clear Button // iOS Clear Button
// -------------------------------------------------- // --------------------------------------------------
@media (any-hover: hover) {
:host(.button-clear:hover) { :host(.button-clear:hover) {
--opacity: #{$button-ios-clear-opacity-hover}; --opacity: #{$button-ios-clear-opacity-hover};
} }
}
:host(.button-clear.activated) { :host(.button-clear.activated) {
--opacity: #{$button-ios-clear-opacity-activated}; --opacity: #{$button-ios-clear-opacity-activated};

2
core/src/components/buttons/buttons.ios.scss
View File

@ -40,9 +40,11 @@
// iOS Toolbar Button Solid // iOS Toolbar Button Solid
// -------------------------------------------------- // --------------------------------------------------
@media (any-hover: hover) {
::slotted(*) .button-solid-ios:hover { ::slotted(*) .button-solid-ios:hover {
opacity: .4; opacity: .4;
} }
}
// iOS Toolbar Button Icon // iOS Toolbar Button Icon

2
core/src/components/searchbar/searchbar.ios.scss
View File

@ -151,9 +151,11 @@
color: #{current-color(base)}; color: #{current-color(base)};
} }
@media (any-hover: hover) {
:host(.ion-color) .searchbar-cancel-button:hover { :host(.ion-color) .searchbar-cancel-button:hover {
color: #{current-color(tint)}; color: #{current-color(tint)};
} }
}
// Searchbar in Toolbar Color // Searchbar in Toolbar Color
// ----------------------------------------- // -----------------------------------------

7
core/src/components/tabbar/tab-button.scss
View File

@ -34,7 +34,12 @@
background: var(--background-focused); background: var(--background-focused);
} }
.tab-btn:hover, @media (any-hover: hover) {
.tab-btn:hover {
color: var(--color-selected);
}
}
.tab-btn-selected { .tab-btn-selected {
color: var(--color-selected); color: var(--color-selected);
} }