somang4819/itsm_ysm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

소스 충돌 처리

Browse Source
This commit is contained in:
KNKIM 2021-11-19 15:06:23 +09:00
parent b3a85c702a
commit a59c6d5dcd
2 changed files with 1038 additions and 1015 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/webapp/WEB-INF/jsp/nlib/bbs/listAncmnts.jsp
View File

@ -156,6 +156,7 @@
</script> </script>
<!-- 공지사항 섹션 --> <!-- 공지사항 섹션 -->
<div class="location noti-data"> <div class="location noti-data">
<h2 class="blind">공지사항 섹션영역</h2> <h2 class="blind">공지사항 섹션영역</h2>

28
src/main/webapp/css/media.css
View File

@ -405,6 +405,13 @@ a.pop-logo img { margin-right: 10px; }
.article-side .Title.mo-ver h3 { font-weight: 500; font-size: 22px; line-height: 33px; color: #ffffff; } .article-side .Title.mo-ver h3 { font-weight: 500; font-size: 22px; line-height: 33px; color: #ffffff; }
.article-side .Title.mo-ver .filter-close { position: absolute; right: 20px; top: 20px; width: 26px; height: 26px; text-indent: 9999px; font-size: 0; overflow: hidden; background: url("/images/btn/btn_close_size_27x26_c9c9c7.png") no-repeat; background-size: 100%; } .article-side .Title.mo-ver .filter-close { position: absolute; right: 20px; top: 20px; width: 26px; height: 26px; text-indent: 9999px; font-size: 0; overflow: hidden; background: url("/images/btn/btn_close_size_27x26_c9c9c7.png") no-repeat; background-size: 100%; }
.article-side .filter-wrap { height: calc(100% - 125px); overflow: scroll; border: none; } .article-side .filter-wrap { height: calc(100% - 125px); overflow: scroll; border: none; }
.article-side .filter-wrap {display:inline-block;padding-top:100px;}
.article-side .filter-wrap .Title {display:inline-block;background: #3670a3;width: 96%;padding: 0px 2%;height: 80px;line-height: 80px;padding: 0 16px;box-sizing: border-box;width: 100%;position:absolute;top:0px;left:0px;z-index:999;}
.article-side .filter-wrap .Title span:nth-of-type(1) {font-size: 24px;font-weight: 500;margin-right: 10px;font-size: 22px;line-height: 33px;color:#fff;}
.article-side .filter-wrap .Title span:nth-of-type(2) {position: absolute;right: 16px;top: 30px;}
.article-side .filter-wrap .Title span:nth-of-type(2) .filter-close {display:inline-block;width:22px;height:22px;}
.culture-box { width: 100%; } .culture-box { width: 100%; }
.data .mo_tabs_wrap { height: 50px; } .data .mo_tabs_wrap { height: 50px; }
.data .inner .tabs { /*width: max-content;*/ display: flex;white-space:nowrap;overflow-y:hidden;overflow-x:auto;text-align:center;height:50px; } .data .inner .tabs { /*width: max-content;*/ display: flex;white-space:nowrap;overflow-y:hidden;overflow-x:auto;text-align:center;height:50px; }
@ -420,6 +427,8 @@ a.pop-logo img { margin-right: 10px; }
.data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-input { margin-left: 0; width: 100%; box-sizing: border-box; margin: 10px 0 26px; display: flex; padding: 0 0 0 36px; } .data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-input { margin-left: 0; width: 100%; box-sizing: border-box; margin: 10px 0 26px; display: flex; padding: 0 0 0 36px; }
.data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-input input { width: 100%; height: 100%; } .data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-input input { width: 100%; height: 100%; }
.data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-input button[type="submit"] { background: url("/images/icon/icon-search-mo.png") no-repeat center; right: auto; left: 0; } .data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-input button[type="submit"] { background: url("/images/icon/icon-search-mo.png") no-repeat center; right: auto; left: 0; }
.data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-input button.filter-btn {display:inline-block;position: absolute;left: auto;right: 10px;top: 4px;width: 43px;height: 26px;background:#e6e7e9;color:#666;border-radius:50px;text-indent:0;}
.data .inner .tab_content { padding-right: 16px; box-sizing: border-box; } .data .inner .tab_content { padding-right: 16px; box-sizing: border-box; }
.data .inner .tabs_item { border-top: 1px solid #222222; padding: 0; } .data .inner .tabs_item { border-top: 1px solid #222222; padding: 0; }
.data .inner .tabs_item .list-cart-wrap .list-data .list.t-tit-line { display: none; } .data .inner .tabs_item .list-cart-wrap .list-data .list.t-tit-line { display: none; }
@ -462,6 +471,7 @@ a.pop-logo img { margin-right: 10px; }
.data.detail .inner .row-bottom .con-4 .top h3, .data.detail .inner .row-bottom .con-4 .top h3,
.data.detail .inner .row-bottom .con-4 .top h3::before, .data.detail .inner .row-bottom .con-4 .top h3::before,
.data.detail .inner .row-top .center .left .img img { width: 100%; } .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:40%;padding:5% 30%;}
.data.detail .inner .row-bottom { padding: 0; } .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 { 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-1 { width: 100%; display: block; }
@ -472,6 +482,7 @@ a.pop-logo img { margin-right: 10px; }
.data.detail .inner .row-top .center .right .con-1 button.view { flex: 1; } .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.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.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 { 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 { 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 .de-data ul li { width: 100%; }
@ -525,7 +536,7 @@ a.pop-logo img { margin-right: 10px; }
.list-select select { min-width: auto; width: 100%; } .list-select select { min-width: auto; width: 100%; }
.list-table-wrap { border-top: 1px solid; } .list-table-wrap { border-top: 1px solid; }
.list-table-wrap .t-tit-line { display: none; } .list-table-wrap .t-tit-line { display: none; }
.list-table-wrap li { display: flex; align-items: center; padding: 10px; } .list-table-wrap li { display: flex; align-items: center; padding: 10px;flex-wrap:wrap;font-size:14px; }
.list-table-wrap li.no-result { justify-content: center; } .list-table-wrap li.no-result { justify-content: center; }
.list-table-wrap li span { height: auto; } .list-table-wrap li span { height: auto; }
.list-table-wrap li .t-num { font-size: 12px; } .list-table-wrap li .t-num { font-size: 12px; }
@ -536,6 +547,17 @@ a.pop-logo img { margin-right: 10px; }
.list-table-wrap li span.t-info > span { width: auto; padding-right: 10px; margin-right: 10px; border-right: 1px solid #ccc; line-height: 1; } .list-table-wrap li span.t-info > span { width: auto; padding-right: 10px; margin-right: 10px; border-right: 1px solid #ccc; line-height: 1; }
.list-table-wrap li span.t-info > span:last-child { padding: 0; margin: 0; border: none; } .list-table-wrap li span.t-info > span:last-child { padding: 0; margin: 0; border: none; }
.list-table-wrap li .t-num { position: absolute; }
.list-table-wrap li .t-type { position: absolute;left:40px; }
.list-table-wrap li .t-tit { width: 100%; padding-left: 40px; box-sizing: border-box; }
.list-table-wrap li .t-writer { padding-left: 40px; }
.list-table-wrap li .t-file {height:18px;line-height:18px;}
.list-table-wrap li .t-writer,
.list-table-wrap li .t-date,
.list-table-wrap li .t-file,
.list-table-wrap li .t-answer { width: auto; }
.list-table-wrap li .t-writer { margin-right: 10px; padding-right: 10px; border-right: 1px solid #ccc; line-height: 1; }
/* 공지사항 상세 */ /* 공지사항 상세 */
.view-tit { position: relative; padding-left: 60px; box-sizing: border-box; width: 100%; } .view-tit { position: relative; padding-left: 60px; box-sizing: border-box; width: 100%; }
.qna-data .view-tit { padding-left: 80px; } .qna-data .view-tit { padding-left: 80px; }
@ -824,9 +846,9 @@ a.pop-logo img { margin-right: 10px; }
/* 로그인 팝업 */ /* 로그인 팝업 */
.pop-login { top: 0; left: 0; width: 100vw; height: 100vh; border-radius: 0; display: flex; flex-direction: column; } .pop-login { top: 0; left: 0; width: 100vw; height: 100vh; border-radius: 0; display: flex; flex-direction: column; }
.pop-login .Title { padding: 12px 16px; text-align: left; } .pop-login .Title { padding: 25px 16px; text-align: left; }
.pop-login .Title p, .pop-login .Title p,
.pop-login .Title h3 { display: none; } .pop-login .Title h3 { }
.pop-login .inner { display: flex; flex-direction: column; align-items: center; justify-content: center; flex: 1; padding: 60px 16px; box-sizing: border-box; } .pop-login .inner { display: flex; flex-direction: column; align-items: center; justify-content: center; flex: 1; padding: 60px 16px; box-sizing: border-box; }
.pop-login .inner .First { padding: 0; width: 100%; } .pop-login .inner .First { padding: 0; width: 100%; }
.pop-login .inner .First .Btn button { font-weight: normal; font-size: 15px; } .pop-login .inner .First .Btn button { font-weight: normal; font-size: 15px; }