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

src/main/webapp/css/default.css

@@ -1500,7 +1500,7 @@ transform: rotate(45deg);}
 .faq .list-accordion .question.on span {font-size:16px;color:#fff;font-weight: 400;}
 .faq .list-accordion .question.on .type {font-weight: 600;position: relative;}
 .faq .list-accordion .question.on .date {color:#fff;font-size:12px;}
-.faq .list-accordion .answer {position: relative;border-bottom: 1px solid #ddd;background: #f6f6f6;padding: 30px 20px 30px 85px;display: none;line-height: 1.8;text-align: left;}
+.faq .list-accordion .answer {position: relative;border-bottom: 1px solid #ddd;background: #f6f6f6;padding: 30px 20px 30px 85px;display: none;line-height: 1.8;text-align: left;min-height:60px;}
 .faq .list-accordion .answer::before {content: '';display: inline-block;width:3px;height:48px;background: #ccc;position: absolute;left:70px;top:35px;}
 .list-accordion .question .type::before {content: '';display: inline-block;border-radius: 50%;width:30px;height:30px;background: url(/images/icon/icon-question-on.png) no-repeat center #b68946;position: absolute;left:20px;top:14px;}
 .list-accordion .question.on .type::before {content:'';display:inline-block;border-radius: 50%;width:30px;height:30px;background: url(/images/icon/icon-question.png) no-repeat center #fff;}

src/main/webapp/css/media.css

@@ -149,11 +149,12 @@ footer .family_site {right:10px;}
 .data.detail .inner .row-bottom .con-4 .top h3 {width:100%;}
 .data.detail .inner .row-bottom .con-4 .top h3::before {content: '';width:100%;}
 .data.detail .inner .row-bottom .DetailSwiper2 {max-width:auto;}
+.data.detail .inner .row-top .center .right .con-2 .de-data ul li {width:100%;}
 .faq .inner .tab {position: relative;width:100%;margin:0 auto;}
 .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 {width:100%;}
+.data.detail .inner .row-top .center .left .img img {}
 .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; } 
@@ -695,7 +696,7 @@ footer .family_site {right:10px;}
  .data.detail .inner .row-bottom .con-4 .top h3,
  .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 {background:#fff;text-align:center;width:40%;padding:5% 30%;}
+ .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; } 
@@ -713,6 +714,7 @@ footer .family_site {right:10px;}
  .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 .left .img img {width:100%;}
  .data.detail .inner .row-bottom.contents { padding: 0 16px; } 
  .data.detail .inner .row-bottom .con-1 { margin-bottom: 30px; } 
  .data.detail .inner .row-bottom .con-1 .list-box { padding: 15px 10px; box-sizing: border-box; } 

src/main/webapp/js/default.js

@@ -252,8 +252,8 @@ $(document).ready(function(){
                 animation: {
                     // Menu animation
                     effect: "slide", // Accepts 'slide' or 'fade'
-                    show: 150,
+                    show: 0,
-                    hide: 100,
+                    hide: 0,
                 },
                 selected: "selected", // Selected class
                 arrow: "downarrow", // Dropdown arrow class