Merge branch 'master' into angular-11

CATcher-org · Sep 18, 2023 · 7a4a36e · 7a4a36e
2 parents d2ad008 + 564b8ca
commit 7a4a36e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/src/app/shared/view-issue/issue-dispute/issue-dispute.component.html b/src/app/shared/view-issue/issue-dispute/issue-dispute.component.html
@@ -2,7 +2,7 @@ <h3 class="mat-title">Disputes</h3>
 <form [formGroup]="tutorResponseForm" #tutorForm="ngForm" (ngSubmit)="submitTutorResponseForm(tutorForm)">
   <div class="timeline-comment">
     <div class="timeline-header">
-      <span style="vertical-align: middle; margin-left: 5px"> Post your response here. </span>
+      <span> Post your response here. </span>
       <button mat-button style="float: right" *ngIf="!isEditing" (click)="changeToEditMode()">Edit</button>
     </div>
     <div>

diff --git a/src/app/shared/view-issue/new-team-response/new-team-response.component.html b/src/app/shared/view-issue/new-team-response/new-team-response.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="newTeamResponseForm" #myForm="ngForm" (ngSubmit)="submitNewTeamResponse(myForm)">
   <div class="timeline-comment">
     <div class="timeline-header">
-      <span style="vertical-align: middle; margin-left: 5px"> Post your team's response here. </span>
+      <span> Post your team's response here. </span>
     </div>
 
     <div>

diff --git a/src/app/shared/view-issue/parse-error/parse-error.component.css b/src/app/shared/view-issue/parse-error/parse-error.component.css
@@ -6,6 +6,9 @@
   color: #586069;
   height: 35px;
   padding: 5px 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
 }
 
 .timeline-comment {

diff --git a/src/app/shared/view-issue/tester-response/tester-response.component.html b/src/app/shared/view-issue/tester-response/tester-response.component.html
@@ -2,8 +2,8 @@ <h3 class="mat-title">Tester's Response</h3>
 <form [formGroup]="testerResponseForm" (ngSubmit)="submitTesterResponseForm()">
   <div class="timeline-comment">
     <div class="timeline-header">
-      <span style="vertical-align: middle; margin-left: 5px" *ngIf="this.isNewResponse()"> Please verify the following item(s). </span>
-      <span style="vertical-align: middle; margin-left: 5px" *ngIf="!this.isNewResponse()"> <strong>Tester</strong> responded. </span>
+      <span *ngIf="this.isNewResponse()"> Please verify the following item(s). </span>
+      <span *ngIf="!this.isNewResponse()"> <strong>Tester</strong> responded. </span>
       <button mat-button style="float: right" *ngIf="!isEditing" (click)="changeToEditMode()">Edit</button>
     </div>
     <div>

diff --git a/src/styles.css b/src/styles.css
@@ -29,6 +29,10 @@ body {
   color: #586069;
   height: 35px;
   padding: 5px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding-left: 10px;
 }
 
 .timeline-comment {