From 154957b0816b382c4465d518b01ad5b8bf7f0d1f Mon Sep 17 00:00:00 2001 From: KNKIM Date: Tue, 14 Dec 2021 18:04:07 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=EC=B6=A9=EB=8F=8C=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp | 59 +++++++++++-------- .../webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp | 8 +-- 2 files changed, 40 insertions(+), 27 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp b/src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp index 48f7a594..b066b91d 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp @@ -42,11 +42,11 @@ - + - + @@ -73,7 +73,7 @@ $(window.document).ready(function() { nhn.husky.EZCreator.createInIFrame({ oAppRef: oEditors, elPlaceHolder: "content", - sSkinURI: "${pageContext.request.contextPath}/js/smartEditor/SmartEditor2Skin.html", + sSkinURI: "/js/smartEditor/SmartEditor2Skin.html", fCreator: "createSEditor2" }); @@ -82,20 +82,24 @@ $(window.document).ready(function() { //-------------------------------------------------------------------- // 파일업로드 객체 생성 myDropzone = new Dropzone("form#myDropzone", { - url: "${pageContext.request.contextPath}/fileupload/uploadFilesAjax.do?subPathKey=fileupload.bbs.qna.subpath&attachFileId=" - }); + url: "/fileupload/uploadFilesAjax.do?subPathKey=fileupload.bbs.qna.subpath&attachFileId=", + maxFilesize: , + maxFiles: , + parallelUploads: , + acceptedFiles: "" + }); // 기존 첨부파일 출력 var re = /(?:\.([^.]+))?$/; myDropzone.addFile({ - name: '${attachFile.orignlFileNm}', - size:${attachFile.fileSize}, - type:re.exec('${attachFile.orignlFileNm}')[1], - attachFileId: '${attachFile.attachFileId}', - streFileNm: '${attachFile.streFileNm}', - fileSn: '${attachFile.fileSn}', + name: '', + size: , + type:re.exec('')[1], + attachFileId: '', + streFileNm: '', + fileSn: '', fileUploadType: 'uploaded' }); @@ -104,8 +108,14 @@ $(window.document).ready(function() { // 각 파일별 업로드 성공시 호출됨 (1th called) myDropzone.on("success", function(file, responseText) { var jobj = JSON.parse(responseText); - console.log("file upload success : responseText = " + responseText); - console.log("fileUpDone count : " + fileList.length); + + //console.log("file upload success : responseText = " + responseText); + //console.log("fileUpDone count : " + fileList.length); + + if(jobj.length < 1) { + alert("[" + file.name + "] 첨부파일 업로드 처리가 취소되었습니다. \n\n다음에 해당하는 경우, 업로드가 취소됩니다.\n- 최대 파일수 초과 \n- 파일용량 초과 \n- 첨부가능한 파일 종류가 아닌 경우"); + return; + } var idx = fileList.length; fileList[idx++] = { "attachFileId" : jobj[0].attachFileId, @@ -118,12 +128,10 @@ $(window.document).ready(function() { console.log("success : " + file.name + " -> " + "data > " + jobj[0].streFileNm); }); - /* myDropzone.on("error", function(file, message) { myDropzone.removeFile(file); alert(message); - }); - */ + }); myDropzone.on("removedfile", function(file) { var idx = delFileList.length; @@ -138,25 +146,28 @@ $(window.document).ready(function() { // 각 파일별 업로드 처리 완료 시 호출됨 (2th called) myDropzone.on("complete", function(file) { - console.log("개별 파일 처리 완료 > file = " + JSON.stringify(file)); + //alert("개별 파일 처리 완료 > file = " + JSON.stringify(file)); }); - + // 모든 업로드 처리 완료 시 호출됨 myDropzone.on("queuecomplete", function() { var targetCnt = this.getAcceptedFiles().length; var uploadCnt = fileList.length; - var queuedCnt = this.getQueuedFiles(); + + console.log(targetCnt + " > " + uploadCnt); if(uploadCnt > 0) { $("#fileList").val(JSON.stringify(JSON.stringify(fileList))); } if(IN_PROC) { - if(queuedCnt > 0 && targetCnt > 0 && targetCnt != uploadCnt) { + if(targetCnt > 0 && targetCnt != uploadCnt) { alert("일부 첨부파일 등록이 실패하였습니다.\n총 " + targetCnt + "건의 첨부파일 중 " + uploadCnt + "건이 정상적으로 업로드 되었습니다.\n글 등록을 계속 진행합니다."); } fn_saveSubmit(); } + + }); //-------------------------------------------------------------------- @@ -180,7 +191,7 @@ function fn_list() { $('#articleForm').removeAttr('onsubmit'); - $("#articleForm").attr("action", "${pageContext.request.contextPath}/bbs/listQnas.do"); + $("#articleForm").attr("action", "/bbs/listQnas.do"); $("#articleForm").submit(); } @@ -253,7 +264,6 @@ function fn_saveSubmit() { $("#articleForm").submit(); } - //파일 다운로드 function fn_downloadFile(attachFileId, fileSn) { @@ -272,6 +282,7 @@ function fn_downloadFile(attachFileId, fileSn) { $("#downloadFileForm").submit(); } + @@ -376,9 +387,11 @@ function fn_downloadFile(attachFileId, fileSn) {
- +
+ + diff --git a/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp b/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp index 28fb8c2e..9698e738 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp @@ -38,7 +38,7 @@ $( document ).ready(function() { - fn_setPageTitle(""); + fn_setPageTitle("Q&A"); // 검색 수행 이벤트 $("#btnSearch").on("click", function(e) { @@ -51,10 +51,10 @@ }); // 메시지 표출 - if(!gfn_isEmpty("")) { + if(!gfn_isEmpty("") || !gfn_isEmpty("")) { setTimeout(function() { - alert(""); - }, 1000); // 화면 표출되도록 딜레이 줌 + alert("" + " "); + }, 700); // 화면 표출되도록 딜레이 줌 } //초기 자료 조회 From d07e5976c3366c7759295fb52fba786c9f306664 Mon Sep 17 00:00:00 2001 From: KNKIM Date: Tue, 14 Dec 2021 18:10:01 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=EC=A4=91=EA=B0=84=20=EB=B0=B1=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp | 9 --------- src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp b/src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp index 2090bbaf..b066b91d 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp @@ -94,21 +94,12 @@ $(window.document).ready(function() { var re = /(?:\.([^.]+))?$/; myDropzone.addFile({ -<<<<<<< HEAD name: '', size: , type:re.exec('')[1], attachFileId: '', streFileNm: '', fileSn: '', -======= - name: '', - size:, - type:re.exec('')[1], - attachFileId: '', - streFileNm: '', - fileSn: '', ->>>>>>> refs/remotes/origin/master fileUploadType: 'uploaded' }); diff --git a/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp b/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp index 9698e738..ba841f4a 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp @@ -38,7 +38,7 @@ $( document ).ready(function() { - fn_setPageTitle("Q&A"); + fn_setPageTitle(""); // 검색 수행 이벤트 $("#btnSearch").on("click", function(e) { From 59602674ab4e77c46e618b5f24c2457056fc2dce Mon Sep 17 00:00:00 2001 From: KNKIM Date: Tue, 14 Dec 2021 18:12:18 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=ED=83=9C=EA=B7=B8=20=EC=98=A4=ED=83=80=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp index 19d18776..8b6966ba 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp @@ -353,7 +353,7 @@ From 82fb836dba701df5a28357c1c39332f434ebeeee Mon Sep 17 00:00:00 2001 From: com02 Date: Tue, 14 Dec 2021 18:58:16 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=EC=86=8C=EC=9E=A5=EC=9E=90=EB=A3=8C=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/nlib/collection/searchItemDetail.jsp | 21 ++++--- src/main/webapp/css/default.css | 63 ++++++++++--------- src/main/webapp/css/media.css | 38 ++++++----- 3 files changed, 67 insertions(+), 55 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp index 5adb95c5..09a81f26 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp @@ -93,8 +93,9 @@ function goList(){
-
-
+ +
+
온라인열람 @@ -113,11 +114,8 @@ function goList(){
-
-
" alt="">
-
-
-
+
+
@@ -130,7 +128,14 @@ function goList(){
-
+
+ +
+
" alt="">
+
+ +
+
  • diff --git a/src/main/webapp/css/default.css b/src/main/webapp/css/default.css index 8adf3f2f..baaae9fe 100644 --- a/src/main/webapp/css/default.css +++ b/src/main/webapp/css/default.css @@ -930,39 +930,42 @@ transform: rotate(45deg);} .data.detail .inner {} .data.detail .inner .row-top {width:100%;padding:45px 0px;display:inline-block;background: linear-gradient(to right, #485864, #6a7b8c);} .data.detail .inner .row-top .center {width:1400px;margin:0 auto;} +.data.detail .inner .row-top .center .title-box {display:inline-block;position:relative;width:100%;} +.data.detail .inner .row-top .center .title-box .cla-info {margin-bottom:10px;} +.data.detail .inner .row-top .center .title-box .cla-info .con-1 {display: inline;} +.data.detail .inner .row-top .center .title-box .cla-info .con-1 span {background:#fff;border:2px solid #333;border-radius:50px;color:#333;padding:1px 10px 2px;font-size:12px;font-weight: 500;display: inline-block;} +.data.detail .inner .row-top .center .title-box .cla-info .con-1 span.online {color:#376795;border:2px solid #376795;} +.data.detail .inner .row-top .center .title-box .cla-info .con-1 span.loan {color:#b68946;border:2px solid #b68946;} +.data.detail .inner .row-top .center .title-box .cla-info .con-1 span.visit {color:#2b8b99;border:2px solid #2b8b99;} +.data.detail .inner .row-top .center .title-box .cla-info .con-2 {display: inline-block;padding:0px 0px 0px 10px;} +.data.detail .inner .row-top .center .title-box .cla-info .con-2 .code {font-size:16px;color:#fff;line-height: 26px;} +.data.detail .inner .row-top .center .title-box .tit-info {font-size:24px;color:#fff;font-weight: 500;margin-bottom:20px;/*max-height: 105px;*/width:100%;height:auto;padding-bottom:10px;overflow: hidden;border-bottom:1px solid #ddd;margin-bottom: 30px;} + +.data.detail .inner .row-top .center .title-box .btn-info {display: inline-block;position:absolute;right:0px;top:0px;} +.data.detail .inner .row-top .center .title-box .btn-info button {background:#f5f5f5;width:auto;height:30px;line-height:28px;width:30px;border-radius: 3px;font-size:14px;color:#222;font-weight: 500;text-align: center;border:1px solid #ddd;} +.data.detail .inner .row-top .center .title-box .btn-info button.view {width:auto;padding:0px 26px;} +.data.detail .inner .row-top .center .title-box .btn-info button.ris {} +.data.detail .inner .row-top .center .title-box .btn-info button.favorit {text-indent: -99999px;background:url(/images/icon/icon-data-star.png) no-repeat center #f5f5f5;} +/*.data.detail .inner .row-top .center .right .con-1 button.favorit.on {background:url(/images/icon/icon-data-star-on.png) no-repeat center #f5f5f5;}*/ +.data.detail .inner .row-top .center .title-box .btn-info button.share {text-indent: -99999px;background:url(/images/icon/icon-data-share.png) no-repeat center #f5f5f5;} +.data.detail .inner .row-top .center .title-box .btn-info button.original {width:200px;display:none;} + .data.detail .inner .row-top .center .left {float:left;width:490px;margin-right:60px;text-align:left;} .data.detail .inner .row-top .center .right {float:left;width:850px;text-align: left;} -.data.detail .inner .row-top .center .left .cla {margin-bottom:10px;} -.data.detail .inner .row-top .center .left .cla .con-1 {display: inline;} -.data.detail .inner .row-top .center .left .cla .con-1 span {background:#fff;border:2px solid #333;border-radius:50px;color:#333;padding:1px 10px 2px;font-size:12px;font-weight: 500;display: inline-block;} -.data.detail .inner .row-top .center .left .cla .con-1 span.online {color:#376795;border:2px solid #376795;} -.data.detail .inner .row-top .center .left .cla .con-1 span.loan {color:#b68946;border:2px solid #b68946;} -.data.detail .inner .row-top .center .left .cla .con-1 span.visit {color:#2b8b99;border:2px solid #2b8b99;} -.data.detail .inner .row-top .center .left .cla .con-2 {display: inline-block;padding:0px 0px 0px 10px;} -.data.detail .inner .row-top .center .left .cla .con-2 .code {font-size:16px;color:#fff;line-height: 26px;} -.data.detail .inner .row-top .center .left .tit {font-size:24px;color:#fff;font-weight: 500;margin-bottom:20px;/*max-height: 105px;*/height:auto;overflow: hidden;} .data.detail .inner .row-top .center .left .img {background:#fff;display: inline-block;width:100%;height:445px;display: flex;align-items: center;justify-content: center;} -.data.detail .inner .row-top .center .right .con-1 {display: inline-block;width:100%;height:100px;border-bottom:1px solid #ddd;text-align: right;margin-bottom: 30px;} -.data.detail .inner .row-top .center .right .con-1 button {background:#f5f5f5;width:auto;height:30px;line-height:28px;width:30px;border-radius: 3px;font-size:14px;color:#222;font-weight: 500;text-align: center;border:1px solid #ddd;margin-top:55px;} -.data.detail .inner .row-top .center .right .con-1 button.view {width:auto;padding:0px 26px;} -.data.detail .inner .row-top .center .right .con-1 button.ris {} -.data.detail .inner .row-top .center .right .con-1 button.favorit {text-indent: -99999px;background:url(/images/icon/icon-data-star.png) no-repeat center #f5f5f5;} -/*.data.detail .inner .row-top .center .right .con-1 button.favorit.on {background:url(/images/icon/icon-data-star-on.png) no-repeat center #f5f5f5;}*/ -.data.detail .inner .row-top .center .right .con-1 button.share {text-indent: -99999px;background:url(/images/icon/icon-data-share.png) no-repeat center #f5f5f5;} - .data.detail .inner .row-top .center .right .con-1 button.original {width:200px;display:none;} -.data.detail .inner .row-top .center .right .con-2 {} -.data.detail .inner .row-top .center .right .con-2 .de-data {} -.data.detail .inner .row-top .center .right .con-2 .de-data ul {width: 100%;/*display: flex;flex-direction: column;*/} -.data.detail .inner .row-top .center .right .con-2 .de-data ul li {float:left;width:50%;margin:0px 0px 12px;} -.data.detail .inner .row-top .center .right .con-2 .de-data ul.full-width li {width:100%;} -.data.detail .inner .row-top .center .right .con-2 .de-data ul li span {font-size:14px;color:#fff;} -.data.detail .inner .row-top .center .right .con-2 .de-data ul li span:nth-of-type(1) {font-weight: 400;display:inline-block;margin-right:20px;min-width:70px;} -.data.detail .inner .row-top .center .right .con-2 .de-data ul li span:nth-of-type(2) {font-weight: 200;} -.data.detail .inner .row-top .center .right .con-2 .b-btn {margin:30px 0px 25px;display:inline-block;width:100%;} -.data.detail .inner .row-top .center .right .con-2 .b-btn button {font-size:14px;font-weight: 500;} -.data.detail .inner .row-top .center .right .con-2 .keyword {} -.data.detail .inner .row-top .center .right .con-2 .keyword span {background: #f4f4f4;color:#333;display:inline-block;padding:1px 10px 2px;border-radius: 50px;font-size:12px;margin-bottom:5px;} -.data.detail .inner .row-top .center .right .con-2 .keyword span.first {background: #b68948;color:#fff;margin-right:10px;padding:1px 16px 2px;} +.data.detail .inner .row-top .center .right .data-info {} +.data.detail .inner .row-top .center .right .data-info .de-data {} +.data.detail .inner .row-top .center .right .data-info .de-data ul {width: 100%;/*display: flex;flex-direction: column;*/} +.data.detail .inner .row-top .center .right .data-info .de-data ul li {float:left;width:50%;margin:0px 0px 12px;} +.data.detail .inner .row-top .center .right .data-info .de-data ul.full-width li {width:100%;} +.data.detail .inner .row-top .center .right .data-info .de-data ul li span {font-size:14px;color:#fff;} +.data.detail .inner .row-top .center .right .data-info .de-data ul li span:nth-of-type(1) {font-weight: 400;display:inline-block;margin-right:20px;min-width:70px;} +.data.detail .inner .row-top .center .right .data-info .de-data ul li span:nth-of-type(2) {font-weight: 200;} +.data.detail .inner .row-top .center .right .data-info .b-btn {margin:30px 0px 25px;display:inline-block;width:100%;} +.data.detail .inner .row-top .center .right .data-info .b-btn button {font-size:14px;font-weight: 500;} +.data.detail .inner .row-top .center .right .data-info .keyword {} +.data.detail .inner .row-top .center .right .data-info .keyword span {background: #f4f4f4;color:#333;display:inline-block;padding:1px 10px 2px;border-radius: 50px;font-size:12px;margin-bottom:5px;} +.data.detail .inner .row-top .center .right .data-info .keyword span.first {background: #b68948;color:#fff;margin-right:10px;padding:1px 16px 2px;} .data.detail .inner .row-bottom .con-1 {display:inline-block;width:100%;border:1px solid #ddd;margin:50px 0px 100px;} .data.detail .inner .row-bottom .con-1 .list-box {display:inline-block;width:100%;padding:25px 0px;} .data.detail .inner .row-bottom .con-1 .list-box .list {float:left;width:24.9%;border-right:1px solid #ddd;text-align: center;} diff --git a/src/main/webapp/css/media.css b/src/main/webapp/css/media.css index 1618ce4f..c397a84f 100644 --- a/src/main/webapp/css/media.css +++ b/src/main/webapp/css/media.css @@ -158,7 +158,7 @@ footer .family_site {right:10px;} .article-side {width:22%;margin-right:2%;} .culture-box {width:74%;} .data.detail .inner .row-top .center .left {width:40%;} -.data.detail .inner .row-top .center .left .img img {} +.data.detail .inner .row-top .center .left .img img {width:100%;max-height: 430px;max-width: 300px;} .data.detail .inner .row-top .center .right {width:54%;} .greeting .inner .row-bottom .greeting-box .gree {width:90%;padding:70px 5%;} .guide .inner .row-bottom { padding: 0px 0px 80px; box-sizing: border-box; } @@ -719,6 +719,20 @@ footer .family_site {right:10px;} /* 소장 자료 상세 */ .data.detail .inner .row-top .center { width: 100%; display: flex; flex-direction: column; padding: 0 16px; box-sizing: border-box; } + + .data.detail .inner .row-top .center .title-box .cla-info { position: relative; } + .data.detail .inner .row-top .center .title-box .cla-info .con-1 { width: 100%; display: block; } + .data.detail .inner .row-top .center .title-box .cla-info .con-2 { position: relative; top: 5px; padding: 0; } + .data.detail .inner .row-top .center .title-box .tit-info { font-size: 22px; margin-bottom: 30px;overflow:hidden; } + + .data.detail .inner .row-top .center .title-box .btn-info {position:relative;} + .data.detail .inner .row-top .center .title-box .btn-info { display: flex; height: auto; border: none; } + .data.detail .inner .row-top .center .title-box .btn-info button { margin-bottom:10px;width: 36px; height: 36px; } + .data.detail .inner .row-top .center .title-box .btn-info button.view { flex: 1; } + .data.detail .inner .row-top .center .title-box .btn-info button.ris { display: none; } + .data.detail .inner .row-top .center .title-box .btn-info button.favorit { margin: 0px 10px; } + .data.detail .inner .row-top .center .title-box .btn-info button.original {width:200px;display:inline-block;} + .data.detail .inner .row-top .center .left, .data.detail .inner .row-top .center .right, .data.detail .inner .row-bottom .con-4 .top h3, @@ -726,22 +740,12 @@ footer .family_site {right:10px;} .data.detail .inner .row-top .center .left .img img { width: 100%; } .data.detail .inner .row-top .center .left .img {background:#fff;text-align:center;width:80%;padding:5% 10%;} .data.detail .inner .row-bottom { padding: 0; } - .data.detail .inner .row-top .center .left .cla { position: relative; } - .data.detail .inner .row-top .center .left .cla .con-1 { width: 100%; display: block; } - .data.detail .inner .row-top .center .left .cla .con-2 { position: relative; top: 5px; padding: 0; } - .data.detail .inner .row-top .center .left .tit { font-size: 22px; margin-bottom: 30px;overflow:hidden; } - .data.detail .inner .row-top .center .right .con-1 { display: flex; height: auto; border: none; } - .data.detail .inner .row-top .center .right .con-1 button { margin-top: 14px; width: 36px; height: 36px; } - .data.detail .inner .row-top .center .right .con-1 button.view { flex: 1; } - .data.detail .inner .row-top .center .right .con-1 button.ris { display: none; } - .data.detail .inner .row-top .center .right .con-1 button.favorit { margin: 14px 10px 0; } - .data.detail .inner .row-top .center .right .con-1 button.original {width:200px;display:inline-block;} - .data.detail .inner .row-top .center .right .con-2 .de-data { flex-direction: column; } - .data.detail .inner .row-top .center .right .con-2 .de-data ul { width: 100%; display: flex; flex-direction: column; } - .data.detail .inner .row-top .center .right .con-2 .de-data ul li { width: 100%; } - .data.detail .inner .row-top .center .right .con-2 .b-btn button { width: 100%; margin-bottom: 6px; } - .data.detail .inner .row-top .center .right .con-2 .keyword span.first, - .data.detail .inner .row-top .center .right .con-2 .keyword span { padding: 5px 14px 5px; border-radius: 30px; } + .data.detail .inner .row-top .center .right .data-info .de-data { flex-direction: column;margin-top:20px;} + .data.detail .inner .row-top .center .right .data-info .de-data ul { width: 100%; display: flex; flex-direction: column; } + .data.detail .inner .row-top .center .right .data-info .de-data ul li { width: 100%; } + .data.detail .inner .row-top .center .right .data-info .b-btn button { width: 100%; margin-bottom: 6px; } + .data.detail .inner .row-top .center .right .data-info .keyword span.first, + .data.detail .inner .row-top .center .right .data-info .keyword span { padding: 5px 14px 5px; border-radius: 30px; } .data.detail .inner .row-top .center .left .img img {width:100%;max-height: 430px;max-width: 300px;} .data.detail .inner .row-bottom.contents { padding: 0 16px; } .data.detail .inner .row-bottom .con-1 { margin-bottom: 30px; } From 5891e3c177413fcde616c2580b5184187a2aa3bf Mon Sep 17 00:00:00 2001 From: com02 Date: Tue, 14 Dec 2021 19:14:35 +0900 Subject: [PATCH 5/5] css --- src/main/webapp/css/default.css | 6 +++--- src/main/webapp/css/media.css | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/css/default.css b/src/main/webapp/css/default.css index baaae9fe..cf630f0a 100644 --- a/src/main/webapp/css/default.css +++ b/src/main/webapp/css/default.css @@ -939,9 +939,9 @@ transform: rotate(45deg);} .data.detail .inner .row-top .center .title-box .cla-info .con-1 span.visit {color:#2b8b99;border:2px solid #2b8b99;} .data.detail .inner .row-top .center .title-box .cla-info .con-2 {display: inline-block;padding:0px 0px 0px 10px;} .data.detail .inner .row-top .center .title-box .cla-info .con-2 .code {font-size:16px;color:#fff;line-height: 26px;} -.data.detail .inner .row-top .center .title-box .tit-info {font-size:24px;color:#fff;font-weight: 500;margin-bottom:20px;/*max-height: 105px;*/width:100%;height:auto;padding-bottom:10px;overflow: hidden;border-bottom:1px solid #ddd;margin-bottom: 30px;} +.data.detail .inner .row-top .center .title-box .tit-info {font-size:24px;color:#fff;font-weight: 500;margin-bottom:20px;/*max-height: 105px;*/width:83%;height:auto;padding-bottom:10px;overflow: hidden;margin-bottom: 0px;} -.data.detail .inner .row-top .center .title-box .btn-info {display: inline-block;position:absolute;right:0px;top:0px;} +.data.detail .inner .row-top .center .title-box .btn-info {display: inline-block;position:absolute;right:0px;bottom:5px;} .data.detail .inner .row-top .center .title-box .btn-info button {background:#f5f5f5;width:auto;height:30px;line-height:28px;width:30px;border-radius: 3px;font-size:14px;color:#222;font-weight: 500;text-align: center;border:1px solid #ddd;} .data.detail .inner .row-top .center .title-box .btn-info button.view {width:auto;padding:0px 26px;} .data.detail .inner .row-top .center .title-box .btn-info button.ris {} @@ -953,7 +953,7 @@ transform: rotate(45deg);} .data.detail .inner .row-top .center .left {float:left;width:490px;margin-right:60px;text-align:left;} .data.detail .inner .row-top .center .right {float:left;width:850px;text-align: left;} .data.detail .inner .row-top .center .left .img {background:#fff;display: inline-block;width:100%;height:445px;display: flex;align-items: center;justify-content: center;} -.data.detail .inner .row-top .center .right .data-info {} +.data.detail .inner .row-top .center .right .data-info {border-top:1px solid #ddd;padding-top:20px;} .data.detail .inner .row-top .center .right .data-info .de-data {} .data.detail .inner .row-top .center .right .data-info .de-data ul {width: 100%;/*display: flex;flex-direction: column;*/} .data.detail .inner .row-top .center .right .data-info .de-data ul li {float:left;width:50%;margin:0px 0px 12px;} diff --git a/src/main/webapp/css/media.css b/src/main/webapp/css/media.css index c397a84f..2a8e7664 100644 --- a/src/main/webapp/css/media.css +++ b/src/main/webapp/css/media.css @@ -250,6 +250,7 @@ footer .family_site {right:10px;} .interested-data .inner .data-box .list-data-wrap .list-data div.list > div.t-cultural {width:20%;} .wrap .nav-wrap #primary-nav {display:none !important;opacity:0 !important;} + .data.detail .inner .row-top .center .title-box .tit-info {width:70%;} } /* 모바일 가로, 테블릿 세로 (해상도 ~ 768px)*/ @@ -723,7 +724,7 @@ footer .family_site {right:10px;} .data.detail .inner .row-top .center .title-box .cla-info { position: relative; } .data.detail .inner .row-top .center .title-box .cla-info .con-1 { width: 100%; display: block; } .data.detail .inner .row-top .center .title-box .cla-info .con-2 { position: relative; top: 5px; padding: 0; } - .data.detail .inner .row-top .center .title-box .tit-info { font-size: 22px; margin-bottom: 30px;overflow:hidden; } + .data.detail .inner .row-top .center .title-box .tit-info { font-size: 22px; margin-bottom: 30px;overflow:hidden;width:100%; } .data.detail .inner .row-top .center .title-box .btn-info {position:relative;} .data.detail .inner .row-top .center .title-box .btn-info { display: flex; height: auto; border: none; }