Merge branch 'feature/h5detail' of git.dev.yoho.cn:web/yohobuy-frontend into feature/h5detail

Conflicts:
	mobile/public/sass/_article-type-three.scss
	mobile/views/partials/article-type-three.html

 var yohobuyMobile;
 
 require('./public/js/article-type-three');
+require('./public/js/related-post');
 
 module.exports = yohobuyMobile;

@@ -31,7 +31,7 @@
     </script>
     <script src="//localhost:5000/dist/all-debug.js"></script>
     <script type="text/javascript">
-        seajs.use('yohobuy-mobile/1.0.0/public/js/article-type-three-debug', function(article) {
+        seajs.use(['yohobuy-mobile/1.0.0/public/js/article-type-three-debug','yohobuy-mobile/1.0.0/public/js/related-post-debug'], function(article) {
             if (article) {
                 article.init();
             }

@@ -13,8 +13,9 @@
   "spm": {
     "main": "index.js",
     "dependencies": {
-      "jquery": "2.1.3",
-      "jquery-pjax": "1.0.1"
+      "jquery": "1.8.3",
+      "jquery-pjax": "1.0.1",
+      "mlellipsis": "0.0.2"
     },
     "devDependencies": {
       "expect.js": "0.3.1"
@@ -42,4 +43,4 @@
     "gulp-develop-server": "^0.4.2",
     "hbs": "^3.0.1"
   }
-}
+}
\ No newline at end of file

@@ -77,7 +77,7 @@ module.exports = function() {
                             },
                             {
                                 thumb: 'http://placehold.it/98x134',
-                                type: 'bag',
+                                type: 'lamp',
                                 products: [
                                     {
                                         thumb: 'http://placehold.it/276x366',
@@ -177,7 +177,7 @@ module.exports = function() {
                             },
                             {
                                 thumb: 'http://placehold.it/98x134',
-                                type: 'handset',
+                                type: 'watch',
                                 products: [
                                     {
                                         thumb: 'http://placehold.it/276x366',
@@ -227,7 +227,7 @@ module.exports = function() {
                             },
                             {
                                 thumb: 'http://placehold.it/98x134',
-                                type: 'pants',
+                                type: 'pent',
                                 products: [
                                     {
                                         thumb: 'http://placehold.it/276x366',

+/**
+ * 相关文章
+ * @author: yue.liu@yoho.cn
+ * @date；2015/3/31
+ */
+
+var $ = require('jquery'),
+    ellipsis = require('mlellipsis');
+
+ellipsis.init();
+$(".post-list").find("span").each(function(){
+    $(this).mlellipsis(2);
+})
\ No newline at end of file

@@ -14,8 +14,10 @@
     }
 
     .more-good {
-        padding: 0 0 0 15rem / $pxConvertRem;
+        padding: 0 0 0 30rem / $pxConvertRem;
+        margin: 0 0 0 -15rem / $pxConvertRem;
         line-height: 88rem / $pxConvertRem;
+        border-top: 1px solid #e0e0e0;
 
         a {
             text-decoration: none;

@@ -20,6 +20,7 @@ $pxConvertRem : 40;
         border-bottom: 2px solid #efefef;
 
         .thumb {
+            position: relative;
             display: inline-block;
             position: relative;
             margin-right: 22rem / $pxConvertRem;
@@ -29,7 +30,7 @@ $pxConvertRem : 40;
                 margin-right: 0;
             }
 
-            &.focus {
+            &.focus { 
                 border-color: #000;
                 .arrow {
                     display: block;
@@ -41,7 +42,7 @@ $pxConvertRem : 40;
                 width: 96rem / $pxConvertRem;
             }
         }
-
+        
         .arrow {
             display: none;
             position: absolute;
@@ -73,35 +74,37 @@ $pxConvertRem : 40;
     }
 
     .clothe-type {
-        background: url('../img/clothes-type-sd8fa28a215.png') no-repeat;
-        width: 47rem / $pxConvertRem;
-        height: 47rem / $pxConvertRem;
+        position: absolute;
+        right: 6rem / $pxConvertRem;
+        bottom: 6rem / $pxConvertRem;
+        background: url('../img/clothes-type-s6453a814c2.png') no-repeat;
+        width: 15px;
+        height: 15px;
+        background-size: 100%;
 
         &.bag {
             background-position: 0 0;
         }
         &.cloth {
-            background-position: 0 -47px;
+            background-position: 0 -47px * (15/47);
         }
         &.dress {
-            background-position: 0 -94px;
+            background-position: 0 -94px * (15/47);
         }
         &.headset {
-            background-position: 0 -141px;
+            background-position: 0 -141px * (15/47);
         }
         &.lamp {
-            width: 45rem / $pxConvertRem;
-            height: 45rem / $pxConvertRem;
-            background-position: 0 -188px;
+            background-position: 0 -188px * (15/47);
         }
         &.pent {
-            background-position: 0 -233px;
+            background-position: 0 -233px * (15/47);
         }
         &.shoe {
-            background-position: 0 -280px;
+            background-position: 0 -280px * (15/47);
         }
         &.watch {
-            background-position: 0 -327px;
+            background-position: 0 -327px * (15/47);
         }
     }
 }
\ No newline at end of file

 {{# recommendation}}
     <div class="article-type-five clearfix">
         <h2>相关推荐</h2>
-        {{# list}}
-            {{> good_info}}
-        {{/ list}}
+        <div class="good-list clearfix">
+            {{# list}}
+                {{> good_info}}
+            {{/ list}}
+        </div>
         <div class="more-good clearfix">
             <a href="{{moreProds}}">
                 更多商品
@@ -11,4 +13,4 @@
             </a>
         </div>
     </div>
-{{/ recommendation}}
\ No newline at end of file
+{{/ recommendation}}

 {{# smallImage}}
-    <div class="article-type-four">
+    <div class="article-type-four clearfix">
         {{# imgs}}
             <img src="{{src}}" alt="{{alt}}">
         {{/ imgs}}

@@ -9,6 +9,7 @@
                             <em>&#9670;</em>
                             <span>&#9670;</span>
                         </div>
+                        <span class="clothe-type {{type}}"></span>
                     </li>
                 {{/ list}}
             </ul>
@@ -23,4 +24,4 @@
             {{/ list}}
         </div>
     </div>
-{{/ collocation}}
\ No newline at end of file
+{{/ collocation}}