Merge branch 'master' of https://github.com/microting/eform-angular-frontend

Author: renemadsen

eform-client/src/app/modules/advanced/components/entity-search/entity-search-edit/entity-search-edit.component.html

@@ -41,22 +41,22 @@ <h3>{{'Edit searchable list' | translate}}</h3>
                   <!--list item-->
                   <li class="list-group-item"
                       *ngFor="let entityItem of advEntitySearchableGroupEditModel.advEntitySearchableItemModels">
-                    <div class="d-flex justify-content-between">
-                      <div>
+                    <div class="row">
+                      <div class="col-md-1">
                         <a>
                           <i class="material-icons text-black-50"> drag_handle </i>
                         </a>
                       </div>
-                      <div>{{entityItem.name}}</div>
-                      <div>
+                      <div class="col-md-9">{{entityItem.name}}</div>
+                      <div class="col-md-2">
                         <i class="material-icons material-icon-red mr-3" *ngIf="!entityItem.name"
                            mdbTooltip="{{'Name is required' | translate}}!">
                            warning
                         </i>
-                        <a>
+                        <a class="pull-right">
                           <i class="material-icons text-black-50" (click)="openModalSearchEditName(entityItem)"> edit </i>
                         </a>
-                        <a>
+                        <a class="pull-right">
                           <i class="material-icons text-black-50"
                              (click)="deleteAdvEntitySelectableItem(entityItem.entityItemUId)"> delete </i>
                         </a>

eform-client/src/app/modules/advanced/components/entity-select/entity-select-edit/entity-select-edit.component.html

@@ -41,22 +41,22 @@ <h3>{{'Edit selectable list' | translate}}</h3>
                   <!--list item-->
                   <li class="list-group-item"
                       *ngFor="let entityItem of advEntitySelectableGroupEditModel.advEntitySelectableItemModels">
-                    <div class="d-flex justify-content-between">
-                      <div>
+                    <div class="row">
+                      <div class="col-md-1">
                         <a>
                           <i class="material-icons text-black-50"> drag_handle </i>
                         </a>
                       </div>
-                      <div>{{entityItem.name}}</div>
-                      <div>
+                      <div class="col-md-9">{{entityItem.name}}</div>
+                      <div class="col-md-2">
                         <i class="material-icons material-icon-red mr-3" *ngIf="!entityItem.name"
                            mdbTooltip="{{'Name is required' | translate}}!">
                           warning
                         </i>
-                        <a>
+                        <a class="pull-right">
                           <i class="material-icons text-black-50" (click)="openModalSelectEditName(entityItem)"> edit </i>
                         </a>
-                        <a>
+                        <a class="pull-right">
                           <i class="material-icons text-black-50"
                              (click)="deleteAdvEntitySelectableItem(entityItem.entityItemUId)"> delete </i>
                         </a>

eform-client/src/scss/styles.scss

@@ -57,3 +57,10 @@ gallery {
 .cal-week-view .cal-events-row {
   margin-left: 0 !important;
 }
+
+.pull-left {
+  float: left !important;
+}
+.pull-right {
+  float: right !important;
+}