Skip to content

Commit

Permalink
fix(hover): remove ion-app .enable-hover css
Browse files Browse the repository at this point in the history
  • Loading branch information
adamdbradley committed May 2, 2018
1 parent 3b5365d commit a939fa2
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 26 deletions.
2 changes: 1 addition & 1 deletion core/src/components/app/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ a {
background-color: transparent;
}

.enable-hover a:not(.button):hover {
a:not(.button):hover {
opacity: .7;
}

Expand Down
4 changes: 1 addition & 3 deletions core/src/components/app/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
};
}
Expand Down
6 changes: 3 additions & 3 deletions core/src/components/button/button.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
background-color: $button-ios-background-color-focused;
}

.enable-hover .button-ios:hover {
.button-ios:hover {
opacity: $button-ios-opacity-hover;
}

Expand Down Expand Up @@ -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;
}
Expand All @@ -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;
}
}
Expand Down
12 changes: 6 additions & 6 deletions core/src/components/button/button.md.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/searchbar/searchbar.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion core/src/components/tab-button/tab-button.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion core/src/components/tabbar/tabbar.md.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
10 changes: 5 additions & 5 deletions core/src/components/toolbar/toolbar.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -203,7 +203,7 @@
}
}

.enable-hover .bar-button-outline-ios:hover {
.bar-button-outline-ios:hover {
opacity: .4;
}

Expand Down Expand Up @@ -243,7 +243,7 @@
}
}

.enable-hover .bar-button-solid-ios:hover {
.bar-button-solid-ios:hover {
opacity: .4;
}

Expand Down
10 changes: 5 additions & 5 deletions core/src/components/toolbar/toolbar.md.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down Expand Up @@ -209,7 +209,7 @@
}
}

.enable-hover .bar-button-outline-md:hover {
.bar-button-outline-md:hover {
opacity: .4;
}

Expand Down Expand Up @@ -245,7 +245,7 @@
}
}

.enable-hover .bar-button-solid-md:hover {
.bar-button-solid-md:hover {
color: $toolbar-md-button-background-color;
}

Expand Down

0 comments on commit a939fa2

Please sign in to comment.