Make more room for buttons on component-popup bottom row

This reduces the place on the `form-general-error` area, which
lead to text-overflow issues to be visible.
Therefore, had to recalculate the CSS heights/width of that
error area.

Issue-ID: VID-724

Change-Id: Iac2689da31c4fa0e1aaedc6586199eef21f8bc63
Signed-off-by: Ittay Stern <ittay.stern@att.com>

2 files changed, 8 insertions, 10 deletions

diff --git a/vid-webpack-master/src/app/shared/components/formGeneralErrors/formGeneralErrors.component.scss b/vid-webpack-master/src/app/shared/components/formGeneralErrors/formGeneralErrors.component.scss
index 988d12cd6..6728147bb 100644
--- a/vid-webpack-master/src/app/shared/components/formGeneralErrors/formGeneralErrors.component.scss
+++ b/vid-webpack-master/src/app/shared/components/formGeneralErrors/formGeneralErrors.component.scss
@@ -11,8 +11,7 @@
   background: rgb(207,41,41);
   text-align: center;
   padding-top: 18px;
-  width: 77px;
-  height: 110px;
+  height: 66px;
   float: left;
 }
 
@@ -32,7 +31,7 @@
 
 .parentbox {
   padding-right: 0;
-  line-height: 67px;
+  height: 66px;
 }
 
 .parentbox:before {
diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/generic-form-popup.component.html b/vid-webpack-master/src/app/shared/components/genericFormPopup/generic-form-popup.component.html
index 2b2c2a75d..6bb1ff156 100644
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/generic-form-popup.component.html
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/generic-form-popup.component.html
@@ -48,12 +48,12 @@
 
     </div>
     <div class="modal-footer row" style="padding: 0">
-      <div class="col-md-6">
+      <div class="col-md-5">
         <div *ngIf="hasSomeError(formPopupDetails, dynamicForm) == true">
           <form-general-error [message]="errorMsg"></form-general-error>
         </div>
       </div>
-      <div class="col-md-6" style="padding: 15px;padding-right: 35px;">
+      <div class="col-md-7" style="padding: 15px;padding-right: 35px;">
         <button
           *ngIf="showTemplateBtn"
           [attr.data-tests-id]="'templateButton'"
@@ -64,14 +64,13 @@
           *ngIf="isShowPreviousInstantiationBtn"
           [attr.data-tests-id]="'ShowPreviousInstancesButton'"
           type="button" class="btn btn-success submit"
-          (click)="formPopupDetails.onOtherAction(formPopupDetails.that, dynamicForm)">
-          <span>Previous Instantiation</span>
-        </button>
+          (click)="formPopupDetails.onOtherAction(formPopupDetails.that, dynamicForm)"
+        ><span>Previous Instantiation</span></button>
         <button
           [attr.data-tests-id]="'cancelButton'"
           type="button" class="btn btn-default cancel"
-          (click)="formPopupDetails.onCancel(formPopupDetails.that, dynamicForm); clearModalIsUpdateMode()"><span>Cancel</span></button>
-
+          (click)="formPopupDetails.onCancel(formPopupDetails.that, dynamicForm); clearModalIsUpdateMode()"
+        ><span>Cancel</span></button>
         <input type="submit"
                value="Set"
                data-tests-id="form-set"