fix: touchOnly not working as expected

This commit is contained in:
Johannes 2020-07-01 15:17:09 +02:00
parent a839e2e820
commit 823f2e1fc3
7 changed files with 17 additions and 18 deletions

View file

@ -40,8 +40,7 @@
"styles": [
"src/styles.scss"
],
"scripts": [
],
"scripts": [],
"webWorkerTsConfig": "src/tsconfig.worker.json"
},
"configurations": {
@ -100,8 +99,7 @@
"styles": [
"src/styles.scss"
],
"scripts": [
],
"scripts": [],
"assets": [
"src/favicon.ico",
"src/assets",
@ -156,11 +154,12 @@
},
"defaultProject": "sp2",
"cli": {
"defaultCollection": "@ngrx/schematics"
"defaultCollection": "@ngrx/schematics",
"analytics": false
},
"schematics": {
"@schematics/angular:component": {
"style": "scss"
}
}
}
}

View file

@ -98,8 +98,8 @@ export enum BodyClass {
isExtension = 'isExtension',
isAdvancedFeatures = 'isAdvancedFeatures',
isNoAdvancedFeatures = 'isNoAdvancedFeatures',
isTouchOnlyDevice = 'isTouchOnlyDevice',
isNoTouchOnlyDevice = 'isNoTouchOnlyDevice',
isTouchOnly = 'isTouchOnly',
isNoTouchOnly = 'isNoTouchOnly',
isLightTheme = 'isLightTheme',
isDarkTheme = 'isDarkTheme',
isDisableBackgroundGradient = 'isDisableBackgroundGradient',

View file

@ -141,9 +141,9 @@ export class GlobalThemeService {
}
if (isTouchOnly()) {
this.document.body.classList.add(BodyClass.isTouchOnlyDevice);
this.document.body.classList.add(BodyClass.isTouchOnly);
} else {
this.document.body.classList.add(BodyClass.isNoTouchOnlyDevice);
this.document.body.classList.add(BodyClass.isNoTouchOnly);
}
}

View file

@ -56,11 +56,11 @@ $task-c-selected-bg-dark: $dark-theme-bg-slightly-lighter;
@mixin isHostFocus($direct-parent-only-sel: false) {
@if $direct-parent-only-sel {
:host-context(.isNoTouchOnlyDevice):focus > #{$direct-parent-only-sel} > & {
:host-context(.isNoTouchOnly):focus > #{$direct-parent-only-sel} > & {
@content;
}
} @else {
:host-context(.isNoTouchOnlyDevice):focus & {
:host-context(.isNoTouchOnly):focus & {
@content;
}
}

View file

@ -272,7 +272,7 @@
}
@include mq(xs, max) {
:host-context(.isTouchOnlyDevice) & {
:host-context(.isTouchOnly) & {
display: none !important;
}
}
@ -767,7 +767,7 @@ $this-play-size: 22px;
transform-origin: left top;
transition-property: all;
:host-context(.isNoTouchOnlyDevice) & {
:host-context(.isNoTouchOnly) & {
opacity: 0;
}

View file

@ -54,7 +54,7 @@
}
@include mq(xs, max) {
.isNoTouchOnlyDevice {
.isNoTouchOnly {
@include _scrollBarStyles;
}
}

View file

@ -1,11 +1,11 @@
@mixin touchOnlyDevice {
:host-context(.isTouchOnlyDevice) & {
:host-context(.isTouchOnly) & {
@content;
}
}
@mixin noTouchOnlyDevice {
:host-context(.isNoTouchOnlyDevice) & {
@mixin noTouchOnly {
:host-context(.isNoTouchOnly) & {
@content;
}
}