Merge branch 'master' into 7983-courses-long-collections-break-format…

…ting
open-learning-exchange · Dec 23, 2024 · d2f031a · d2f031a
2 parents 530ae46 + 97fc1bb
commit d2f031a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/src/app/chat/chat-sidebar/chat-sidebar.component.html b/src/app/chat/chat-sidebar/chat-sidebar.component.html
@@ -69,7 +69,7 @@
       </ul>
     </ng-container>
     <ng-template #noChats>
-      <div i18n>No previous conversations.</div>
+      <div class="no-chats-message" i18n>No previous conversations.</div>
     </ng-template>
   </mat-drawer>
 

diff --git a/src/app/chat/chat-sidebar/chat-sidebar.scss b/src/app/chat/chat-sidebar/chat-sidebar.scss
@@ -77,6 +77,10 @@ li:hover {
   margin: 0;
 }
 
+.no-chats-message {
+  margin-left: 4px;
+}
+
 @media only screen and (max-width: $screen-md) {
   .expand-button {
     top: 10px;

diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html
@@ -44,8 +44,8 @@ <h1><ng-container>Planet</ng-container> {{planetName}}</h1>
     </ng-container>
     <span *ngIf="layout === 'classic' && !forceModern">
       <button mat-icon-button routerLink="/chat" i18n-title title="Chat"><mat-icon>chat_bubble_outline</mat-icon></button>
-      <button mat-icon-button planetFeedback i18n-title title="Feedback"><mat-icon>feedback_outline</mat-icon></button>
-      <button mat-icon-button routerLink="/feedback" i18n-title title="Messages"><mat-icon>mail_outline</mat-icon></button>
+      <button mat-icon-button planetFeedback i18n-title title="Submit Feedback"><mat-icon>feedback_outline</mat-icon></button>
+      <button mat-icon-button routerLink="/feedback" i18n-title title="Review Feedback"><mat-icon>mail_outline</mat-icon></button>
       <ng-container *planetAuthorizedRoles>
         <button mat-icon-button planetSync i18n-title title="Sync" *ngIf="onlineStatus === 'accepted'"><mat-icon svgIcon="feedback"></mat-icon></button>
       </ng-container>

diff --git a/src/app/teams/teams-view.scss b/src/app/teams/teams-view.scss
@@ -32,6 +32,14 @@
     margin: 0;
   }
 
+  .mat-subheading-2 b {
+    display: inline-block;
+    max-width: 100%;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
   .toolbar-button{
     flex-shrink: 0;
   }