Merge branch 'master' of https://dev.azure.com/DBNTech/ForeignAffairs/_git/ForeignAffairs

src/main/resources/templates/faStatistics/asfCov/asfCov.html

@@ -68,7 +68,7 @@
                       </div>
                       <div class="col-4">
                         <div class="input-group w-auto input-daterange" id="dateSelectorDiv">
-                         <option value="napoDt" th:selected="${searchParams.dateSelector eq 'napoDt'}">나포일시</option>
+                         <option value="napoDt" class="me-1 mt-1" th:selected="${searchParams.dateSelector eq 'napoDt'}">나포일시</option>
                          <input type="text" class="form-control form-control-sm w-35" id="startDate" name="startDate" placeholder="시작일" autocomplete="off" readonly th:value="${searchParams.startDate}">
                          <input type="text" class="form-control form-control-sm w-35" id="endDate" name="endDate" placeholder="종료일" autocomplete="off" readonly th:value="${searchParams.endDate}">
                         </div>

src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusEditModal.html

@@ -27,7 +27,7 @@
     </div>
     <div class="row mb-1">
       <div class="col-sm-1">
-        <label class="col-auto col-form-label col-form-label-sm text-center">나포일시</label>
+        <label class="col-12 col-form-label col-form-label-sm text-center">나포일시</label>
         <label class="col-12 col-form-label col-form-label-sm text-center">NLL</label>
       </div>
       <div class="col-sm-2">

src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html

@@ -139,5 +139,5 @@
       <button type="button" class="btn btn-warning" id="editPlanBtn">수정</button>
     </th:block>
   </th:block>
-  <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+<!--  <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
 </div>

src/main/resources/templates/login/joinForm.html

@@ -168,7 +168,7 @@
     </form>
   </div>
   <div class="modal-footer bg-light" th:if="${joinFlag eq 'T'}">
-    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal" id="closeModalBtn">닫기</button>
+<!--    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal" id="closeModalBtn">닫기</button>-->
     <button type="button" class="btn btn-primary" id="saveBtn">신청</button>
   </div>
 </div>

src/main/resources/templates/sri/sriBoard.html

@@ -197,7 +197,7 @@
         </div>
         <div class="modal-footer bg-light">
           <button type="button" class="btn btn-primary" id="getMenuBtn">추가</button>
-          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+<!--          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
         </div>
       </div>
     </div>

src/main/resources/templates/sri/sriEditModal.html

@@ -126,7 +126,7 @@
   </form>
 </div>
 <div class="modal-footer bg-light">
-  <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+<!--  <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
   <button type="button" class="btn btn-warning" id="saveTempBtn">임시저장</button>
   <button type="button" class="btn btn-primary" id="saveSriBtn">저장</button>
 </div>

src/main/resources/templates/sri/sriViewModal.html

@@ -146,6 +146,6 @@
       </th:block>
     </th:block>
   </th:block>
-  <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+<!--  <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
   </div>
 </div>