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

Merge branch 'master' of http://docs.nculture.org:30000/nculture/iams.nlib

Browse Source
This commit is contained in:
JSYOO 2021-12-21 15:41:00 +09:00
commit e78eb32300
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp
View File

@ -584,7 +584,7 @@ $(function(){
autoplay : false, autoplay : false,
pagination: { pagination: {
el: '.pagination .swiper-pagination', el: '.pagination .swiper-pagination',
/*type: 'fraction',*/ type: 'fraction',
}, },
breakpoints: { breakpoints: {
768: { 768: {
@ -592,7 +592,7 @@ $(function(){
spaceBetween : 20, spaceBetween : 20,
}, },
1400: { 1400: {
slidesPerView : 2, slidesPerView : 4,
spaceBetween : 30, spaceBetween : 30,
}, },
4989: { 4989: {

2
src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp
View File

@ -391,7 +391,7 @@ function fn_search_article(pageIndex) {
<div class="title"> <div class="title">
<c:choose> <c:choose>
<c:when test="${searchVO.realQuery ne '' && (!empty searchVO.realQuery) }"> <c:when test="${searchVO.realQuery ne '' && (!empty searchVO.realQuery) }">
<span class="count"><strong><c:out value='${searchVO.realQuery}'/></strong>에 대한 검색결과는 총 <em> <span class="count"><strong>&#39;<c:out value='${searchVO.realQuery}'/>&#39;</strong> 에 대한 검색결과는 총 <em>
<fmt:formatNumber value="${searchVO.totalCount}" pattern="#,###" /></em>건 입니다. <fmt:formatNumber value="${searchVO.totalCount}" pattern="#,###" /></em>건 입니다.
</span> </span>
</c:when> </c:when>

4
src/main/webapp/css/default.css
View File

@ -913,9 +913,9 @@ transform: rotate(45deg);}
.data .inner .tabs_item .list-cart-wrap .list-data div.list > .no-result .text2 {margin-bottom:30px;font-size:24px;color:#333;font-weight: 500;} .data .inner .tabs_item .list-cart-wrap .list-data div.list > .no-result .text2 {margin-bottom:30px;font-size:24px;color:#333;font-weight: 500;}
.data .inner .tabs_item .list-cart-wrap .list-data div.list > .no-result .text2 span {color:#d47b1c;} .data .inner .tabs_item .list-cart-wrap .list-data div.list > .no-result .text2 span {color:#d47b1c;}
.data .inner .data-box .culture-box .tab > .title {height:36px;margin:30px 0px 0px;outline:0px solid red;text-align:left;} .data .inner .data-box .culture-box .tab > .title {height:36px;margin:30px 0px 0px;outline:0px solid red;text-align:left;}
.data .inner .data-box .culture-box .tab .title .count {display:inline-block;font-size:16px;height:36px;line-height:36px;text-align:left;} .data .inner .data-box .culture-box .tab .title .count {display:inline-block;font-size:16px;height:auto;line-height:26px;text-align:left;}
.data .inner .data-box .culture-box .tab .title .count em {color:#d47b1c;font-weight: 500;} .data .inner .data-box .culture-box .tab .title .count em {color:#d47b1c;font-weight: 500;}
.data .inner .data-box .culture-box .tab .title .count strong {display:block;} .data .inner .data-box .culture-box .tab .title .count strong {word-break: break-all;display: inline;padding-bottom:10px;}
.data .inner .data-box .culture-box .tab .title .list-search-wrap {float:right;} .data .inner .data-box .culture-box .tab .title .list-search-wrap {float:right;}
.data .inner .data-box .culture-box .tab .title .list-search-wrap > div {float:left;font-size:12px;margin-left:10px;height:36px;line-height:36px;} .data .inner .data-box .culture-box .tab .title .list-search-wrap > div {float:left;font-size:12px;margin-left:10px;height:36px;line-height:36px;}
.data .inner .data-box .culture-box .tab .title .list-search-wrap > div.re-search {} .data .inner .data-box .culture-box .tab .title .list-search-wrap > div.re-search {}

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

@ -251,7 +251,7 @@ footer .family_site {right:10px;}
.wrap .nav-wrap #primary-nav {display:none !important;opacity:0 !important;} .wrap .nav-wrap #primary-nav {display:none !important;opacity:0 !important;}
.data.detail .inner .row-top .center .title-box .tit-info {width:70%;} .data.detail .inner .row-top .center .title-box .tit-info {width:70%;}
.sec5 .popularSwiper .pagination {visibility:visible !important;} .sec5 .popularSwiper .pagination {visibility: hidden;}
/* /*
.sec6 .swiper-button-next, .swiper-rtl .swiper-button-prev {visibility:visible !important;} .sec6 .swiper-button-next, .swiper-rtl .swiper-button-prev {visibility:visible !important;}
.sec6 .swiper-button-prev, .swiper-rtl .swiper-button-next {visibility:visible !important;} .sec6 .swiper-button-prev, .swiper-rtl .swiper-button-next {visibility:visible !important;}