From b2b9e785e10c8fd59c3fcee8c8fda2aeb86be8c3 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 27 12월 2021 13:34:22 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

---
 src/main/webapp/assets/styles/main.css |   66 +++++++++++++++++++++++++++++----
 1 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/assets/styles/main.css b/src/main/webapp/assets/styles/main.css
index e21105b..b16f97f 100644
--- a/src/main/webapp/assets/styles/main.css
+++ b/src/main/webapp/assets/styles/main.css
@@ -262,6 +262,8 @@
     margin-top: 0;
     margin-bottom: 1rem;
     overflow: auto;
+    white-space: pre-line;
+    word-break : break-word;
     -ms-overflow-style: scrollbar;
 }
 
@@ -907,6 +909,10 @@
 }
 
 .offset-detail-5 {
+    margin-left: 11%;
+}
+
+.offset-detail-7 {
     margin-left: 30%;
 }
 
@@ -4851,6 +4857,11 @@
     background-color: #34bfa3;
 }
 
+.badge-department {
+    color: #fff;
+    background-color: #8d2b9b;
+}
+
 /*.badge-success[href]:hover, .badge-success[href]:focus {
   color: #fff;
   text-decoration: none;
@@ -5214,7 +5225,7 @@
 }*/
 
 .modal-open {
-    overflow: auto
+    overflow: hidden;
 }
 
 .modal {
@@ -5335,6 +5346,9 @@
     -ms-flex: 1 1 auto;
     flex: 1 1 auto;
     padding: 1rem;
+    overflow-y: auto;
+    overflow-x: hidden;
+    max-height: 800px;
 }
 
 .modal-footer {
@@ -12653,7 +12667,7 @@
     padding: 3px;
     font-size: 14px;
     position: absolute;
-    top: 40%;
+    top: 60%;
     right: 5%;
     -webkit-transform: translateY(-50%);
     transform: translateY(-50%);
@@ -12665,7 +12679,7 @@
     padding: 3px;
     font-size: 14px;
     position: absolute;
-    top: 32%;
+    top: 58%;
     right: 5%;
     -webkit-transform: translateY(-50%);
     transform: translateY(-50%);
@@ -12698,7 +12712,7 @@
     padding: 3px;
     font-size: 14px;
     position: absolute;
-    top: 40%;
+    top: 60%;
     right: 5%;
     -webkit-transform: translateY(-50%);
     transform: translateY(-50%);
@@ -12710,7 +12724,7 @@
     padding: 3px;
     font-size: 14px;
     position: absolute;
-    top: 32%;
+    top: 58%;
     right: 5%;
     -webkit-transform: translateY(-50%);
     transform: translateY(-50%);
@@ -19392,6 +19406,11 @@
     position: relative;
 }
 
+.re-title {
+    margin-top: 11px;
+    margin-left: 18px;
+}
+
 .ae-item {
     display: -webkit-box;
     display: -ms-flexbox;
@@ -19400,7 +19419,7 @@
     -ms-flex-align: center;
     /*align-items: center;*/
     padding: 15px;
-    border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+    border-bottom: 1px solid rgba(0, 0, 0, 0.3);
     position: relative;
 
 }
@@ -19464,7 +19483,7 @@
 .aei-content .aei-delete {
     position: absolute;
     top: 0px;
-    right: -10px;
+    right: 12px;
     color: rgba(0, 0, 0, 0.7);
     font-size: 0.5rem;
     cursor: pointer;
@@ -21147,6 +21166,14 @@
 .titlenameRegister {
     font-size: 0.8rem;
     color: #0066ff;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+}
+
+.titlenameAccount {
+    font-size: 0.1rem;
+    color: #000000;
     text-overflow: ellipsis;
     overflow: hidden;
     white-space: nowrap;
@@ -28574,6 +28601,10 @@
     margin-left: 30px !important;
 }
 
+.ml-3per {
+    margin-left: 3.3%;
+}
+
 
 .m-0 {
     margin: 0 auto !important;
@@ -29028,6 +29059,13 @@
 .activity-text h6.creat {
     color: #fd7e14;
     font-weight: bold;
+}
+
+.dot {
+    color: #15158a;
+    font-size: 0.9rem;
+    font-weight: bold;
+    margin-bottom: -15px;
 }
 
 .activity-text h6.creat .dot {
@@ -29686,7 +29724,7 @@
     z-index: 2;
     overflow: hidden;
     margin-top: 80px;
- }
+}
 
 .footer-w .logo-element {
     text-align: center;
@@ -30101,6 +30139,11 @@
     color: #777;
 }
 
+.issue-main-label {
+    font-size: 0.6rem;
+    color: #d0cece;
+}
+
 .issue-detail-tab {
     font-size: 0.9rem;
     font-weight: 800;
@@ -30111,6 +30154,13 @@
     font-weight: 800;
 }
 
+.custom-detail-label {
+    color: #777;
+    font-weight: 600;
+    position: relative;
+    top: -6px;
+}
+
 input[type="number"]::-webkit-outer-spin-button,
 input[type="number"]::-webkit-inner-spin-button {
     -webkit-appearance: none;

--
Gitblit v1.8.0