sebastian/ConceptCreator
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases Wiki Activity

issue-15 #21

Merged
sebastian merged 60 commits from issue-15 into main 2024-03-22 07:46:49 +00:00
Conversation 0 Commits 60 Files Changed 133 +24 -3
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8f45d18e40 - Show all commits

14
src/app/editor/gamesystem-editor/transition-editor/simple-transition-editor/simple-transition-editor.component.html
View File

@ -40,9 +40,17 @@
<td mat-cell *matCellDef="let element" [attr.colspan]="columnsToDisplayWithExpand.length"> <td mat-cell *matCellDef="let element" [attr.colspan]="columnsToDisplayWithExpand.length">
<div class="example-element-detail" <div class="example-element-detail"
[@detailExpand]="element == expandedElement ? 'expanded' : 'collapsed'"> [@detailExpand]="element == expandedElement ? 'expanded' : 'collapsed'">
<app-scriptaccount-action-editor [transition]="element" [scriptAccounts]="scriptAccounts"></app-scriptaccount-action-editor> <div class="condition-action-container">
<app-scriptaccount-condition-editor [conditions]="element.scriptAccountConditions" [scriptAccounts]="scriptAccounts" <div class="action-container">
(onCreateCondition)="onCreateCondition(element, $event)" (onDeleteCondition)="deleteCondition(element, $event)"></app-scriptaccount-condition-editor> <app-scriptaccount-action-editor [transition]="element" [scriptAccounts]="scriptAccounts"></app-scriptaccount-action-editor>
</div>
<div class="condition-container">
<app-scriptaccount-condition-editor [conditions]="element.scriptAccountConditions" [scriptAccounts]="scriptAccounts"
(onCreateCondition)="onCreateCondition(element, $event)" (onDeleteCondition)="deleteCondition(element, $event)"></app-scriptaccount-condition-editor>
</div>
</div>
</div> </div>
</td> </td>
</ng-container> </ng-container>

13
src/app/editor/gamesystem-editor/transition-editor/simple-transition-editor/simple-transition-editor.component.scss
View File

@ -61,3 +61,16 @@ tr.example-element-row:not(.example-expanded-row):active {
.mat-error { .mat-error {
color: red; color: red;
} }
.condition-action-container {
display: flex;
width: 100%
}
.condition-container {
width: 45%;
}
.action-container {
width: 45%;
}