Browse Source

A view styling improvements.

pull/370/head
Sebastian 7 years ago
parent
commit
ee8701a163
  1. 2
      src/Squidex/app/features/api/pages/graphql/graphql-page.component.scss
  2. 2
      src/Squidex/app/features/apps/pages/news-dialog.component.scss
  3. 2
      src/Squidex/app/features/apps/pages/onboarding-dialog.component.scss
  4. 2
      src/Squidex/app/features/assets/pages/assets-page.component.scss
  5. 2
      src/Squidex/app/features/content/pages/content/content-history-page.component.scss
  6. 2
      src/Squidex/app/features/content/pages/contents/contents-page.component.scss
  7. 2
      src/Squidex/app/features/content/shared/array-item.component.scss
  8. 4
      src/Squidex/app/features/content/shared/contents-selector.component.scss
  9. 2
      src/Squidex/app/features/dashboard/pages/dashboard-page.component.scss
  10. 8
      src/Squidex/app/features/rules/pages/rules/rule-wizard.component.html
  11. 2
      src/Squidex/app/features/rules/pages/rules/rule-wizard.component.scss
  12. 2
      src/Squidex/app/features/schemas/pages/schema/field-wizard.component.scss
  13. 2
      src/Squidex/app/features/schemas/pages/schemas/schema-form.component.scss
  14. 2
      src/Squidex/app/framework/angular/forms/code-editor.component.scss
  15. 2
      src/Squidex/app/framework/angular/forms/color-picker.component.scss
  16. 15
      src/Squidex/app/framework/angular/forms/form-alert.component.ts
  17. 2
      src/Squidex/app/framework/angular/forms/json-editor.component.scss
  18. 2
      src/Squidex/app/shared/components/asset.component.scss
  19. 2
      src/Squidex/app/shared/components/assets-selector.component.scss
  20. 2
      src/Squidex/app/shared/components/history-list.component.scss

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

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

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

@ -19,7 +19,7 @@ p {
max-width: 489px; max-width: 489px;
} }
:host /deep/ .modal { ::ng-deep .modal {
&-content, &-content,
&-dialog { &-dialog {
min-height: $size-height; min-height: $size-height;

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

@ -6,7 +6,7 @@
padding: 1rem; padding: 1rem;
} }
:host /deep/ { ::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';
:host /deep/ { ::ng-deep {
.user-ref { .user-ref {
color: $color-title; color: $color-title;
} }

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

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

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

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

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

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

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

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

8
src/Squidex/app/features/rules/pages/rules/rule-wizard.component.html

@ -22,6 +22,10 @@
<ng-container content> <ng-container content>
<div class="row no-gutters" *ngIf="step === 1"> <div class="row no-gutters" *ngIf="step === 1">
<sqx-form-alert marginTop="0">
The selection of the trigger type cannot be changed later.
</sqx-form-alert>
<div *ngFor="let triggerType of ruleTriggers | sqxKeys" class="col-12 col-md-6"> <div *ngFor="let triggerType of ruleTriggers | sqxKeys" class="col-12 col-md-6">
<div class="rule-element" (click)="selectTriggerType(triggerType)"> <div class="rule-element" (click)="selectTriggerType(triggerType)">
<sqx-rule-element [type]="triggerType" [isSmall]="false" [element]="ruleTriggers[triggerType]"></sqx-rule-element> <sqx-rule-element [type]="triggerType" [isSmall]="false" [element]="ruleTriggers[triggerType]"></sqx-rule-element>
@ -68,6 +72,10 @@
</ng-container> </ng-container>
<div class="row no-gutters" *ngIf="step === 3"> <div class="row no-gutters" *ngIf="step === 3">
<sqx-form-alert marginTop="0">
The selection of the action type cannot be changed later.
</sqx-form-alert>
<div *ngFor="let actionType of ruleActions | sqxKeys" class="col-12 col-md-6"> <div *ngFor="let actionType of ruleActions | sqxKeys" class="col-12 col-md-6">
<div class="rule-element" (click)="selectActionType(actionType)"> <div class="rule-element" (click)="selectActionType(actionType)">
<sqx-rule-element [type]="actionType" [isSmall]="false" [element]="ruleActions[actionType]"></sqx-rule-element> <sqx-rule-element [type]="actionType" [isSmall]="false" [element]="ruleActions[actionType]"></sqx-rule-element>

2
src/Squidex/app/features/rules/pages/rules/rule-wizard.component.scss

@ -2,7 +2,7 @@
@import '_mixins'; @import '_mixins';
.rule-element { .rule-element {
margin: .25rem; padding-right: .25rem;
} }
.wizard-title { .wizard-title {

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

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

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

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

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
:host /deep/ { ::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';
:host /deep/ { ::ng-deep {
.color-picker { .color-picker {
& { & {
border-color: $color-border; border-color: $color-border;

15
src/Squidex/app/framework/angular/forms/form-alert.component.ts

@ -9,8 +9,15 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
@Component({ @Component({
selector: 'sqx-form-alert', selector: 'sqx-form-alert',
styles: [`
:host {
display: block;
min-width: 100%;
max-width: 100%;
}
`],
template: ` template: `
<div class="alert alert-hint mt-2 {{class}}"> <div class="alert alert-hint mt-{{marginTop}} mb-{{marginBottom}} {{class}}">
<i class="icon-info-outline"></i> <ng-content></ng-content> <i class="icon-info-outline"></i> <ng-content></ng-content>
</div>`, </div>`,
changeDetection: ChangeDetectionStrategy.OnPush changeDetection: ChangeDetectionStrategy.OnPush
@ -18,4 +25,10 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
export class FormAlertComponent { export class FormAlertComponent {
@Input() @Input()
public class: string; public class: string;
@Input()
public marginTop = 2;
@Input()
public marginBottom = 4;
} }

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
:host /deep/ { ::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;
} }
:host /deep/ { ::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';
:host /deep/ { ::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';
:host /deep/ { ::ng-deep {
.user-ref { .user-ref {
color: $color-title; color: $color-title;
} }

Loading…
Cancel
Save