From a939fa24a232c6ec59eafa20be7a26d0a5f6a468 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Wed, 2 May 2018 15:57:33 -0500 Subject: [PATCH] fix(hover): remove ion-app .enable-hover css --- core/src/components/app/app.scss | 2 +- core/src/components/app/app.tsx | 4 +--- core/src/components/button/button.ios.scss | 6 +++--- core/src/components/button/button.md.scss | 12 ++++++------ core/src/components/searchbar/searchbar.ios.scss | 2 +- core/src/components/tab-button/tab-button.ios.scss | 2 +- core/src/components/tabbar/tabbar.md.scss | 2 +- core/src/components/toolbar/toolbar.ios.scss | 10 +++++----- core/src/components/toolbar/toolbar.md.scss | 10 +++++----- 9 files changed, 24 insertions(+), 26 deletions(-) diff --git a/core/src/components/app/app.scss b/core/src/components/app/app.scss index 008050806be..cdbd37a9bbb 100644 --- a/core/src/components/app/app.scss +++ b/core/src/components/app/app.scss @@ -64,7 +64,7 @@ a { background-color: transparent; } -.enable-hover a:not(.button):hover { +a:not(.button):hover { opacity: .7; } diff --git a/core/src/components/app/app.tsx b/core/src/components/app/app.tsx index d5cce9aeb05..bda5cb2576c 100644 --- a/core/src/components/app/app.tsx +++ b/core/src/components/app/app.tsx @@ -23,14 +23,12 @@ export class App { hostData() { const hybrid = isHybrid(this.win); - const hoverCSS = this.config.getBoolean('hoverCSS', !hybrid); const statusBar = this.config.getBoolean('statusbarPadding', hybrid); return { class: { [this.mode]: true, - 'statusbar-padding': statusBar, - 'enable-hover': hoverCSS + 'statusbar-padding': statusBar } }; } diff --git a/core/src/components/button/button.ios.scss b/core/src/components/button/button.ios.scss index 287a4f913ae..6e480a132a6 100644 --- a/core/src/components/button/button.ios.scss +++ b/core/src/components/button/button.ios.scss @@ -33,7 +33,7 @@ background-color: $button-ios-background-color-focused; } -.enable-hover .button-ios:hover { +.button-ios:hover { opacity: $button-ios-opacity-hover; } @@ -182,7 +182,7 @@ button[disabled], background-color: $button-ios-clear-background-color-focused; } -.enable-hover .button-clear-ios:hover { +.button-clear-ios:hover { color: $button-ios-clear-text-color-hover; opacity: $button-ios-clear-opacity-hover; } @@ -209,7 +209,7 @@ button[disabled], background-color: $bg-color-focused; } - .enable-hover .button-clear-ios-#{$color-name}:hover { + .button-clear-ios-#{$color-name}:hover { color: $fg-color; } } diff --git a/core/src/components/button/button.md.scss b/core/src/components/button/button.md.scss index ef748a3556f..7874695125a 100644 --- a/core/src/components/button/button.md.scss +++ b/core/src/components/button/button.md.scss @@ -29,7 +29,7 @@ color $button-md-transition-duration $button-md-transition-timing-function; } -.enable-hover .button-md:hover { +.button-md:hover { background-color: $button-md-background-color-hover; } @@ -66,7 +66,7 @@ button[disabled], background-color: $bg-color; } - .enable-hover .button-md-#{$color-name}:hover { + .button-md-#{$color-name}:hover { background-color: $bg-color; } @@ -134,7 +134,7 @@ button[disabled], box-shadow: $button-md-outline-box-shadow; } -.enable-hover .button-outline-md:hover { +.button-outline-md:hover { background-color: $button-md-outline-background-color-hover; } @@ -166,7 +166,7 @@ button[disabled], background-color: $button-md-outline-background-color; } - .enable-hover .button-outline-md-#{$color-name}:hover { + .button-outline-md-#{$color-name}:hover { background-color: $button-md-outline-background-color-hover; } @@ -204,7 +204,7 @@ button[disabled], background-color: $button-md-clear-background-color-focused; } -.enable-hover .button-clear-md:hover { +.button-clear-md:hover { background-color: $button-md-clear-background-color-hover; } @@ -235,7 +235,7 @@ button[disabled], background-color: $bg-color-focused; } - .enable-hover .button-clear-md-#{$color-name}:hover { + .button-clear-md-#{$color-name}:hover { color: $fg-color; } } diff --git a/core/src/components/searchbar/searchbar.ios.scss b/core/src/components/searchbar/searchbar.ios.scss index ce483cbd182..a2d6d818e40 100644 --- a/core/src/components/searchbar/searchbar.ios.scss +++ b/core/src/components/searchbar/searchbar.ios.scss @@ -166,7 +166,7 @@ color: $color-base; } - .enable-hover .searchbar-ios-#{$color-name} .searchbar-cancel-button-ios:hover { + .searchbar-ios-#{$color-name} .searchbar-cancel-button-ios:hover { color: $color-tint; } diff --git a/core/src/components/tab-button/tab-button.ios.scss b/core/src/components/tab-button/tab-button.ios.scss index a9511b3eb4b..52440f32ebb 100644 --- a/core/src/components/tab-button/tab-button.ios.scss +++ b/core/src/components/tab-button/tab-button.ios.scss @@ -22,7 +22,7 @@ $tab-button-ios-padding-start); } -.enable-hover .tab-button-ios:hover, +.tab-button-ios:hover, .tab-button-ios.tab-selected { color: $tab-button-ios-text-color-active; diff --git a/core/src/components/tabbar/tabbar.md.scss b/core/src/components/tabbar/tabbar.md.scss index dc44eb18aa5..54e7ba9f16c 100644 --- a/core/src/components/tabbar/tabbar.md.scss +++ b/core/src/components/tabbar/tabbar.md.scss @@ -39,7 +39,7 @@ background: $color-shade; } - .enable-hover .tabbar-md-#{$color-name} .tab-button:hover, + .tabbar-md-#{$color-name} .tab-button:hover, .tabbar-md-#{$color-name} .tab-button.tab-selected { color: $color-contrast; diff --git a/core/src/components/toolbar/toolbar.ios.scss b/core/src/components/toolbar/toolbar.ios.scss index 5369494b3f5..736e160c08a 100644 --- a/core/src/components/toolbar/toolbar.ios.scss +++ b/core/src/components/toolbar/toolbar.ios.scss @@ -171,9 +171,9 @@ } } - .enable-hover .bar-button-#{$color-name}-ios:hover, - .enable-hover .bar-button-clear-ios-#{$color-name}:hover, - .enable-hover .bar-button-ios-#{$color-name}:hover { + .bar-button-#{$color-name}-ios:hover, + .bar-button-clear-ios-#{$color-name}:hover, + .bar-button-ios-#{$color-name}:hover { color: $color-base; } @@ -203,7 +203,7 @@ } } -.enable-hover .bar-button-outline-ios:hover { +.bar-button-outline-ios:hover { opacity: .4; } @@ -243,7 +243,7 @@ } } -.enable-hover .bar-button-solid-ios:hover { +.bar-button-solid-ios:hover { opacity: .4; } diff --git a/core/src/components/toolbar/toolbar.md.scss b/core/src/components/toolbar/toolbar.md.scss index 358922f8595..df129b36ee5 100644 --- a/core/src/components/toolbar/toolbar.md.scss +++ b/core/src/components/toolbar/toolbar.md.scss @@ -174,9 +174,9 @@ background-color: transparent; } - .enable-hover .bar-button-#{$color-name}-md:hover, - .enable-hover .bar-button-clear-md-#{$color-name}:hover, - .enable-hover .bar-button-md-#{$color-name}:hover { + .bar-button-#{$color-name}-md:hover, + .bar-button-clear-md-#{$color-name}:hover, + .bar-button-md-#{$color-name}:hover { color: $color-base; } } @@ -209,7 +209,7 @@ } } -.enable-hover .bar-button-outline-md:hover { +.bar-button-outline-md:hover { opacity: .4; } @@ -245,7 +245,7 @@ } } -.enable-hover .bar-button-solid-md:hover { +.bar-button-solid-md:hover { color: $toolbar-md-button-background-color; }