Merge branch 'develop'

# Conflicts: # Application/Home/View/Item/show.html
songzhi909 · May 28, 2016 · 796fb7d · 796fb7d
2 parents 5d65eca + 611ce66
commit 796fb7d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Application/Home/View/Item/show.html b/Application/Home/View/Item/show.html
@@ -1,5 +1,5 @@
 <include file="Common/header" />
-<link rel="stylesheet" href="__PUBLIC__/css/item/show.css?1.1.1th" />
+<link rel="stylesheet" href="__PUBLIC__/css/item/show.css?1.1d.1th" />
 
 
 <div class="doc-head row" >

diff --git a/Public/css/item/show.css b/Public/css/item/show.css
@@ -83,6 +83,14 @@
   margin-left: -16px;
 }
 
+@media screen and (min-width:1000px){
+  .doc-right{ width: 700px;} 
+}
+
+@media screen and (min-width:1100px){
+  .doc-right{ width: 800px;} 
+}
+
 @media screen and (min-width:1200px){
   .doc-right{ width: 900px;} 
 }