Merge branch 'master' into master

TEAMMATES · Dec 22, 2023 · ea12c48 · ea12c48
2 parents 5ebbd4b + fdfdded
commit ea12c48
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/docs/development.md b/docs/development.md
@@ -67,7 +67,6 @@ If you have access to Docker, we have a Docker compose definition to run those s
 
 ```sh
 docker compose up -d
-
 ```
 If the above command does not work, you may not have the updated v2 version of Docker. You may want to try this instead:
 

diff --git a/src/web/app/components/comment-box/comment-edit-form/comment-edit-form.component.html b/src/web/app/components/comment-box/comment-edit-form/comment-edit-form.component.html
@@ -53,4 +53,4 @@
 
 <button type="button" class="btn btn-light btn-sm float-end"
         (click)="triggerCloseCommentBoxEvent()" *ngIf="!shouldHideClosingButton" [disabled]="isDisabled"><i class="fas fa-times"></i>
-  {{ mode === CommentRowMode.EDIT ? 'Discard' : 'Cancel' }}</button>
+  Cancel</button>
diff --git a/...instructor/instructor-student-records-page/instructor-student-records-page.component.html b/...instructor/instructor-student-records-page/instructor-student-records-page.component.html
@@ -6,7 +6,7 @@ <h2>Records in feedback sessions</h2>
       <div class="card-header cursor-pointer" (click)="session.isCollapsed = !session.isCollapsed">
         <strong class="text-break">Feedback Session: {{ session.feedbackSession.feedbackSessionName }}</strong>
         <div class="card-header-btn-toolbar">
-          <tm-panel-chevron [isExpanded]="!session.isCollapsed"></tm-panel-chevron>
+          <tm-panel-chevron [isExpanded]="!session.isCollapsed" chevronColor="black"></tm-panel-chevron>
         </div>
       </div>
       <div class="card-body" *ngIf="!session.isCollapsed" @collapseAnim>
-Original file line number
+Diff line change
@@ Expand Up @@
     ```sh
     docker compose up -d
     ```
     If the above command does not work, you may not have the updated v2 version of Docker. You may want to try this instead:
@@ Expand Down @@