From ec9c7e5582d4c20c35e7c3016d64a2213e9f6a50 Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 화, 15 3월 2022 12:12:17 +0900
Subject: [PATCH] - 파트너 엑셀 임포트 시 이메일 정규식표현 검사하는 코드 제거 - 이슈 상세페이지 setHideCompleteIssue null 체크 - api로 이슈 추가 시 이슈유형에 업체가 설정되어있지 않는경우 메시지 추가
---
src/main/webapp/assets/styles/main.css | 166 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 153 insertions(+), 13 deletions(-)
diff --git a/src/main/webapp/assets/styles/main.css b/src/main/webapp/assets/styles/main.css
index ab8dc34..0d485e4 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;
}
@@ -891,14 +893,27 @@
}
.offset-detail-1 {
- margin-left: 5.8%;
+ margin-left: 4%
}
.offset-detail-2 {
- margin-left: 4%;
+ margin-left: 5.8%;
}
+
.offset-detail-3 {
+ margin-left: 8%;
+}
+
+.offset-detail-4 {
margin-left: 9.2%;
+}
+
+.offset-detail-5 {
+ margin-left: 11%;
+}
+
+.offset-detail-7 {
+ margin-left: 30%;
}
.offset-1 {
@@ -978,6 +993,7 @@
-ms-flex: 0 0 16.6666666667%;
flex: 0 0 16.6666666667%;
max-width: 16.6666666667%;
+ word-break: break-word;
}
.col-sm-3 {
@@ -4842,6 +4858,11 @@
background-color: #34bfa3;
}
+.badge-department {
+ color: #fff;
+ background-color: #8d2b9b;
+}
+
/*.badge-success[href]:hover, .badge-success[href]:focus {
color: #fff;
text-decoration: none;
@@ -5205,7 +5226,7 @@
}*/
.modal-open {
- overflow: auto
+ overflow: hidden;
}
.modal {
@@ -7597,6 +7618,10 @@
height: 100% !important;
}
+.mw-49 {
+ max-width: 49% !important;
+}
+
.mw-100 {
max-width: 100% !important;
}
@@ -7747,6 +7772,14 @@
.ml-5,
.mx-5 {
margin-left: 3rem !important;
+}
+
+.ml--4 {
+ margin-left: -4px !important;
+}
+
+.ml--12 {
+ margin-left: -12px !important;
}
.p-0 {
@@ -11290,6 +11323,14 @@
font-size: 0.79rem;
}
+.select3-selection__email__remove {
+ color: #0066ff;
+ margin-left: 8px;
+ margin-top: 7px;
+ cursor: pointer;
+ font-size: 0.79rem;
+}
+
.select4-selection__choice {
font-size: 0.66rem;
letter-spacing: -0.01em;
@@ -12644,13 +12685,26 @@
padding: 3px;
font-size: 14px;
position: absolute;
- top: 50%;
- right: 15px;
+ top: 60%;
+ right: 5%;
-webkit-transform: translateY(-50%);
transform: translateY(-50%);
background-color: rgba(0, 0, 0, 0.08);
border-radius: 6px;
}
+
+.logged-user-w .logged-user-toggler-arrow_change {
+ padding: 3px;
+ font-size: 14px;
+ position: absolute;
+ top: 58%;
+ right: 5%;
+ -webkit-transform: translateY(-50%);
+ transform: translateY(-50%);
+ background-color: rgba(0, 0, 0, 0.08);
+ border-radius: 6px;
+}
+
.logged-user-w.avatar-inline {
text-align: left;
@@ -12676,13 +12730,26 @@
padding: 3px;
font-size: 14px;
position: absolute;
- top: 50%;
- right: 15px;
+ top: 60%;
+ right: 5%;
-webkit-transform: translateY(-50%);
transform: translateY(-50%);
background-color: rgba(0, 0, 0, 0.08);
border-radius: 6px;
}
+
+.logged-user-w.avatar-inline .logged-user-toggler-arrow_change {
+ padding: 3px;
+ font-size: 14px;
+ position: absolute;
+ top: 58%;
+ right: 5%;
+ -webkit-transform: translateY(-50%);
+ transform: translateY(-50%);
+ background-color: rgba(0, 0, 0, 0.08);
+ border-radius: 6px;
+}
+
.logged-user-w.avatar-inline .logged-user-avatar-info {
display: -webkit-box;
@@ -19357,6 +19424,11 @@
position: relative;
}
+.re-title {
+ margin-top: 11px;
+ margin-left: 18px;
+}
+
.ae-item {
display: -webkit-box;
display: -ms-flexbox;
@@ -19364,8 +19436,8 @@
-webkit-box-align: center;
-ms-flex-align: center;
/*align-items: center;*/
- padding: 20px;
- border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+ padding: 15px;
+ border-bottom: 1px solid rgba(0, 0, 0, 0.3);
position: relative;
}
@@ -19429,7 +19501,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;
@@ -20489,7 +20561,8 @@
.full-chat-w .user-intro .user-intro-info .user-sub {
color: rgba(0, 0, 0, 0.7);
- font-size: 0.72rem;
+ font-size: 1rem;
+ font-weight: 600;
margin-top: 5px;
margin-bottom: 5px;
}
@@ -21103,6 +21176,22 @@
.titlename {
font-size: 0.93rem;
color: #0066ff;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+}
+
+.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;
@@ -28485,6 +28574,10 @@
margin-top: 20px !important;
}
+.mt-25 {
+ margin-top: 25px !important;
+}
+
.mt-30 {
margin-top: 30px !important;
}
@@ -28495,6 +28588,14 @@
.mt-50 {
margin-top: 50px; !important;
+}
+
+.mt--14 {
+ margin-top: -14px; !important;
+}
+
+.mr--4 {
+ margin-right: -4px !important;
}
.ml-10 {
@@ -28528,6 +28629,10 @@
.ml-30 {
margin-left: 30px !important;
+}
+
+.ml-3per {
+ margin-left: 3.3%;
}
@@ -28750,10 +28855,12 @@
}
.slider-disabled.round {
+ opacity: 50%;
border-radius: 34px;
}
.slider-disabled.round:before {
+ opacity: 50%;
border-radius: 50%;
}
@@ -28982,6 +29089,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 {
@@ -29640,7 +29754,7 @@
z-index: 2;
overflow: hidden;
margin-top: 80px;
- }
+}
.footer-w .logo-element {
text-align: center;
@@ -30050,6 +30164,16 @@
/* color: #777*/
/*}*/
+.issue-main-label {
+ font-size: 0.6rem;
+ color: #777;
+}
+
+.issue-main-label {
+ font-size: 0.6rem;
+ color: #d0cece;
+}
+
.issue-detail-tab {
font-size: 0.9rem;
font-weight: 800;
@@ -30058,6 +30182,13 @@
font-size: 0.9rem;
color: #777;
font-weight: 800;
+}
+
+.custom-detail-label {
+ color: #777;
+ font-weight: 600;
+ position: relative;
+ top: -6px;
}
input[type="number"]::-webkit-outer-spin-button,
@@ -30491,4 +30622,13 @@
margin: 0 auto;
}
-/* 媛꾪듃李⑦듃 end */
+/* �씠�뒋 �듃由� */
+/**
+ * Framework starts from here ...
+ * ------------------------------
+ */
+
+.tree,
+.tree ul {
+ list-style:none;
+}
\ No newline at end of file
--
Gitblit v1.8.0