Merge branch 'master' into url-change

google · Dec 10, 2024 · f0e997f · f0e997f
2 parents 178e048 + a700d6c
commit f0e997f
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 18 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/web/src/app/pages/create-survey/survey-details/survey-details.component.html b/web/src/app/pages/create-survey/survey-details/survey-details.component.html
@@ -24,7 +24,7 @@
     />
   </mat-form-field>
 
-  <mat-form-field class="input" appearance="fill">
+  <mat-form-field class="input" appearance="fill" subscriptSizing="dynamic">
     <mat-label> Description </mat-label>
     <input
       matInput

diff --git a/web/src/app/pages/edit-survey/edit-details/edit-details.component.html b/web/src/app/pages/edit-survey/edit-details/edit-details.component.html
@@ -48,10 +48,13 @@
 
   <mat-card class="survey-detail-card">
     <mat-card-content>
-      <div class="card-title">Delete survey</div>
-      <div class="card-row delete-survey">
-        <div>Permanently delete survey and associated data</div>
-
+      <div class="detail-content-with-button">
+        <div>
+          <div class="card-title">Delete survey</div>
+          <div class="card-row">
+            <div>Permanently delete survey and associated data</div>
+          </div>
+        </div>
         <button mat-flat-button (click)="openDeleteSurveyDialog()">
           Delete survey
         </button>

diff --git a/web/src/app/pages/edit-survey/edit-details/edit-details.component.scss b/web/src/app/pages/edit-survey/edit-details/edit-details.component.scss
@@ -22,19 +22,29 @@
   .survey-detail-card {
     --mdc-elevated-card-container-elevation: 0;
 
+    .detail-content-with-button {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      gap: 16px;
+    }
+
     .card-row {
       :nth-child(1) {
         flex: 1;
       }
 
+      p {
+        margin-block-end: 0;
+      }
+
       &.edit-survey-details {
         margin-top: 12px;
       }
+    }
 
-      &.delete-survey {
-        display: flex;
-        align-items: center;
-      }
+    .mat-mdc-card-content {
+      padding: 24px;
     }
   }
 }
diff --git a/web/src/app/pages/edit-survey/edit-survey.component.scss b/web/src/app/pages/edit-survey/edit-survey.component.scss
@@ -62,7 +62,7 @@
 }
 
 .card {
-  padding: 16px 24px;
+  padding: 16px 24px 24px;
   background-color: #F9FAF4;
   border-radius: 18px;
   flex-grow: 1;