Merge branch 'master' of http://192.168.0.157:3000/DBNT/GGWEB

src/main/webapp/WEB-INF/jsp/admin/request.jsp

@@ -14,7 +14,7 @@
     <div class="row justify-content-between bg-white mx-3 py-2">
 
         <div class="col-auto">
-            <ul class="nav nav-pills" role="tablist">
+            <ul class="nav nav-pills"  role="tablist">
                 <li role="presentation" class="nav-item ms-2">
                   <a class="nav-link ${empty useRequestSearchVO.status?'active':''}" href="/admin/request">전체</a>
                 </li>

src/main/webapp/WEB-INF/jsp/anonymous/findId.jsp

@@ -53,9 +53,6 @@
     }
 </script>
 
-
-
-
 <div class="row justify-content-end">
     <div class="col-12 row m-1">
         <label for="username" class="col-4 text-end">이름</label>

src/main/webapp/css/bootstrap-5.1.3-dist/css/bootstrap.css

@@ -3921,7 +3921,7 @@ textarea.form-control-lg {
 .nav-link {
   display: block;
   padding: 0.5rem 1rem;
-  color: #0d6efd;
+  color: #1a1a1a;
   text-decoration: none;
   transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out;
 }
@@ -3934,7 +3934,7 @@ textarea.form-control-lg {
   color: #0a58ca;
 }
 .nav-link.disabled {
-  color: #6c757d;
+  color: #c1c1c1;
   pointer-events: none;
   cursor: default;
 }
@@ -3954,7 +3954,7 @@ textarea.form-control-lg {
   isolation: isolate;
 }
 .nav-tabs .nav-link.disabled {
-  color: #6c757d;
+  color: #e3e3e3;
   background-color: transparent;
   border-color: transparent;
 }
@@ -3978,7 +3978,7 @@ textarea.form-control-lg {
 .nav-pills .nav-link.active,
 .nav-pills .show > .nav-link {
   color: #fff;
-  background-color: #0d6efd;
+  background-color: #5c5c5c;
 }
 
 .nav-fill > .nav-link,
@@ -4782,7 +4782,7 @@ textarea.form-control-lg {
 .page-link {
   position: relative;
   display: block;
-  color: #0d6efd;
+  color: #1a1a1a;
   text-decoration: none;
   background-color: #fff;
   border: 1px solid #dee2e6;
@@ -4813,8 +4813,8 @@ textarea.form-control-lg {
 .page-item.active .page-link {
   z-index: 3;
   color: #fff;
-  background-color: #0d6efd;
-  border-color: #0d6efd;
+  background-color: #5c5c5c;
+  border-color: #5c5c5c;
 }
 .page-item.disabled .page-link {
   color: #6c757d;

src/main/webapp/css/style.css

@@ -28,7 +28,8 @@ a {
 }
 
 .header {
-    background: url('/images/header_bg.png') no-repeat;
+    /*background: url('/images/header_bg.png') no-repeat;*/
+    background-color: #5c5c5c;
     background-size: cover;
     height: 70px;
     position: fixed;
@@ -43,7 +44,7 @@ a {
     left: 0;
     right: 0;
     bottom: 0;
-    background: #094e84;
+    background: #5c5c5c;
     height: auto;
     width: 200px;
     min-width: inherit;
@@ -253,8 +254,9 @@ a {
 }
 
 .thisOn {
-    background-color: #337ab7;
+    /*background-color: #337ab7;*/
     border-left: 3px solid #fff;
+    background-color: #1a1a1a;
 }
 
 #fieldPaging {