From c36338c5c4afb80dcb10aa176fd5ff49becd2b37 Mon Sep 17 00:00:00 2001
From: star7th <xing7th@gmail.com>
Date: Tue, 16 Aug 2016 14:19:17 +0800
Subject: [PATCH 1/4] update

---
 Application/Home/View/Page/index.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Application/Home/View/Page/index.html b/Application/Home/View/Page/index.html
index 3461fd66e..b83bba00b 100644
--- a/Application/Home/View/Page/index.html
+++ b/Application/Home/View/Page/index.html
@@ -15,5 +15,4 @@ <h3 style="text-align: center;">{$page.page_title}</h3>
 
  <include file="Common/footer" />
  <script src="__PUBLIC__/highlight/highlight.min.js"></script> 
-<script src="__PUBLIC__/js/page/index.js"></script>
-s
\ No newline at end of file
+<script src="__PUBLIC__/js/page/index.js"></script>
\ No newline at end of file

From 23c405aa6d7be42bbae6ed0e839c2c41b8a96c20 Mon Sep 17 00:00:00 2001
From: star7th <xing7th@gmail.com>
Date: Tue, 16 Aug 2016 14:23:03 +0800
Subject: [PATCH 2/4] v1.0.4

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 60be20adb..eb9b93c98 100644
--- a/composer.json
+++ b/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": [
         {

From d617cb1d3578ed6c69d96381cb3bcb5aab7aabf9 Mon Sep 17 00:00:00 2001
From: star7th <xing7th@gmail.com>
Date: Tue, 16 Aug 2016 17:55:14 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86=E4=B8=8B?=
 =?UTF-8?q?=E5=9C=A8=E5=B0=8F=E5=88=86=E8=BE=A8=E7=8E=87=E5=B1=8F=E5=B9=95?=
 =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Public/js/item/show.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Public/js/item/show.js b/Public/js/item/show.js
index e1d471927..35288d0c1 100644
--- a/Public/js/item/show.js
+++ b/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');

From c31ea112a00bbca1e662299fee9a71432ade61b9 Mon Sep 17 00:00:00 2001
From: Pete <luo.qi.gang@foocaa.com>
Date: Fri, 2 Sep 2016 15:34:04 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E6=AF=94=E8=BE=83=E5=A4=9A=E5=AF=BC=E8=87=B4=E7=9A=84=E8=B6=85?=
 =?UTF-8?q?=E5=87=BA=E5=B1=8F=E5=B9=95=E7=9A=84=E7=9B=AE=E5=BD=95=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E6=9F=A5=E7=9C=8B=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/View/Catalog/edit.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Application/Home/View/Catalog/edit.html b/Application/Home/View/Catalog/edit.html
index 40dd1c652..becfa879f 100644
--- a/Application/Home/View/Catalog/edit.html
+++ b/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 @@ <h4>{$Think.Lang.new_or_edit_catalog}</h4>
     <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>