Browse Source

Checkbox fixed

PAdding in fields view fixed.
pull/289/head
Sebastian 8 years ago
parent
commit
16a88e79f3
  1. 6
      src/Squidex/app/features/content/pages/content/content-field.component.html
  2. 6
      src/Squidex/app/features/schemas/pages/schema/schema-page.component.html
  3. 10
      src/Squidex/app/features/schemas/pages/schema/schema-page.component.scss

6
src/Squidex/app/features/content/pages/content/content-field.component.html

@ -79,7 +79,7 @@
<ng-container class="form-check form-check-inline" *ngFor="let value of field.properties['allowedValues']"> <ng-container class="form-check form-check-inline" *ngFor="let value of field.properties['allowedValues']">
<input class="form-check-input" type="radio" value="{{value}}" [formControl]="selectedFormControl" /> <input class="form-check-input" type="radio" value="{{value}}" [formControl]="selectedFormControl" />
<label class="form-check-label"> <label class="form-check-label">
{{value}} {{value}}
</label> </label>
</ng-container> </ng-container>
</ng-container> </ng-container>
@ -91,9 +91,7 @@
<sqx-toggle [formControl]="selectedFormControl"></sqx-toggle> <sqx-toggle [formControl]="selectedFormControl"></sqx-toggle>
</ng-container> </ng-container>
<ng-container *ngSwitchCase="'Checkbox'"> <ng-container *ngSwitchCase="'Checkbox'">
<ng-container class="form-check form-check-inline"> <input type="checkbox" [formControl]="selectedFormControl" sqxIndeterminateValue />
<input class="form-check-input" type="checkbox" [formControl]="selectedFormControl" sqxIndeterminateValue />
</ng-container>
</ng-container> </ng-container>
</ng-container> </ng-container>
</ng-container> </ng-container>

6
src/Squidex/app/features/schemas/pages/schema/schema-page.component.html

@ -60,8 +60,10 @@
</div> </div>
<div dnd-sortable-container [sortableData]="schema.fields"> <div dnd-sortable-container [sortableData]="schema.fields">
<div *ngFor="let field of schema.fields; let i = index;" dnd-sortable [sortableIndex]="i" (sqxSorted)="sortFields($event)"> <div class="schemas">
<sqx-field [field]="field" [schema]="schema" [patterns]="patternsState.patterns | async"></sqx-field> <div *ngFor="let field of schema.fields; let i = index;" dnd-sortable [sortableIndex]="i" (sqxSorted)="sortFields($event)">
<sqx-field [field]="field" [schema]="schema" [patterns]="patternsState.patterns | async"></sqx-field>
</div>
</div> </div>
<button class="btn btn-success field-button" (click)="addFieldDialog.show()"> <button class="btn btn-success field-button" (click)="addFieldDialog.show()">

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

@ -24,6 +24,10 @@
margin-right: 1rem; margin-right: 1rem;
} }
.schemas {
padding-bottom: 7rem;
}
.schema { .schema {
&-edit { &-edit {
color: $color-border-dark; color: $color-border-dark;
@ -44,7 +48,7 @@
& { & {
@include circle(5.25rem); @include circle(5.25rem);
@include box-shadow(0, 8px, 16px, .3); @include box-shadow(0, 8px, 16px, .3);
@include absolute(auto, 5rem, 1rem, auto); @include absolute(auto, 6rem, 1rem, auto);
} }
&-icon { &-icon {
@ -56,10 +60,6 @@
} }
} }
.panel-content-scroll {
padding-bottom: 7rem;
}
.dnd-sortable-drag { .dnd-sortable-drag {
border: 0; border: 0;
} }
Loading…
Cancel
Save