Browse Source

Layout fixes.

pull/447/head
Sebastian 6 years ago
parent
commit
a76ca019b3
  1. 4
      frontend/app/features/rules/pages/rules/rule.component.html
  2. 2
      frontend/app/shared/components/asset.component.scss
  3. 16
      frontend/app/shared/components/schema-category.component.html
  4. 4
      frontend/app/shared/components/schema-category.component.scss
  5. 2
      frontend/app/theme/_vars.scss

4
frontend/app/features/rules/pages/rules/rule.component.html

@ -24,7 +24,7 @@
</div> </div>
<div class="card-body"> <div class="card-body">
<div class="row align-items-center"> <div class="row align-items-center">
<div class="col col-auto"> <div class="col-auto">
<h3>If</h3> <h3>If</h3>
</div> </div>
<div class="col"> <div class="col">
@ -32,7 +32,7 @@
<sqx-rule-element [type]="rule.triggerType" [element]="ruleTriggers[rule.triggerType]" [disabled]="isManual"></sqx-rule-element> <sqx-rule-element [type]="rule.triggerType" [element]="ruleTriggers[rule.triggerType]" [disabled]="isManual"></sqx-rule-element>
</span> </span>
</div> </div>
<div class="col col-auto"> <div class="col-auto">
<h3>then</h3> <h3>then</h3>
</div> </div>
<div class="col"> <div class="col">

2
frontend/app/shared/components/asset.component.scss

@ -57,6 +57,8 @@ $list-height: 2.375rem;
& { & {
@include overlay-container; @include overlay-container;
width: $asset-width; width: $asset-width;
border-top-width: 1px;
border-width: 1px;
} }
&-body, &-body,

16
frontend/app/shared/components/schema-category.component.html

@ -5,15 +5,19 @@
(cdkDropListDropped)="changeCategory($event)"> (cdkDropListDropped)="changeCategory($event)">
<div class="header clearfix"> <div class="header clearfix">
<div class="row no-gutters">
<div class="col-auto">
<button type="button" class="btn btn-sm btn-text-secondary" (click)="toggle()"> <button type="button" class="btn btn-sm btn-text-secondary" (click)="toggle()">
<i [class.icon-caret-right]="!snapshot.isOpen" [class.icon-caret-down]="snapshot.isOpen"></i> <i [class.icon-caret-right]="!snapshot.isOpen" [class.icon-caret-down]="snapshot.isOpen"></i>
</button> </button>
</div>
<h3>{{schemaCategory.name}} ({{snapshot.filtered.length}})</h3> <div class="col">
<h3 class="truncate">{{schemaCategory.name}} </h3>
<button type="button" class="btn btn-sm btn-text-secondary float-right" *ngIf="schemaCategory.schemas.length === 0 && !forContent" (click)="emitRemove()"> </div>
<i class="icon-bin2"></i> <div class="col-auto">
</button> ({{snapshot.filtered.length}})
</div>
</div>
</div> </div>
<div class="nav nav-panel nav-dark nav-dark-bordered flex-column" *ngIf="snapshot.isOpen" @fade> <div class="nav nav-panel nav-dark nav-dark-bordered flex-column" *ngIf="snapshot.isOpen" @fade>

4
frontend/app/shared/components/schema-category.component.scss

@ -3,8 +3,8 @@
$drag-margin: -8px; $drag-margin: -8px;
h3 { .col {
display: inline-block; overflow: hidden;
} }
.btn { .btn {

2
frontend/app/theme/_vars.scss

@ -101,7 +101,7 @@ $panel-header: 5.4rem;
$panel-sidebar: 3.75rem; $panel-sidebar: 3.75rem;
$panel-light-background: #fff; $panel-light-background: #fff;
$asset-width: 16rem; $asset-width: 14.5rem;
$asset-height: 19rem; $asset-height: 19rem;
$asset-header: 12rem; $asset-header: 12rem;
$asset-image: 12rem; $asset-image: 12rem;

Loading…
Cancel
Save