Merge branch 'gq' of ssh://git.9026.com:2212/roobe/miao into gq

miaomiao/www/css/style.css

@@ -142,7 +142,6 @@ overflow:auto;
 }
     .mainitem img {
         width:100%;
-        max-height: 220px;
     }
     .mainitem .row .col img {
         max-width: 45px;

miaomiao/www/templates/home/dream-detail.html

@@ -26,7 +26,7 @@
                     </div>
                 </ion-slide-page>
                 <ion-slide-page ng-repeat="img in dream.imgs" >
-                    <div class="box banner"><img ng-src="{{img.pic}}" style="max-height: 200px;width: 100%" /></div>
+                    <div class="box banner"><img ng-src="{{img.pic}}" style="width: 100%" /></div>
                 </ion-slide-page>
             </ion-slides>
             <div class="list detail-list">