Merge branch 'release/5.6' into release/security

@@ -111,7 +111,7 @@
                     </div>
                     </div>
 
 
                     <div class="extra-tip">
                     <div class="extra-tip">
-                        <a href="#">全球购物须知</a>
+                        <a href="/help/detail?id=39&contId=241">全球购物须知</a>
 
 
                         <ul class="global-buy-tips">
                         <ul class="global-buy-tips">
                             {{# illustrate_contents}}
                             {{# illustrate_contents}}

@@ -17,7 +17,11 @@
                 </div>
                 </div>
                 <div class="left swindle-info">
                 <div class="left swindle-info">
                     <a href="//www.yohobuy.com/help/detail?id=103" target="_blank">
                     <a href="//www.yohobuy.com/help/detail?id=103" target="_blank">
+<<<<<<< HEAD
+                        <i class="iconfont">&#xe706;</i>关于防诈骗的重要提醒
+=======
                         <i class="iconfont left">&#xe6ed;</i>关于防诈骗的重要提醒
                         <i class="iconfont left">&#xe6ed;</i>关于防诈骗的重要提醒
+>>>>>>> d843dacbd971592e85ffb86a67b55116ab7e73ae
                     </a>
                     </a>
                 </div>
                 </div>
                 <div class="left yoho-cert-tip"></div>
                 <div class="left yoho-cert-tip"></div>

@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg">
 <svg xmlns="http://www.w3.org/2000/svg">
 <metadata>
 <metadata>
-Created by FontForge 20120731 at Mon Apr 17 15:32:44 2017
+Created by FontForge 20120731 at Tue Apr 18 11:43:42 2017
  By admin
  By admin
 </metadata>
 </metadata>
 <defs>
 <defs>
@@ -19,7 +19,7 @@ Created by FontForge 20120731 at Mon Apr 17 15:32:44 2017
     bbox="-6 -212 2176 996"
     bbox="-6 -212 2176 996"
     underline-thickness="0"
     underline-thickness="0"
     underline-position="0"
     underline-position="0"
-    unicode-range="U+0078-E704"
+    unicode-range="U+0078-E706"
   />
   />
 <missing-glyph
 <missing-glyph
  />
  />
@@ -359,5 +359,8 @@ d="M852 587q20 0 43 -3q-19 89 -84 160.5t-161.5 111.5t-204.5 40q-121 0 -223.5 -50
 q26 0 41 -15t15 -40.5t-15 -40.5t-40 -16q-27 0 -47 16t-20 40t20 40t46 16zM301 595q-27 0 -47.5 15.5t-20.5 39.5t20.5 40t46.5 16q25 0 40.5 -15t15.5 -40t-15 -40.5t-40 -15.5zM1260 240q0 87 -53 162t-140.5 118t-185.5 43q-105 0 -192 -44t-137 -118.5t-50 -162.5
 q26 0 41 -15t15 -40.5t-15 -40.5t-40 -16q-27 0 -47 16t-20 40t20 40t46 16zM301 595q-27 0 -47.5 15.5t-20.5 39.5t20.5 40t46.5 16q25 0 40.5 -15t15.5 -40t-15 -40.5t-40 -15.5zM1260 240q0 87 -53 162t-140.5 118t-185.5 43q-105 0 -192 -44t-137 -118.5t-50 -162.5
 t50.5 -162t138 -117t191.5 -43q45 0 134 23l122 -67l-33 111q71 54 113 120t42 137zM758 295q-16 0 -30 13.5t-14 30.5t13.5 31t30.5 14q24 0 40 -13.5t16 -30.5q0 -18 -15.5 -31.5t-40.5 -13.5zM1004 295q-17 0 -31 14t-14 31t14 31t30 14q24 0 40 -13.5t16 -31.5
 t50.5 -162t138 -117t191.5 -43q45 0 134 23l122 -67l-33 111q71 54 113 120t42 137zM758 295q-16 0 -30 13.5t-14 30.5t13.5 31t30.5 14q24 0 40 -13.5t16 -30.5q0 -18 -15.5 -31.5t-40.5 -13.5zM1004 295q-17 0 -31 14t-14 31t14 31t30 14q24 0 40 -13.5t16 -31.5
 q0 -17 -15.5 -30.5t-39.5 -14.5z" />
 q0 -17 -15.5 -30.5t-39.5 -14.5z" />
+    <glyph glyph-name="notice" unicode="&#xe706;" horiz-adv-x="1025" 
+d="M509.5 -96q97.5 0 186.5 37.5t154 101.5t103.5 152.5t38.5 186t-37.5 186.5t-101.5 154t-152.5 103.5t-186 38.5t-186.5 -37.5t-154 -101.5t-103.5 -152.5t-38.5 -186t37.5 -186.5t101.5 -154t152.5 -103.5t186 -38.5zM207 692q62 61 141 93.5t166 32t166 -33.5t140 -95
+t93.5 -141t32 -166t-33.5 -166t-95 -140t-141 -93.5t-166 -32t-166 33.5t-140 95t-93.5 141t-32 166t33.5 166t95 140zM552 364l-80 1l1 272h80zM551 131h-80v80h80v-80z" />
   </font>
   </font>
 </defs></svg>
 </defs></svg>

@@ -1006,6 +1006,7 @@
             color: #d71d32;
             color: #d71d32;
             font-size: 14px;
             font-size: 14px;
             margin-right: 5px;
             margin-right: 5px;
+            -webkit-text-stroke-width: 0.5px;
         }
         }
     }
     }
 }
 }