From 7388658c10d015e355cfee87c1a26948b1a73da4 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Thu, 13 Jun 2019 16:57:48 +0100 Subject: [PATCH 1/2] ::ng-deep fix. --- .../pages/graphql/graphql-page.component.scss | 2 +- .../apps/pages/news-dialog.component.scss | 2 +- .../pages/onboarding-dialog.component.scss | 46 ++++++++++--------- .../assets/pages/assets-page.component.scss | 2 +- .../content-history-page.component.scss | 2 +- .../contents/contents-page.component.scss | 6 ++- .../content/shared/array-item.component.scss | 2 +- .../shared/contents-selector.component.scss | 12 +++-- .../pages/dashboard-page.component.scss | 10 ++-- .../pages/schema/field-wizard.component.scss | 6 ++- .../pages/schemas/schema-form.component.scss | 10 ++-- .../angular/forms/code-editor.component.scss | 2 +- .../angular/forms/color-picker.component.scss | 2 +- .../angular/forms/json-editor.component.scss | 2 +- .../shared/components/asset.component.scss | 2 +- .../components/assets-selector.component.scss | 2 +- .../components/history-list.component.scss | 2 +- 17 files changed, 62 insertions(+), 50 deletions(-) diff --git a/src/Squidex/app/features/api/pages/graphql/graphql-page.component.scss b/src/Squidex/app/features/api/pages/graphql/graphql-page.component.scss index e47eee080..91ea94e93 100644 --- a/src/Squidex/app/features/api/pages/graphql/graphql-page.component.scss +++ b/src/Squidex/app/features/api/pages/graphql/graphql-page.component.scss @@ -1,7 +1,7 @@ @import '_vars'; @import '_mixins'; -::ng-deep { +:host ::ng-deep { @import '~graphiql/graphiql'; .graphiql-container { diff --git a/src/Squidex/app/features/apps/pages/news-dialog.component.scss b/src/Squidex/app/features/apps/pages/news-dialog.component.scss index 927e34891..beb51611a 100644 --- a/src/Squidex/app/features/apps/pages/news-dialog.component.scss +++ b/src/Squidex/app/features/apps/pages/news-dialog.component.scss @@ -1,7 +1,7 @@ @import '_vars'; @import '_mixins'; -::ng-deep { +:host ::ng-deep { img { @include box-shadow(0, 4px, 20px, .2); width: 80%; diff --git a/src/Squidex/app/features/apps/pages/onboarding-dialog.component.scss b/src/Squidex/app/features/apps/pages/onboarding-dialog.component.scss index 01f6bf120..3ae3573cb 100644 --- a/src/Squidex/app/features/apps/pages/onboarding-dialog.component.scss +++ b/src/Squidex/app/features/apps/pages/onboarding-dialog.component.scss @@ -19,31 +19,33 @@ p { max-width: 489px; } -::ng-deep .modal { - &-content, - &-dialog { - min-height: $size-height; - max-height: $size-height; - min-width: $size-width; - max-width: $size-width; - } +:host ::ng-deep { + .modal { + &-content, + &-dialog { + min-height: $size-height; + max-height: $size-height; + min-width: $size-width; + max-width: $size-width; + } - &-content { - color: $color-dark-foreground; - background-color: $color-dark-onboarding; - background-image: url('./images/onboarding-background.png'); - position: relative; - } + &-content { + color: $color-dark-foreground; + background-color: $color-dark-onboarding; + background-image: url('./images/onboarding-background.png'); + position: relative; + } - &-body, - &-content { - overflow: hidden; - } + &-body, + &-content { + overflow: hidden; + } - &-close { - text-decoration: underline !important; - cursor: pointer; - color: $color-dark-foreground; + &-close { + text-decoration: underline !important; + cursor: pointer; + color: $color-dark-foreground; + } } } diff --git a/src/Squidex/app/features/assets/pages/assets-page.component.scss b/src/Squidex/app/features/assets/pages/assets-page.component.scss index 1c98c09d3..98574b085 100644 --- a/src/Squidex/app/features/assets/pages/assets-page.component.scss +++ b/src/Squidex/app/features/assets/pages/assets-page.component.scss @@ -6,7 +6,7 @@ padding: 1rem; } -::ng-deep { +:host ::ng-deep { .search { .form-control { @include border-radius-right; diff --git a/src/Squidex/app/features/content/pages/content/content-history-page.component.scss b/src/Squidex/app/features/content/pages/content/content-history-page.component.scss index d7f4584de..5392a3fce 100644 --- a/src/Squidex/app/features/content/pages/content/content-history-page.component.scss +++ b/src/Squidex/app/features/content/pages/content/content-history-page.component.scss @@ -1,7 +1,7 @@ @import '_vars'; @import '_mixins'; -::ng-deep { +:host ::ng-deep { .user-ref { color: $color-title; } diff --git a/src/Squidex/app/features/content/pages/contents/contents-page.component.scss b/src/Squidex/app/features/content/pages/contents/contents-page.component.scss index 34cd61105..02124741c 100644 --- a/src/Squidex/app/features/content/pages/contents/contents-page.component.scss +++ b/src/Squidex/app/features/content/pages/contents/contents-page.component.scss @@ -1,8 +1,10 @@ @import '_vars'; @import '_mixins'; -::ng-deep .search-form { - display: block; +:host ::ng-deep { + .search-form { + display: block; + } } .content { diff --git a/src/Squidex/app/features/content/shared/array-item.component.scss b/src/Squidex/app/features/content/shared/array-item.component.scss index 976c37102..e8609d45e 100644 --- a/src/Squidex/app/features/content/shared/array-item.component.scss +++ b/src/Squidex/app/features/content/shared/array-item.component.scss @@ -1,7 +1,7 @@ @import '_vars'; @import '_mixins'; -::ng-deep { +:host ::ng-deep { .ui-separator { border-color: $color-border !important; font-size: 1.2rem; diff --git a/src/Squidex/app/features/content/shared/contents-selector.component.scss b/src/Squidex/app/features/content/shared/contents-selector.component.scss index 7ad2d6c0f..e3fbb5c9a 100644 --- a/src/Squidex/app/features/content/shared/contents-selector.component.scss +++ b/src/Squidex/app/features/content/shared/contents-selector.component.scss @@ -1,10 +1,12 @@ @import '_vars'; @import '_mixins'; -::ng-deep .modal-body { - background: $color-background; -} +:host ::ng-deep { + .modal-body { + background: $color-background; + } -::ng-deep .modal-tabs { - background: $color-dark-foreground; + .modal-tabs { + background: $color-dark-foreground; + } } \ No newline at end of file diff --git a/src/Squidex/app/features/dashboard/pages/dashboard-page.component.scss b/src/Squidex/app/features/dashboard/pages/dashboard-page.component.scss index 1868983c1..cc50f6886 100644 --- a/src/Squidex/app/features/dashboard/pages/dashboard-page.component.scss +++ b/src/Squidex/app/features/dashboard/pages/dashboard-page.component.scss @@ -19,10 +19,12 @@ } } -::ng-deep canvas { - height: 12rem !important; - margin-top: -1rem; - margin-bottom: 0; +:host ::ng-deep { + canvas { + height: 12rem !important; + margin-top: -1rem; + margin-bottom: 0; + } } .subtext { diff --git a/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.scss b/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.scss index fa8db78cb..230605fcd 100644 --- a/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.scss +++ b/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.scss @@ -3,8 +3,10 @@ $icon-size: 4.5rem; -::ng-deep .table-items-row-details-tab { - padding: 1.5rem 1.75rem; +:host ::ng-deep { + .table-items-row-details-tab { + padding: 1.5rem 1.75rem; + } } .form-group { diff --git a/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.scss b/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.scss index 803413d1f..7786056a4 100644 --- a/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.scss +++ b/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.scss @@ -8,10 +8,12 @@ $icon-size: 4.5rem; margin-left: -.5rem; } -::ng-deep .editor { - height: 15rem !important; - margin-bottom: .5rem; - margin-top: 0; +:host ::ng-deep { + .editor { + height: 15rem !important; + margin-bottom: .5rem; + margin-top: 0; + } } .name-group { diff --git a/src/Squidex/app/framework/angular/forms/code-editor.component.scss b/src/Squidex/app/framework/angular/forms/code-editor.component.scss index 0fb96d3fb..7d9334f08 100644 --- a/src/Squidex/app/framework/angular/forms/code-editor.component.scss +++ b/src/Squidex/app/framework/angular/forms/code-editor.component.scss @@ -3,7 +3,7 @@ // sass-lint:disable class-name-format -::ng-deep { +:host ::ng-deep { .ace_editor { background: $color-dark-foreground; border: 1px solid $color-input; diff --git a/src/Squidex/app/framework/angular/forms/color-picker.component.scss b/src/Squidex/app/framework/angular/forms/color-picker.component.scss index 8b35bf458..fcb18dcce 100644 --- a/src/Squidex/app/framework/angular/forms/color-picker.component.scss +++ b/src/Squidex/app/framework/angular/forms/color-picker.component.scss @@ -1,7 +1,7 @@ @import '_mixins'; @import '_vars'; -::ng-deep { +:host ::ng-deep { .color-picker { & { border-color: $color-border; diff --git a/src/Squidex/app/framework/angular/forms/json-editor.component.scss b/src/Squidex/app/framework/angular/forms/json-editor.component.scss index 0fb96d3fb..7d9334f08 100644 --- a/src/Squidex/app/framework/angular/forms/json-editor.component.scss +++ b/src/Squidex/app/framework/angular/forms/json-editor.component.scss @@ -3,7 +3,7 @@ // sass-lint:disable class-name-format -::ng-deep { +:host ::ng-deep { .ace_editor { background: $color-dark-foreground; border: 1px solid $color-input; diff --git a/src/Squidex/app/shared/components/asset.component.scss b/src/Squidex/app/shared/components/asset.component.scss index a1ed483fb..a8031ecf6 100644 --- a/src/Squidex/app/shared/components/asset.component.scss +++ b/src/Squidex/app/shared/components/asset.component.scss @@ -44,7 +44,7 @@ $list-height: 2.375rem; padding: 0; } -::ng-deep { +:host ::ng-deep { .form-control { &.disabled, &:disabled { diff --git a/src/Squidex/app/shared/components/assets-selector.component.scss b/src/Squidex/app/shared/components/assets-selector.component.scss index 0438b80c5..c92bab612 100644 --- a/src/Squidex/app/shared/components/assets-selector.component.scss +++ b/src/Squidex/app/shared/components/assets-selector.component.scss @@ -1,7 +1,7 @@ @import '_vars'; @import '_mixins'; -::ng-deep { +:host ::ng-deep { .search { .form-control { @include border-radius-right; diff --git a/src/Squidex/app/shared/components/history-list.component.scss b/src/Squidex/app/shared/components/history-list.component.scss index 5226994c0..90f465794 100644 --- a/src/Squidex/app/shared/components/history-list.component.scss +++ b/src/Squidex/app/shared/components/history-list.component.scss @@ -1,7 +1,7 @@ @import '_vars'; @import '_mixins'; -::ng-deep { +:host ::ng-deep { .user-ref { color: $color-title; } From aa0639ac54889fd46ba4374951544198ac49a749 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Thu, 13 Jun 2019 17:19:10 +0100 Subject: [PATCH 2/2] Fix deserialization of scheduled job. --- src/Squidex.Domain.Apps.Entities/Contents/ScheduleJob.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Squidex.Domain.Apps.Entities/Contents/ScheduleJob.cs b/src/Squidex.Domain.Apps.Entities/Contents/ScheduleJob.cs index 232e8b4a7..9936e98ef 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/ScheduleJob.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/ScheduleJob.cs @@ -22,10 +22,10 @@ namespace Squidex.Domain.Apps.Entities.Contents public Instant DueTime { get; } - public ScheduleJob(Guid id, Status status, RefToken by, Instant due) + public ScheduleJob(Guid id, Status status, RefToken scheduledBy, Instant due) { Id = id; - ScheduledBy = by; + ScheduledBy = scheduledBy; Status = status; DueTime = due; }