Merge branch 'editor_fixes'

projects/common/components/text-image-panel.component.ts

@@ -19,9 +19,7 @@ import { DragNDropValueObject, TextImageLabel } from 'common/interfaces';
                                      'row': label.imgPosition === 'left',
                                      'row-reverse': label.imgPosition === 'right'}">
       <img *ngIf="label.imgSrc"
-           [style.object-fit]="'scale-down'"
-           [style.max-width.%]="100"
-           [src]="label.imgSrc | safeResourceUrl" alt="Image Placeholder">
+          [src]="label.imgSrc | safeResourceUrl" alt="Image Placeholder">
       <div *ngIf="label.text !== ''" class="text" [innerHTML]="label.text | safeResourceHTML"></div>
     </div>
   `,
@@ -37,6 +35,11 @@ import { DragNDropValueObject, TextImageLabel } from 'common/interfaces';
       justify-content: inherit;
       max-height: 100%;
     }
+    .image-wrapper img {
+      object-fit: scale-down;
+      max-width: 100%;
+      height: 100%;
+    }
     .column {flex-direction: column;}
     .column-reverse {flex-direction: column-reverse;}
     .row {flex-direction: row;}

projects/common/models/elements/text/marking-panel.ts

@@ -17,7 +17,7 @@ export class MarkingPanelElement extends UIElement implements MarkingPanelProper
   highlightableOrange: boolean = false;
   position?: PositionProperties;
 
-  static title: string = 'Markierungselement';
+  static title: string = 'Textmarkierung';
   static icon: string = 'border_color';
 
   constructor(element?: Partial<MarkingPanelProperties>, idService?: AbstractIDService) {

projects/editor/src/app/components/properties-panel/model-properties-tab/input-groups/ele-specific/text-properties-field-set.component.ts

@@ -30,7 +30,7 @@ import { DialogService } from '../../../../../services/dialog.service';
   template: `
     <div class="fx-column-start-stretch">
       Text
-      <div class="text-text"
+      <div class="text-text" (click)="showTextEditDialog()" [style.cursor]="'pointer'"
            [innerHTML]="combinedProperties.text | safeResourceHTML">
       </div>
       <button mat-fab color="primary" [style.align-self]="'center'" [style.margin-bottom.px]="20"
@@ -109,7 +109,7 @@ import { DialogService } from '../../../../../services/dialog.service';
       margin-bottom: 10px;
       padding: 10px;
       max-height: 200px;
-      overflow: scroll;
+      overflow: auto;
     }
   `]
 })

projects/editor/src/app/components/unit-view/unit-view.component.css

 .toolbox_drawer {
-  width: 220px;
+  width: 227px;
   box-shadow: 2px 5px 5px gray;
 }