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

fix(hover): remove ion-app .enable-hover css

Browse Source
This commit is contained in:
Adam Bradley
2018-05-02 15:57:33 -05:00
parent 3b5365dd8a
commit a939fa24a2
9 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/components/app/app.scss
View File

@ -64,7 +64,7 @@ a {
background-color: transparent; background-color: transparent;
} }
.enable-hover a:not(.button):hover { a:not(.button):hover {
opacity: .7; opacity: .7;
} }

4
core/src/components/app/app.tsx
View File

@ -23,14 +23,12 @@ export class App {
hostData() { hostData() {
const hybrid = isHybrid(this.win); const hybrid = isHybrid(this.win);
const hoverCSS = this.config.getBoolean('hoverCSS', !hybrid);
const statusBar = this.config.getBoolean('statusbarPadding', hybrid); const statusBar = this.config.getBoolean('statusbarPadding', hybrid);
return { return {
class: { class: {
[this.mode]: true, [this.mode]: true,
'statusbar-padding': statusBar, 'statusbar-padding': statusBar
'enable-hover': hoverCSS
} }
}; };
} }

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

@ -33,7 +33,7 @@
background-color: $button-ios-background-color-focused; background-color: $button-ios-background-color-focused;
} }
.enable-hover .button-ios:hover { .button-ios:hover {
opacity: $button-ios-opacity-hover; opacity: $button-ios-opacity-hover;
} }
@ -182,7 +182,7 @@ button[disabled],
background-color: $button-ios-clear-background-color-focused; 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; color: $button-ios-clear-text-color-hover;
opacity: $button-ios-clear-opacity-hover; opacity: $button-ios-clear-opacity-hover;
} }
@ -209,7 +209,7 @@ button[disabled],
background-color: $bg-color-focused; background-color: $bg-color-focused;
} }
.enable-hover .button-clear-ios-#{$color-name}:hover { .button-clear-ios-#{$color-name}:hover {
color: $fg-color; color: $fg-color;
} }
} }

12
core/src/components/button/button.md.scss
View File

@ -29,7 +29,7 @@
color $button-md-transition-duration $button-md-transition-timing-function; 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; background-color: $button-md-background-color-hover;
} }
@ -66,7 +66,7 @@ button[disabled],
background-color: $bg-color; background-color: $bg-color;
} }
.enable-hover .button-md-#{$color-name}:hover { .button-md-#{$color-name}:hover {
background-color: $bg-color; background-color: $bg-color;
} }
@ -134,7 +134,7 @@ button[disabled],
box-shadow: $button-md-outline-box-shadow; 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; background-color: $button-md-outline-background-color-hover;
} }
@ -166,7 +166,7 @@ button[disabled],
background-color: $button-md-outline-background-color; 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; background-color: $button-md-outline-background-color-hover;
} }
@ -204,7 +204,7 @@ button[disabled],
background-color: $button-md-clear-background-color-focused; 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; background-color: $button-md-clear-background-color-hover;
} }
@ -235,7 +235,7 @@ button[disabled],
background-color: $bg-color-focused; background-color: $bg-color-focused;
} }
.enable-hover .button-clear-md-#{$color-name}:hover { .button-clear-md-#{$color-name}:hover {
color: $fg-color; color: $fg-color;
} }
} }

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

@ -166,7 +166,7 @@
color: $color-base; 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; color: $color-tint;
} }

2
core/src/components/tab-button/tab-button.ios.scss
View File

@ -22,7 +22,7 @@
$tab-button-ios-padding-start); $tab-button-ios-padding-start);
} }
.enable-hover .tab-button-ios:hover, .tab-button-ios:hover,
.tab-button-ios.tab-selected { .tab-button-ios.tab-selected {
color: $tab-button-ios-text-color-active; color: $tab-button-ios-text-color-active;

2
core/src/components/tabbar/tabbar.md.scss
View File

@ -39,7 +39,7 @@
background: $color-shade; 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 { .tabbar-md-#{$color-name} .tab-button.tab-selected {
color: $color-contrast; color: $color-contrast;

10
core/src/components/toolbar/toolbar.ios.scss
View File

@ -171,9 +171,9 @@
} }
} }
.enable-hover .bar-button-#{$color-name}-ios:hover, .bar-button-#{$color-name}-ios:hover,
.enable-hover .bar-button-clear-ios-#{$color-name}:hover, .bar-button-clear-ios-#{$color-name}:hover,
.enable-hover .bar-button-ios-#{$color-name}:hover { .bar-button-ios-#{$color-name}:hover {
color: $color-base; color: $color-base;
} }
@ -203,7 +203,7 @@
} }
} }
.enable-hover .bar-button-outline-ios:hover { .bar-button-outline-ios:hover {
opacity: .4; opacity: .4;
} }
@ -243,7 +243,7 @@
} }
} }
.enable-hover .bar-button-solid-ios:hover { .bar-button-solid-ios:hover {
opacity: .4; opacity: .4;
} }

10
core/src/components/toolbar/toolbar.md.scss
View File

@ -174,9 +174,9 @@
background-color: transparent; background-color: transparent;
} }
.enable-hover .bar-button-#{$color-name}-md:hover, .bar-button-#{$color-name}-md:hover,
.enable-hover .bar-button-clear-md-#{$color-name}:hover, .bar-button-clear-md-#{$color-name}:hover,
.enable-hover .bar-button-md-#{$color-name}:hover { .bar-button-md-#{$color-name}:hover {
color: $color-base; color: $color-base;
} }
} }
@ -209,7 +209,7 @@
} }
} }
.enable-hover .bar-button-outline-md:hover { .bar-button-outline-md:hover {
opacity: .4; opacity: .4;
} }
@ -245,7 +245,7 @@
} }
} }
.enable-hover .bar-button-solid-md:hover { .bar-button-solid-md:hover {
color: $toolbar-md-button-background-color; color: $toolbar-md-button-background-color;
} }