Merge branch 'dev/gfl_zentaopms_305' into 'master'

Dev/gfl zentaopms 305

See merge request easycorp/zentaopms!7415

module/doc/css/common.css

@@ -106,7 +106,7 @@ ol, ul {margin-bottom: 0}
 #subHeader .list-group>a.selected {color: #e9f2fb !important;}
 #pageNav #dropMenu .table-col .list-group .icon-move {display:block; float: left; font-size: 12px; padding: 3px 4px 3px 1px;}
 
-#content .detail-content.article-content {overflow-y: auto; height: calc(100vh - 200px);}
+#content .detail-content.article-content {overflow-y: auto; height: calc(100vh - 200px); padding-right: 20px;}
 #aclBox .acl-tip {color: #838a9d;}
 .ajaxCollect > img.star-empty {margin-right: 0px;}
 #outlineMenu {background: #fff; position: absolute; height: calc(100vh - 180px)!important; overflow-y: auto; top: 50px; right: 25px;}

module/doc/css/view.css

@@ -1,4 +1,4 @@
-.h-full-adjust {overflow-y: auto; height: calc(100vh - 120px);}
+.h-full-adjust {overflow-y: auto; height: calc(100vh - 125px);}
 .main-col .block-files .panel-heading {padding-right: 20px;}
 .main-col .block-files .panel-heading .panel-title {height: 35px; line-height: 30px;}
 .main-col .doc-title {display: flex; font-size: 16px; margin-bottom: 10px;}

module/doc/js/view.js

@@ -146,6 +146,7 @@ $(function()
         $('.outline').css({'min-width' : '180px', 'border-left' : '2px solid #efefef'});
         $(this).removeClass('icon-menu-arrow-left').addClass('icon-menu-arrow-right').css('left', '-9px');
         $('.outline').removeClass('hidden');
+        $('.outline-content').show();
         if($('#sidebar>.cell').is(':visible')) $('#sidebar .icon.icon-menu-arrow-right').trigger("click");
     }).on('click', '.outline-toggle i.icon-menu-arrow-right', function()
     {