Browse Source

Merge branch 'develop'

# Conflicts:
#	Application/Home/View/Item/show.html
star7th 9 years ago
parent
commit
796fb7d654
2 changed files with 9 additions and 1 deletions
  1. 1 1
      Application/Home/View/Item/show.html
  2. 8 0
      Public/css/item/show.css

+ 1 - 1
Application/Home/View/Item/show.html

@@ -1,5 +1,5 @@
 <include file="Common/header" />
 <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" >
 <div class="doc-head row" >

+ 8 - 0
Public/css/item/show.css

@@ -83,6 +83,14 @@
   margin-left: -16px;
   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){
 @media screen and (min-width:1200px){
   .doc-right{ width: 900px;} 
   .doc-right{ width: 900px;} 
 }
 }