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

src/main/webapp/css/default.css

@@ -594,6 +594,7 @@ transform: rotate(45deg);
 .map .inner .row-bottom .map-box h2 {text-align:left;margin-bottom:10px;font-size:24px;font-weight: 300;}
 .map .inner .row-bottom .map-box h2 span {color:#376795;}
 .map .inner .row-bottom .map-box .info {border:1px solid #ddd;display: inline-block;width:100%;}
+.map .inner .row-bottom .map-box .info #map {height:337px !important;}
 .map .inner .row-bottom .map-box .info > div {float:left;width:21%;padding:1.95%;min-height:200px;border-right:1px solid #ddd;}
 .map .inner .row-bottom .map-box .info > div:last-child {border-right:0;}
 .map .inner .row-bottom .map-box .info > div p:nth-of-type(1) {width:80px;height:80px;line-height: 80px;display: inline-block;background: #ddd;text-align: center;border-radius: 50%;margin-bottom:10px;}

src/main/webapp/css/media.css

@@ -140,6 +140,8 @@ a.pop-logo img { margin-right: 10px; }
  .sec5 .inner .tabs_item ul li .con-1 .tit { font-size: 16px; } 
  .sec5 .inner .tabs_item ul li .con-2 p { font-size: 12px; } 
  .sec6 { padding: 52px 0px 60px; } 
+ .sec6 .inner .more-btn {top:0px;}
+ .sec6 .inner .more-btn a {font-size:12px;padding:2px 10px 3px;}
  .popularSwiper .swiper-pagination { position: relative; } 
  .popularSwiper .swiper-pagination-bullet { background: #aaaaaa; border-radius: 30px; margin-right: 4px; opacity: unset !important; } 
  .popularSwiper .swiper-pagination-bullet-active { background: #376795; width: 35px; height: 10px; } 
@@ -403,7 +405,8 @@ a.pop-logo img { margin-right: 10px; }
  .article-side .filter-wrap { height: calc(100% - 125px); overflow: scroll; border: none; } 
  .culture-box { width: 100%; } 
  .data .mo_tabs_wrap { height: 50px; } 
- .data .inner .tabs { width: max-content; display: flex; } 
+ .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 li.current::before {bottom: calc(0% - -5px);}
  .data .inner .tabs li a { border-radius: 0; border-right: none; } 
  .data .inner .tabs li:first-child a { border-top-left-radius: 3px; border-bottom-left-radius: 3px; } 
  .data .inner .tabs li:last-child a { border-right: 1px solid #ddd; border-top-right-radius: 3px; border-bottom-right-radius: 3px; } 
@@ -541,7 +544,8 @@ a.pop-logo img { margin-right: 10px; }
  .faq .contents,
  .faq .inner .tab { width: 100%; } 
  .faq .mo_tabs_wrap { padding-left: 16px; box-sizing: border-box; height: 56px; } 
- .faq .inner .tabs { width: max-content; } 
+ .faq .inner .tab_content {margin-top:20px;}
+ .faq .inner .tabs { /*width: max-content;*/ display: flex;white-space:nowrap;overflow-y:hidden;overflow-x:auto;text-align:center;height:50px; } 
  .faq .inner .tabs li { width: 130px; } 
  .faq .inner .tabs li a { border-radius: 0; } 
  .faq .inner .tabs li:first-child a { border-top-left-radius: 3px; border-bottom-left-radius: 3px; } 
@@ -567,6 +571,7 @@ a.pop-logo img { margin-right: 10px; }
  /* qna */
  .qna .contents { width: 100%; min-height: 200px; padding-bottom: 40px; } 
  .qna .inner .tabs { width: 100%; padding: 0 16px; box-sizing: border-box; } 
+ .qna .inner .tab_content {margin-top:20px;}
  .qna .title { height: auto; margin-bottom: 0; } 
  .list-search-wrap { display: flex; flex-direction: column-reverse; } 
  .data .list-search-wrap { flex-direction: column; } 

src/main/webapp/js/default.js

@@ -191,7 +191,7 @@ $(document).ready(function(){
             // Default settings
             var defaults = {
                 responsive: true,
-                width: 768, // Responsive width
+                width: 480, // Responsive width
                 button: $(this).attr("id") + "-button", // Menu button id
                 animation: {
                     // Menu animation