Browse Source

rule node style improve

pull/8661/head
kalytka 3 years ago
parent
commit
87cbe96c3b
  1. 2
      ui-ngx/src/app/modules/home/components/details-panel.component.html
  2. 10
      ui-ngx/src/app/modules/home/components/details-panel.component.scss
  3. 10
      ui-ngx/src/app/modules/home/components/relation/relation-filters.component.html
  4. 1
      ui-ngx/src/app/modules/home/components/relation/relation-filters.component.scss
  5. 2
      ui-ngx/src/app/modules/home/pages/rulechain/rule-node-details.component.html
  6. 6
      ui-ngx/src/app/modules/home/pages/rulechain/rule-node-details.component.scss

2
ui-ngx/src/app/modules/home/components/details-panel.component.html

@ -65,6 +65,6 @@
</section> </section>
</mat-toolbar> </mat-toolbar>
</header> </header>
<div fxFlex class="mat-content" [ngStyle]="{backgroundColor: backgroundColor}"> <div fxFlex class="mat-content reset-style" [ngStyle]="{backgroundColor: backgroundColor}">
<ng-content></ng-content> <ng-content></ng-content>
</div> </div>

10
ui-ngx/src/app/modules/home/components/details-panel.component.scss

@ -20,12 +20,22 @@
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.mat-toolbar.details-toolbar { .mat-toolbar.details-toolbar {
padding: 0; padding: 0;
} }
} }
:host ::ng-deep { :host ::ng-deep {
.reset-style {
color: rgba(0, 0, 0, 0.6);;
//font-family: "Arial";
line-height: 24px;
//font-weight: 500;
letter-spacing: 0.5px;
}
.mat-toolbar-tools { .mat-toolbar-tools {
height: 100%; height: 100%;
min-height: 60px; min-height: 60px;

10
ui-ngx/src/app/modules/home/components/relation/relation-filters.component.html

@ -22,13 +22,13 @@
fxLayoutAlign="start center" formArrayName="relationFilters" fxLayoutAlign="start center" formArrayName="relationFilters"
*ngFor="let relationFilterControl of relationFiltersFormArray.controls; let $index = index"> *ngFor="let relationFilterControl of relationFiltersFormArray.controls; let $index = index">
<div fxFlex fxLayout="row" fxLayoutAlign="start center"> <div fxFlex fxLayout="row" fxLayoutAlign="start center">
<div class="input-block" fxFlex fxLayout="row" fxLayoutAlign="start center"> <div class="input-block" fxFlex fxLayout="row" fxLayoutAlign="start center" style="margin-right: 8px">
<tb-relation-type-autocomplete <tb-relation-type-autocomplete fxFlex="50"
style="width: 200px; min-width: 200px;"
subscriptSizing="dynamic" subscriptSizing="dynamic"
style="min-width: 200px;"
[formControl]="relationFilterControl.get('relationType')"> [formControl]="relationFilterControl.get('relationType')">
</tb-relation-type-autocomplete> </tb-relation-type-autocomplete>
<tb-entity-type-list style="margin-left: 30px" fxFlex <tb-entity-type-list style="margin-left: 30px" fxFlex="50"
subscriptSizing="dynamic" subscriptSizing="dynamic"
[allowedEntityTypes]="allowedEntityTypes" [allowedEntityTypes]="allowedEntityTypes"
[formControl]="relationFilterControl.get('entityTypes')"> [formControl]="relationFilterControl.get('entityTypes')">
@ -49,7 +49,7 @@
<span fxLayoutAlign="center center" <span fxLayoutAlign="center center"
class="tb-prompt" translate>relation.any-relation</span> class="tb-prompt" translate>relation.any-relation</span>
</div> </div>
<div style="margin-top: 8px"> <div style="margin: 5px 0px 15px">
<button mat-stroked-button color="primary" <button mat-stroked-button color="primary"
[disabled]="isLoading$ | async" [disabled]="isLoading$ | async"
(click)="addFilter()" (click)="addFilter()"

1
ui-ngx/src/app/modules/home/components/relation/relation-filters.component.scss

@ -16,6 +16,7 @@
:host { :host {
.tb-relation-filters { .tb-relation-filters {
max-width: calc(100vw - 48px); max-width: calc(100vw - 48px);
margin-top: 2px;
overflow: hidden; overflow: hidden;
.container{ .container{

2
ui-ngx/src/app/modules/home/pages/rulechain/rule-node-details.component.html

@ -55,7 +55,7 @@
<div formGroupName="additionalInfo" fxLayout="column"> <div formGroupName="additionalInfo" fxLayout="column">
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>rulenode.rule-node-description</mat-label> <mat-label translate>rulenode.rule-node-description</mat-label>
<textarea matInput formControlName="description" rows="2"></textarea> <textarea matInput formControlName="description" rows="1"></textarea>
</mat-form-field> </mat-form-field>
</div> </div>
</section> </section>

6
ui-ngx/src/app/modules/home/pages/rulechain/rule-node-details.component.scss

@ -27,12 +27,16 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: 8px; gap: 8px;
margin-bottom: 5px;
@media #{$mat-gt-sm} {
margin-bottom: 24px;
}
} }
@media #{$mat-gt-sm} { @media #{$mat-gt-sm} {
flex-direction: row; flex-direction: row;
gap: 8px; gap: 8px;
align-items: center;
.node-setting { .node-setting {
margin-top: 5px; margin-top: 5px;

Loading…
Cancel
Save