Merge branch 'master' of github.com:star7th/showdoc

Application/Home/View/Catalog/edit.html

@@ -6,6 +6,10 @@
 .cat-list{
   max-height: 250px;
 }
+.cat-content{
+    max-height: 195px;
+    overflow-y: auto;
+}
 </style>
  <div id="edit-cat" class="modal hide fade">
   <!-- 编辑框 -->
@@ -50,7 +54,7 @@
     <div class="modal-header">
     <h4>{$Think.Lang.catalog_list}&nbsp;<small>({$Think.Lang.click_to_edit})</small></h4>
     </div>
-    <div id="show-cat">
+    <div id="show-cat" class="cat-content">
 
     <br>
     <br>

Application/Home/View/Page/index.html

@@ -15,5 +15,4 @@
 
  <include file="Common/footer" />
  <script src="__PUBLIC__/highlight/highlight.min.js"></script> 
-<script src="__PUBLIC__/js/page/index.js"></script>
-s
+<script src="__PUBLIC__/js/page/index.js"></script>

Public/js/item/show.js

@@ -29,7 +29,7 @@ $(function(){
 
 
   //根据屏幕宽度进行响应(应对移动设备的访问)
-  if( isMobile()){
+  if( isMobile()|| $(window).width() < 1000){
       AdaptToMobile();
   }
 
@@ -38,7 +38,7 @@ $(function(){
         AdaptToMobile();
     }
 
-    else if($(window).width() < 600){
+    else if($(window).width() < 1000){
         AdaptToMobile();
     }else{
       window.location.reload();
@@ -175,7 +175,7 @@ function iFrameHeight() {
       ifr.style.height = height + 'px';
 
       
-      if(!isMobile()){
+      if(!isMobile()&& $(window).width() > 1000){
         //调节左侧栏背景的最小高度
         if(height >  document.body.clientHeight){
           $(".doc-left").css("min-height",(height+60) + 'px');

composer.json

@@ -5,7 +5,7 @@
     "description": "ShowDoc is a tool greatly applicable for an IT team to share documents online",
     "keywords": ["showdoc","documents","Api"],
     "homepage": "https://github.com/star7th/showdoc",
-    "version":"v1.0.3",
+    "version":"v1.0.4",
     "license": "Apache-2.0",
     "authors": [
         {