From 48140b6cfdb89bcd75adaa5f4d2819eae2eed5ca Mon Sep 17 00:00:00 2001 From: tolag3 Date: Fri, 6 Sep 2024 11:46:57 +0900 Subject: [PATCH] Merge branch 'tolag3' --- src/main/webapp/WEB-INF/jsp/layout/seedAdminLayout.jsp | 8 +++++--- src/main/webapp/WEB-INF/views/_common/_js/common_XHR.js | 4 ---- src/main/webapp/kccadrPb/adm/css/reset.css | 4 ++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/layout/seedAdminLayout.jsp b/src/main/webapp/WEB-INF/jsp/layout/seedAdminLayout.jsp index b46ae827..18bafc63 100644 --- a/src/main/webapp/WEB-INF/jsp/layout/seedAdminLayout.jsp +++ b/src/main/webapp/WEB-INF/jsp/layout/seedAdminLayout.jsp @@ -83,9 +83,9 @@ - + - + @@ -119,7 +119,9 @@
- +
+ +
diff --git a/src/main/webapp/WEB-INF/views/_common/_js/common_XHR.js b/src/main/webapp/WEB-INF/views/_common/_js/common_XHR.js index eee50827..297a080e 100644 --- a/src/main/webapp/WEB-INF/views/_common/_js/common_XHR.js +++ b/src/main/webapp/WEB-INF/views/_common/_js/common_XHR.js @@ -15,7 +15,6 @@ success: function (data, textStatus) { var result; try{ - console.log(data); result = eval('(' + data + ')'); }catch(ex){ $.unblockUI(); @@ -79,7 +78,6 @@ success: function (data, textStatus) { var result; try{ - console.log(data); result = eval('(' + data + ')'); }catch(ex){ $.unblockUI(); @@ -154,7 +152,6 @@ */ //20191004 주석. - //console.log(data); result = eval('(' + data + ')'); @@ -231,7 +228,6 @@ */ //20191004 주석. - //console.log(data); result = eval('(' + data + ')'); diff --git a/src/main/webapp/kccadrPb/adm/css/reset.css b/src/main/webapp/kccadrPb/adm/css/reset.css index 2dd9780b..e4c8923f 100644 --- a/src/main/webapp/kccadrPb/adm/css/reset.css +++ b/src/main/webapp/kccadrPb/adm/css/reset.css @@ -9,8 +9,8 @@ img {font-size: 0; vertical-align: middle; border: 0;} table {border-collapse: collapse; border-spacing: 0;} select, input {vertical-align: middle;} input:focus::placeholder{color: transparent;} -caption,label{width: 1px; height: 1px; margin: -1px; border: none; clip: rect(0,0,0,0); overflow: hidden;} -label{position: absolute;} +caption,label:not(.seedBody caption,label){width: 1px; height: 1px; margin: -1px; border: none; clip: rect(0,0,0,0); overflow: hidden;} +label:not(.seedBody label){position: absolute;} /* 안드로이드 및 아이폰에서 기본적으로 적용되어있는 select, input css 제거. */ select {background-color: #fff; appearance: none; -webkit-appearance: none; -moz-appearance: none;} select::-ms-expand {display: none;}