Merge branch '597-feature-updating-node-to-version-17' of https://git…

…hub.com/encorelab/ck-board into 597-feature-updating-node-to-version-17
encorelab · Aug 30, 2024 · 404b6e6 · 404b6e6
2 parents 120f710 + de95e62
commit 404b6e6
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 9 deletions.
diff --git a/frontend/src/app/components/add-board-modal/add-board-modal.component.scss b/frontend/src/app/components/add-board-modal/add-board-modal.component.scss
@@ -1,6 +1,6 @@
 .cancel {
   padding-left: 10px;
-  width: 12px;
+  width: 15px;
   height: 15px;
   font-size: medium;
 }

diff --git a/frontend/src/app/components/add-post-modal/add-post.component.scss b/frontend/src/app/components/add-post-modal/add-post.component.scss
@@ -4,7 +4,7 @@
 
 .cancel, .correct {
   padding-left: 10px;
-  width: 12px;
+  width: 15px;
   height: 15px;
   font-size: medium;
 }

diff --git a/frontend/src/app/components/add-project-modal/add-project-modal.component.scss b/frontend/src/app/components/add-project-modal/add-project-modal.component.scss
@@ -1,6 +1,6 @@
 .cancel {
   padding-left: 10px;
-  width: 12px;
+  width: 15px;
   height: 15px;
   font-size: medium;
 }

diff --git a/frontend/src/app/components/ck-buckets/ck-buckets.component.html b/frontend/src/app/components/ck-buckets/ck-buckets.component.html
@@ -11,7 +11,7 @@
 </app-toolbar>
 <div class="container d-flex align-items-center justify-content-center">
     <div class="heading">
-      <button
+      <button *ngIf="project"
         mat-icon-button
         routerLink="{{'/project/'+project.projectID}}"
         aria-label="Return to Dashboard"

diff --git a/frontend/src/app/components/configuration-modal/configuration-modal.component.scss b/frontend/src/app/components/configuration-modal/configuration-modal.component.scss
@@ -71,7 +71,7 @@
 
 .cancel {
   padding-left: 10px;
-  width: 12px;
+  width: 15px;
   height: 15px;
   font-size: medium;
 }

diff --git a/frontend/src/app/components/dashboard/dashboard.component.html b/frontend/src/app/components/dashboard/dashboard.component.html
@@ -44,7 +44,7 @@ <h3 class="mat-title heading">My Projects</h3>
         >
           <div style="display:flex; flex-direction: row; align-items: center" >
             <mat-card-title class="title accent">
-              <mat-icon color="accent">grid_view</mat-icon>
+              <mat-icon style="min-width: fit-content;" color="accent">grid_view</mat-icon>
               <span>{{ project.name }}</span>
               <button 
               *ngIf="user && user.role === Role.TEACHER"

diff --git a/frontend/src/app/components/post-modal/post-modal.component.scss b/frontend/src/app/components/post-modal/post-modal.component.scss
@@ -59,7 +59,7 @@
 
 .cancel {
   padding-left: 10px;
-  width: 12px;
+  width: 15px;
   height: 15px;
   font-size: medium;
 }

diff --git a/...src/app/components/project-configuration-modal/project-configuration-modal.component.scss b/...src/app/components/project-configuration-modal/project-configuration-modal.component.scss
@@ -4,7 +4,7 @@
 
 .cancel {
   padding-left: 10px;
-  width: 12px;
+  width: 15px;
   height: 15px;
   font-size: medium;
 }

diff --git a/frontend/src/app/material-module.ts b/frontend/src/app/material-module.ts
@@ -17,7 +17,7 @@ import { MatLegacyAutocompleteModule as MatAutocompleteModule } from '@angular/m
 import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select';
 import { MatSidenavModule } from '@angular/material/sidenav';
 import { MatLegacyProgressSpinnerModule as MatProgressSpinnerModule } from '@angular/material/legacy-progress-spinner';
-import { MatLegacyProgressBarModule as MatProgressBarModule } from '@angular/material/legacy-progress-bar';
+import { MatProgressBarModule as MatProgressBarModule } from '@angular/material/progress-bar';
 import { MatLegacySlideToggleModule as MatSlideToggleModule } from '@angular/material/legacy-slide-toggle';
 import { MatExpansionModule } from '@angular/material/expansion';
 import { MatLegacyRadioModule as MatRadioModule } from '@angular/material/legacy-radio';

diff --git a/frontend/src/style/layout/_dashboard.scss b/frontend/src/style/layout/_dashboard.scss
@@ -40,6 +40,7 @@ app-toolbar {
   line-height: 1.5;
   display: flex;
   align-items: flex-start;
+  justify-items: flex-start;
   gap: 0.25em;
 }
 

diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss
@@ -72,3 +72,25 @@ a {
 .wide-snackbar {
   max-width: 75% !important;
 }
+
+/* mat-slider - temp legacy fix */
+.slider .mat-slider-track-wrapper {
+  background-color: #3a34b3;
+}
+
+.slider .mat-slider-thumb {
+  background-color: #f44336;
+}
+
+.slider .mat-slider-thumb-label {
+  background-color: #f44336;
+}
+
+.slider .mat-slider-thumb-label-text {
+  color: white;
+}
+
+/* radio button - temp legacy fix */
+.mat-radio-checked .mat-radio-inner-circle {
+  background-color: #3a34b3;
+}