Browse Source

Merge branch 'master' into hateos_start

pull/363/head
Sebastian 7 years ago
parent
commit
21ce0b663d
  1. 4
      src/Squidex.Domain.Apps.Entities/Contents/ScheduleJob.cs
  2. 2
      src/Squidex/app/features/api/pages/graphql/graphql-page.component.scss
  3. 2
      src/Squidex/app/features/apps/pages/news-dialog.component.scss
  4. 46
      src/Squidex/app/features/apps/pages/onboarding-dialog.component.scss
  5. 2
      src/Squidex/app/features/assets/pages/assets-page.component.scss
  6. 2
      src/Squidex/app/features/content/pages/content/content-history-page.component.scss
  7. 6
      src/Squidex/app/features/content/pages/contents/contents-page.component.scss
  8. 2
      src/Squidex/app/features/content/shared/array-item.component.scss
  9. 12
      src/Squidex/app/features/content/shared/contents-selector.component.scss
  10. 10
      src/Squidex/app/features/dashboard/pages/dashboard-page.component.scss
  11. 6
      src/Squidex/app/features/schemas/pages/schema/field-wizard.component.scss
  12. 10
      src/Squidex/app/features/schemas/pages/schemas/schema-form.component.scss
  13. 2
      src/Squidex/app/framework/angular/forms/code-editor.component.scss
  14. 2
      src/Squidex/app/framework/angular/forms/color-picker.component.scss
  15. 2
      src/Squidex/app/framework/angular/forms/json-editor.component.scss
  16. 2
      src/Squidex/app/shared/components/asset.component.scss
  17. 2
      src/Squidex/app/shared/components/assets-selector.component.scss
  18. 2
      src/Squidex/app/shared/components/history-list.component.scss

4
src/Squidex.Domain.Apps.Entities/Contents/ScheduleJob.cs

@ -22,10 +22,10 @@ namespace Squidex.Domain.Apps.Entities.Contents
public Instant DueTime { get; } 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; Id = id;
ScheduledBy = by; ScheduledBy = scheduledBy;
Status = status; Status = status;
DueTime = due; DueTime = due;
} }

2
src/Squidex/app/features/api/pages/graphql/graphql-page.component.scss

@ -1,7 +1,7 @@
@import '_vars'; @import '_vars';
@import '_mixins'; @import '_mixins';
::ng-deep { :host ::ng-deep {
@import '~graphiql/graphiql'; @import '~graphiql/graphiql';
.graphiql-container { .graphiql-container {

2
src/Squidex/app/features/apps/pages/news-dialog.component.scss

@ -1,7 +1,7 @@
@import '_vars'; @import '_vars';
@import '_mixins'; @import '_mixins';
::ng-deep { :host ::ng-deep {
img { img {
@include box-shadow(0, 4px, 20px, .2); @include box-shadow(0, 4px, 20px, .2);
width: 80%; width: 80%;

46
src/Squidex/app/features/apps/pages/onboarding-dialog.component.scss

@ -19,31 +19,33 @@ p {
max-width: 489px; max-width: 489px;
} }
::ng-deep .modal { :host ::ng-deep {
&-content, .modal {
&-dialog { &-content,
min-height: $size-height; &-dialog {
max-height: $size-height; min-height: $size-height;
min-width: $size-width; max-height: $size-height;
max-width: $size-width; min-width: $size-width;
} max-width: $size-width;
}
&-content { &-content {
color: $color-dark-foreground; color: $color-dark-foreground;
background-color: $color-dark-onboarding; background-color: $color-dark-onboarding;
background-image: url('./images/onboarding-background.png'); background-image: url('./images/onboarding-background.png');
position: relative; position: relative;
} }
&-body, &-body,
&-content { &-content {
overflow: hidden; overflow: hidden;
} }
&-close { &-close {
text-decoration: underline !important; text-decoration: underline !important;
cursor: pointer; cursor: pointer;
color: $color-dark-foreground; color: $color-dark-foreground;
}
} }
} }

2
src/Squidex/app/features/assets/pages/assets-page.component.scss

@ -6,7 +6,7 @@
padding: 1rem; padding: 1rem;
} }
::ng-deep { :host ::ng-deep {
.search { .search {
.form-control { .form-control {
@include border-radius-right; @include border-radius-right;

2
src/Squidex/app/features/content/pages/content/content-history-page.component.scss

@ -1,7 +1,7 @@
@import '_vars'; @import '_vars';
@import '_mixins'; @import '_mixins';
::ng-deep { :host ::ng-deep {
.user-ref { .user-ref {
color: $color-title; color: $color-title;
} }

6
src/Squidex/app/features/content/pages/contents/contents-page.component.scss

@ -1,8 +1,10 @@
@import '_vars'; @import '_vars';
@import '_mixins'; @import '_mixins';
::ng-deep .search-form { :host ::ng-deep {
display: block; .search-form {
display: block;
}
} }
.content { .content {

2
src/Squidex/app/features/content/shared/array-item.component.scss

@ -1,7 +1,7 @@
@import '_vars'; @import '_vars';
@import '_mixins'; @import '_mixins';
::ng-deep { :host ::ng-deep {
.ui-separator { .ui-separator {
border-color: $color-border !important; border-color: $color-border !important;
font-size: 1.2rem; font-size: 1.2rem;

12
src/Squidex/app/features/content/shared/contents-selector.component.scss

@ -1,10 +1,12 @@
@import '_vars'; @import '_vars';
@import '_mixins'; @import '_mixins';
::ng-deep .modal-body { :host ::ng-deep {
background: $color-background; .modal-body {
} background: $color-background;
}
::ng-deep .modal-tabs { .modal-tabs {
background: $color-dark-foreground; background: $color-dark-foreground;
}
} }

10
src/Squidex/app/features/dashboard/pages/dashboard-page.component.scss

@ -19,10 +19,12 @@
} }
} }
::ng-deep canvas { :host ::ng-deep {
height: 12rem !important; canvas {
margin-top: -1rem; height: 12rem !important;
margin-bottom: 0; margin-top: -1rem;
margin-bottom: 0;
}
} }
.subtext { .subtext {

6
src/Squidex/app/features/schemas/pages/schema/field-wizard.component.scss

@ -3,8 +3,10 @@
$icon-size: 4.5rem; $icon-size: 4.5rem;
::ng-deep .table-items-row-details-tab { :host ::ng-deep {
padding: 1.5rem 1.75rem; .table-items-row-details-tab {
padding: 1.5rem 1.75rem;
}
} }
.form-group { .form-group {

10
src/Squidex/app/features/schemas/pages/schemas/schema-form.component.scss

@ -8,10 +8,12 @@ $icon-size: 4.5rem;
margin-left: -.5rem; margin-left: -.5rem;
} }
::ng-deep .editor { :host ::ng-deep {
height: 15rem !important; .editor {
margin-bottom: .5rem; height: 15rem !important;
margin-top: 0; margin-bottom: .5rem;
margin-top: 0;
}
} }
.name-group { .name-group {

2
src/Squidex/app/framework/angular/forms/code-editor.component.scss

@ -3,7 +3,7 @@
// sass-lint:disable class-name-format // sass-lint:disable class-name-format
::ng-deep { :host ::ng-deep {
.ace_editor { .ace_editor {
background: $color-dark-foreground; background: $color-dark-foreground;
border: 1px solid $color-input; border: 1px solid $color-input;

2
src/Squidex/app/framework/angular/forms/color-picker.component.scss

@ -1,7 +1,7 @@
@import '_mixins'; @import '_mixins';
@import '_vars'; @import '_vars';
::ng-deep { :host ::ng-deep {
.color-picker { .color-picker {
& { & {
border-color: $color-border; border-color: $color-border;

2
src/Squidex/app/framework/angular/forms/json-editor.component.scss

@ -3,7 +3,7 @@
// sass-lint:disable class-name-format // sass-lint:disable class-name-format
::ng-deep { :host ::ng-deep {
.ace_editor { .ace_editor {
background: $color-dark-foreground; background: $color-dark-foreground;
border: 1px solid $color-input; border: 1px solid $color-input;

2
src/Squidex/app/shared/components/asset.component.scss

@ -44,7 +44,7 @@ $list-height: 2.375rem;
padding: 0; padding: 0;
} }
::ng-deep { :host ::ng-deep {
.form-control { .form-control {
&.disabled, &.disabled,
&:disabled { &:disabled {

2
src/Squidex/app/shared/components/assets-selector.component.scss

@ -1,7 +1,7 @@
@import '_vars'; @import '_vars';
@import '_mixins'; @import '_mixins';
::ng-deep { :host ::ng-deep {
.search { .search {
.form-control { .form-control {
@include border-radius-right; @include border-radius-right;

2
src/Squidex/app/shared/components/history-list.component.scss

@ -1,7 +1,7 @@
@import '_vars'; @import '_vars';
@import '_mixins'; @import '_mixins';
::ng-deep { :host ::ng-deep {
.user-ref { .user-ref {
color: $color-title; color: $color-title;
} }

Loading…
Cancel
Save