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 | 308 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 273 insertions(+), 35 deletions(-)
diff --git a/src/main/webapp/assets/styles/main.css b/src/main/webapp/assets/styles/main.css
index 56fdb77..0d485e4 100644
--- a/src/main/webapp/assets/styles/main.css
+++ b/src/main/webapp/assets/styles/main.css
@@ -123,7 +123,7 @@
body {
margin: 0;
font-family: "Noto Sans", "Avenir Next W01", "Proxima Nova W01", "Rubik", -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
- font-size: 0.84rem;
+ font-size: 0.8rem;
font-weight: 400;
line-height: 1.5;
color: #3E4B5B;
@@ -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,11 +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 {
@@ -975,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 {
@@ -4839,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;
@@ -5202,7 +5226,7 @@
}*/
.modal-open {
- overflow: auto
+ overflow: hidden;
}
.modal {
@@ -7594,6 +7618,10 @@
height: 100% !important;
}
+.mw-49 {
+ max-width: 49% !important;
+}
+
.mw-100 {
max-width: 100% !important;
}
@@ -7744,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 {
@@ -9884,7 +9920,7 @@
.table tfoot th,
.table thead th {
- font-size: 0.75rem;
+ font-size: 0.8rem;
}
.table th.nowrap {
@@ -10781,6 +10817,10 @@
border-radius: 40px;
}
+.btn.btn-roundRel {
+ border-radius: 100%;
+}
+
.btn.btn-upper, .all-wrapper .btn-upper.fc-button {
text-transform: uppercase;
letter-spacing: 1px;
@@ -11279,6 +11319,14 @@
.select3-selection__choice__remove {
color: #0066ff;
margin-left: 4px;
+ cursor: pointer;
+ font-size: 0.79rem;
+}
+
+.select3-selection__email__remove {
+ color: #0066ff;
+ margin-left: 8px;
+ margin-top: 7px;
cursor: pointer;
font-size: 0.79rem;
}
@@ -12637,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;
@@ -12669,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;
@@ -12740,13 +12814,15 @@
.menu-w .logo-w .logo-element,
.top-bar .logo-w .logo-element {
content: "";
- width: 60px;
- height: 30px;
- background-image: url(../images/logo-owl.png);
+ width: 110px;
+ height: 40px;
+ background-image: url(../images/logo-kisa-en.png);
+ background-size: cover;
position: relative;
display: inline-block;
vertical-align: middle;
- margin-right: 20px;
+ margin-right: 0px;
+ right: 10px;
-webkit-transition: all 0.2s ease;
transition: all 0.2s ease;
}
@@ -12754,11 +12830,13 @@
.menu-w .logo-w .logo-element:after,
.top-bar .logo-w .logo-element:after {
content: "";
- width: 105px;
- height: 31px;
- background-image: url(../images/logo-owltxt.png);
+ width: 120px;
+ height: 30px;
+ background-image: url(../images/logo-kisa-txt.png);
+ background-size: cover;
right: -20px;
- left: 70px;
+ left: 110px;
+ top: 10px;
position: absolute;
-webkit-transition: all 0.2s ease;
transition: all 0.2s ease;
@@ -12766,14 +12844,14 @@
.menu-w .logo-w .logo:hover .logo-element,
.top-bar .logo-w .logo:hover .logo-element {
- -webkit-transform: translateX(5px);
- transform: translateX(5px);
+ -webkit-transform: translateX(2px);
+ transform: translateX(2px);
}
.menu-w .logo-w .logo:hover .logo-element:after,
.top-bar .logo-w .logo:hover .logo-element:after {
- -webkit-transform: translateX(-10px);
- transform: translateX(-10px);
+ -webkit-transform: translateX(-3px);
+ transform: translateX(-3px);
}
.menu-w .logo-w .logo:hover .logo-label:after,
@@ -13013,7 +13091,7 @@
.menu-w .logo-w {
text-align: center;
- padding: 14px 1rem 14px 1.7rem;
+ padding: 10px 1rem 12px 1.1rem;
}
.menu-w .logo-w a {
@@ -14260,7 +14338,7 @@
}
.menu-position-side.menu-w.color-scheme-dark .logo-w {
- background-color: #000035;
+ background-color:#FFFFFF;
}
.menu-position-side.menu-w.color-scheme-dark .element-search:before {
@@ -16655,11 +16733,17 @@
line-height: 20px;
text-align: center;
}
-
-.auth-box-w .auth-header img {
+/* 湲곗〈 濡쒓퀬 �쐞移� 諛� �겕湲� */
+/*.auth-box-w .auth-header img {
width: 70px;
-}
+}*/
+/* �씤�꽣�꽬 吏꾪씎�썝 濡쒓퀬 �쐞移� 諛� �겕湲� 議곗젙*/
+.auth-box-w .auth-header img {
+ width: 120px;
+ position: relative;
+ bottom: 6px;
+}
.auth-box-w form {
padding: 20px 50px;
padding-bottom: 20px;
@@ -19340,6 +19424,11 @@
position: relative;
}
+.re-title {
+ margin-top: 11px;
+ margin-left: 18px;
+}
+
.ae-item {
display: -webkit-box;
display: -ms-flexbox;
@@ -19347,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;
}
@@ -19412,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;
@@ -20472,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;
}
@@ -21055,7 +21145,7 @@
border: 0px solid #047bf8;
color: #888;
margin-right: 2px;
- font-size: 0.72rem;
+ font-size: 0.8rem;
border-radius: 4px;
margin-bottom: 2px;
margin-top: 2px;
@@ -21068,7 +21158,7 @@
color: darkblue;
font-weight: 600;
margin-right: 2px;
- font-size: 0.72rem;
+ font-size: 0.8rem;
border-radius: 4px;
margin-bottom: 2px;
margin-top: 2px;
@@ -21086,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;
@@ -28468,8 +28574,28 @@
margin-top: 20px !important;
}
+.mt-25 {
+ margin-top: 25px !important;
+}
+
.mt-30 {
margin-top: 30px !important;
+}
+
+.mt-40 {
+ margin-top: 40px; !important;
+}
+
+.mt-50 {
+ margin-top: 50px; !important;
+}
+
+.mt--14 {
+ margin-top: -14px; !important;
+}
+
+.mr--4 {
+ margin-right: -4px !important;
}
.ml-10 {
@@ -28488,9 +28614,27 @@
margin-right: 20px !important;
}
+.mr-30 {
+ margin-right: 30px !important;
+}
+
+
.ml-10 {
margin-left: 10px !important;
}
+
+.ml-20 {
+ margin-left: 20px !important;
+}
+
+.ml-30 {
+ margin-left: 30px !important;
+}
+
+.ml-3per {
+ margin-left: 3.3%;
+}
+
.m-0 {
margin: 0 auto !important;
@@ -28667,6 +28811,27 @@
transition: .4s;
}
+.slider-disabled {
+ position: absolute;
+ cursor: pointer;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background-color: #2196F3;
+}
+
+.slider-disabled:before {
+ position: absolute;
+ content: "";
+ height: 18px;
+ width: 18px;
+ left: 30px;
+ bottom: 4px;
+ background-color: white;
+}
+
+
input:checked + .slider {
background-color: #2196F3;
}
@@ -28686,6 +28851,16 @@
}
.slider.round:before {
+ border-radius: 50%;
+}
+
+.slider-disabled.round {
+ opacity: 50%;
+ border-radius: 34px;
+}
+
+.slider-disabled.round:before {
+ opacity: 50%;
border-radius: 50%;
}
@@ -28914,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 {
@@ -29572,7 +29754,7 @@
z-index: 2;
overflow: hidden;
margin-top: 80px;
- }
+}
.footer-w .logo-element {
text-align: center;
@@ -29625,6 +29807,7 @@
overflow: hidden;
margin-top: 30px;
font-size: 0.69rem;
+ margin-left: 35rem;
}
.width-20-p {
@@ -29981,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;
@@ -29989,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,
@@ -30357,8 +30557,22 @@
.h3-div {
font-size: 1.75rem;
}
-
+/*translate="issue.issueTitle"*/
.info_font {
+ color: #000;
+ font-size: 0.8rem;
+ line-height: 1.5;
+ font-weight: 600;
+}
+
+.email_font {
+ color: #494848;
+ font-size: 0.75rem;
+ line-height: 1.5;
+ font-weight: 600;
+}
+
+.info_detail_font {
color: #000;
font-size: 1rem;
line-height: 1.5;
@@ -30376,10 +30590,12 @@
.TemplateIMG {
height: 50px;
width: 50px;
+ margin: 20px;
}
.TemplateIMG-selected {
border: 2px solid #0066ff;
+
}
.TemplateIMG:active {
@@ -30388,9 +30604,31 @@
.TemplateIMG:visited {
border: 2px solid #0066ff;
+
}
.Template-area {
text-align: center;
}
-/* 媛꾪듃李⑦듃 end */
+
+.TemplateEX {
+ float : left;
+}
+
+.Email-Templates {
+ height: 150px;
+ width: 300px;
+ display: none;
+ margin: 0 auto;
+}
+
+/* �씠�뒋 �듃由� */
+/**
+ * Framework starts from here ...
+ * ------------------------------
+ */
+
+.tree,
+.tree ul {
+ list-style:none;
+}
\ No newline at end of file
--
Gitblit v1.8.0