From 4378f48dfc1b55b02c1a1e9a3af91fdf6fb34538 Mon Sep 17 00:00:00 2001
From: singhabhyudita <singhabhyudita@gmail.com>
Date: Fri, 16 Jun 2023 11:23:13 -0400
Subject: [PATCH 1/2] Fixed button overlapping issue in add question panel
 component

---
 .../adding-question-panel.component.html                    | 4 ++--
 .../adding-question-panel.component.scss                    | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/web/app/components/adding-question-panel/adding-question-panel.component.html b/src/web/app/components/adding-question-panel/adding-question-panel.component.html
index 4745590a863..b56b358a150 100644
--- a/src/web/app/components/adding-question-panel/adding-question-panel.component.html
+++ b/src/web/app/components/adding-question-panel/adding-question-panel.component.html
@@ -1,6 +1,6 @@
 <div class="card-body background-color-light-blue text-center">
   <div ngbDropdown class="d-inline-block">
-    <button id="btn-new-question" class="btn btn-primary" ngbDropdownToggle>Add New Question</button>
+    <button id="btn-new-question" class="btn btn-primary button" ngbDropdownToggle>Add New Question</button>
     <div id="new-question-dropdown" ngbDropdownMenu>
       <button class="dropdown-item" (click)="templateQuestionModalHandler()">Choose from template questions</button>
       <div class="dropdown-divider"></div>
@@ -25,6 +25,6 @@
     <i class="fas fa-info-circle"></i>
   </a>
   <a type="button" class="btn btn-link" *ngIf="isLinkDisabled"><i class="fas fa-info-circle"></i></a>
-  <button id="btn-copy-question" class="btn btn-primary" (click)="copyQuestionsFromOtherSessionsHandler()"
+  <button id="btn-copy-question" class="btn btn-primary button" (click)="copyQuestionsFromOtherSessionsHandler()"
     [disabled]="isCopyingQuestion"><tm-ajax-loading *ngIf="isCopyingQuestion"></tm-ajax-loading>Copy Question</button>
 </div>
diff --git a/src/web/app/components/adding-question-panel/adding-question-panel.component.scss b/src/web/app/components/adding-question-panel/adding-question-panel.component.scss
index df10ed73bcc..16ef8c6eaa4 100644
--- a/src/web/app/components/adding-question-panel/adding-question-panel.component.scss
+++ b/src/web/app/components/adding-question-panel/adding-question-panel.component.scss
@@ -1,3 +1,9 @@
 .background-color-light-blue {
   background-color: #EAEFF5;
 }
+
+@media(max-width: 411px) {
+  .button {
+    margin-top: 1%;
+  }
+}
\ No newline at end of file

From 3ce6ec1f632d4d06675c8707d26ad7a01a767ee0 Mon Sep 17 00:00:00 2001
From: singhabhyudita <singhabhyudita@gmail.com>
Date: Fri, 16 Jun 2023 14:20:48 -0400
Subject: [PATCH 2/2] Overlapping fixed

---
 gradle/wrapper/gradle-wrapper.properties                    | 5 +++--
 .../adding-question-panel.component.html                    | 4 ++--
 .../adding-question-panel.component.scss                    | 6 ------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2ec77e51a9c..342e3b4954d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Tue Jun 13 08:53:00 EDT 2023
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/src/web/app/components/adding-question-panel/adding-question-panel.component.html b/src/web/app/components/adding-question-panel/adding-question-panel.component.html
index b56b358a150..23424a05526 100644
--- a/src/web/app/components/adding-question-panel/adding-question-panel.component.html
+++ b/src/web/app/components/adding-question-panel/adding-question-panel.component.html
@@ -1,6 +1,6 @@
 <div class="card-body background-color-light-blue text-center">
   <div ngbDropdown class="d-inline-block">
-    <button id="btn-new-question" class="btn btn-primary button" ngbDropdownToggle>Add New Question</button>
+    <button id="btn-new-question" class="btn btn-primary p-1 p-sm-2" ngbDropdownToggle>Add New Question</button>
     <div id="new-question-dropdown" ngbDropdownMenu>
       <button class="dropdown-item" (click)="templateQuestionModalHandler()">Choose from template questions</button>
       <div class="dropdown-divider"></div>
@@ -25,6 +25,6 @@
     <i class="fas fa-info-circle"></i>
   </a>
   <a type="button" class="btn btn-link" *ngIf="isLinkDisabled"><i class="fas fa-info-circle"></i></a>
-  <button id="btn-copy-question" class="btn btn-primary button" (click)="copyQuestionsFromOtherSessionsHandler()"
+  <button id="btn-copy-question" class="btn btn-primary p-1 p-sm-2" (click)="copyQuestionsFromOtherSessionsHandler()"
     [disabled]="isCopyingQuestion"><tm-ajax-loading *ngIf="isCopyingQuestion"></tm-ajax-loading>Copy Question</button>
 </div>
diff --git a/src/web/app/components/adding-question-panel/adding-question-panel.component.scss b/src/web/app/components/adding-question-panel/adding-question-panel.component.scss
index 16ef8c6eaa4..97fb930034e 100644
--- a/src/web/app/components/adding-question-panel/adding-question-panel.component.scss
+++ b/src/web/app/components/adding-question-panel/adding-question-panel.component.scss
@@ -1,9 +1,3 @@
 .background-color-light-blue {
   background-color: #EAEFF5;
-}
-
-@media(max-width: 411px) {
-  .button {
-    margin-top: 1%;
-  }
 }
\ No newline at end of file