Review by myself.supply something lost when merge conflict

@@ -154,17 +154,17 @@
         <div class="promise">
             <div class="center-content clearfix">
                 <div class="left">
-                    <span class="iconfont rgbf">g</span>
+                    <span class="iconfont rgbf">&#xe62f;</span>
                     <span class="red">100%</span>
                     <span class="rgbf">品牌授权正品</span>
                 </div>
                 <div class="left">
-                    <span class="iconfont rgbf">L</span>
+                    <span class="iconfont rgbf">&#xe630;</span>
                     <span class="red">7天</span>
                     <span class="rgbf">无理由退换货</span>
                 </div>
                 <div class="left">
-                    <span class="iconfont rgbf">p</span>
+                    <span class="iconfont rgbf">&#xe61c;</span>
                     <span class="rgbf">客服电话：</span>
                     <span class="red">400-889-9646</span>
                     &nbsp;&nbsp;
@@ -176,7 +176,7 @@
                 </div>
                 <div class="right subscribe footer-right">
                     <input id="subscriber-box"  class="rgb6 top" name="subscriberBox"value="订阅我们的邮件">
-                    <a id="subscriber-btn"  href="javascript:void(0);" class="ifont rgbf">m</a>
+                    <a id="subscriber-btn"  href="javascript:void(0);" class="iconfont rgbf">&#xe61b;</a>
                 </div>
             </div>
         </div>
@@ -343,7 +343,7 @@
             </div>
         </div>
     </div>
-    <div class="return-top">
+    <div class="return-top hide">
         <span class="iconfont">&#xe610;</span>
     </div>
 </div>
\ No newline at end of file

@@ -2,7 +2,7 @@
 <!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">
 <metadata>
-Created by FontForge 20120731 at Thu Dec 17 16:09:31 2015
+Created by FontForge 20120731 at Tue Dec 29 09:49:46 2015
  By Ads
 </metadata>
 <defs>
@@ -16,10 +16,10 @@ Created by FontForge 20120731 at Thu Dec 17 16:09:31 2015
     ascent="896"
     descent="-128"
     x-height="792"
-    bbox="0 -214 1172.1 864"
+    bbox="0 -214 1172.1 894"
     underline-thickness="50"
     underline-position="-100"
-    unicode-range="U+0078-E629"
+    unicode-range="U+0078-E630"
   />
 <missing-glyph horiz-adv-x="374" 
 d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" />
@@ -134,7 +134,38 @@ q14 5 23 14.5t12 20.5t3 23t-3.5 22t-8.5 18t-10 11zM0 295v-380q0 -28 20 -48.5t49
     <glyph glyph-name="uniE627" unicode="&#xe627;" horiz-adv-x="1025" 
 d="M512 623q-167 0 -304.5 -89.5t-205.5 -236.5q-4 -9 0 -18q45 -96 121 -169.5t177 -115t212 -41.5q167 0 304.5 89.5t205.5 236.5q1 3 1.5 6t0 6t-1.5 6q-68 147 -205.5 236.5t-304.5 89.5zM512 57q-96 0 -163.5 67.5t-67.5 163.5t67.5 163.5t163.5 67.5t163.5 -67.5
 t67.5 -163.5q0 -47 -18.5 -89.5t-49.5 -73.5t-73.5 -49.5t-89.5 -18.5zM364 288q0 -61 43.5 -104.5t104.5 -43.5t104.5 43.5t43.5 104.5t-43.5 104.5t-104.5 43.5t-104.5 -43.5t-43.5 -104.5z" />
+    <glyph glyph-name="uniE628" unicode="&#xe628;" 
+d="M482 83q-24 0 -41.5 -17.5t-17.5 -42.5t17.5 -42.5t42 -17.5t42 17.5t17.5 42.5q0 16 -8 30t-21.5 22t-30.5 8zM769 83q-25 0 -42.5 -17.5t-17.5 -42.5q0 -16 8 -30t21.5 -22t30.5 -8q25 0 42.5 17.5t17.5 42.5q0 38 -34 54q-13 6 -26 6zM839 193h-417l-143 425
+q-7 18 -29 18h-127q-13 0 -22 -8t-9 -20q0 -4 1 -7t2.5 -6t3.5 -5.5t4.5 -4.5t5.5 -3.5t6.5 -2t7.5 -0.5h105l143 -424q7 -19 29 -19h439q13 0 21.5 8t8.5 20.5t-8.5 20.5t-21.5 8zM904 524l-516 45q-12 1 -18.5 -7t-1.5 -20l90 -270q4 -12 16 -21.5t24 -9.5h377q12 0 22 10
+t11 23l23 216q1 8 -2 15.5t-10 12.5t-15 6z" />
     <glyph glyph-name="uniE629" unicode="&#xe629;" 
 d="M154 686v-646h146l-14 -208l240 208h344v646h-716zM752 176h-134v159h-192v-159h-134v382h134v-148h192v148h134v-382z" />
+    <glyph glyph-name="uniE62A" unicode="&#xe62a;" 
+d="M328 -66q-3 0 -5.5 0.5t-5.5 2.5q-14 6 -14 22v128h-193q-10 0 -17.5 7t-7.5 18v549q0 10 7.5 17.5t17.5 7.5h804q7 0 13 -3.5t9 -9t3 -12.5v-549q0 -11 -7 -18t-18 -7h-401l-169 -146q-7 -7 -16 -7zM171 172h188q10 0 17.5 -7.5t7.5 -17.5v-73l103 92q7 6 17 6h350v426
+h-683v-426zM739 485h-454q-5 0 -9.5 2t-8 5t-5.5 8t-2 10q0 10 7.5 17.5t17.5 7.5h454q3 0 5.5 -0.5t4.5 -1.5t4 -2.5t3.5 -3t3 -3.5t2.5 -4.5t1.5 -5t0.5 -4.5q0 -11 -7 -18t-18 -7zM739 362h-454q-4 0 -8 1t-7 3.5t-5.5 5.5t-3.5 7t-1 8t1 8t3.5 7t5.5 5t7 3.5t8 1.5h454
+q10 0 17.5 -7.5t7.5 -18t-7 -17.5t-18 -7zM549 239h-264q-10 0 -17.5 7t-7.5 17.5t7.5 18t17.5 7.5h264q10 0 17.5 -7.5t7.5 -17.5q0 -7 -3.5 -12.5t-9 -9t-12.5 -3.5z" />
+    <glyph glyph-name="uniE62B" unicode="&#xe62b;" 
+d="M511 -144q-73 0 -141 22.5t-123 64t-96.5 96.5t-64 123t-22.5 141q0 60 16 118t45 107t70 90t90 70t107 45t119 16q90 0 173 -35.5t142.5 -95.5t95 -142.5t35.5 -172.5q0 -46 -9 -90.5t-26 -84t-41.5 -75.5t-54.5 -66t-66 -54.5t-75.5 -41.5t-84 -26t-89.5 -9zM511 703
+q-82 0 -156 -32t-127.5 -85.5t-85.5 -127.5t-32 -155q0 -109 54 -201.5t146 -146t200.5 -53.5t201 53.5t146 146t53.5 201.5q0 165 -117.5 282.5t-282.5 117.5zM465 164v29q0 9 1 17.5t2 15.5l2 10q1 5 3 9.5t4 8.5q1 2 2 4.5t2 4.5t2.5 4t2.5 4t2.5 4.5t3.5 4.5
+q10 12 24 26l35 33q15 13 25.5 29.5t10.5 39.5q0 15 -5 27.5t-14 23.5q-5 5 -10.5 8.5t-12.5 6.5t-14.5 4t-16.5 1q-18 0 -32 -6q-5 -3 -9 -5.5t-8 -5.5t-8 -7q-1 -2 -2.5 -3.5t-3 -3.5t-2.5 -3.5t-2 -3.5l-2 -4l-2 -4l-2 -4q-1 -5 -2.5 -10t-2.5 -10t-1 -10l-95 8
+q5 37 20 66t39 49q12 10 25.5 18t29.5 13q31 10 66 10q33 0 63 -9.5t53 -28.5q6 -5 11 -10t9.5 -11t8 -12.5t7.5 -13.5q13 -27 13 -64q0 -12 -1.5 -23t-3.5 -20q-2 -4 -3 -7.5t-3 -7.5l-2 -6q-2 -4 -4 -7l-4 -6q-10 -16 -24 -30q-5 -5 -10 -9.5t-11 -10t-11 -10.5
+q-16 -13 -25.5 -23t-15.5 -20t-8 -22q-1 -5 -1.5 -12.5t-0.5 -15.5v-20h-92zM450 56q0 25 18 43t44 18q24 0 43 -17q18 -18 19 -42q0 -13 -5 -23.5t-14 -19.5q-18 -17 -43 -17q-12 0 -23.5 4.5t-20.5 12.5q-8 7 -13 18t-5 23z" />
+    <glyph glyph-name="uniE62C" unicode="&#xe62c;" 
+d="M505 776q77 0 148.5 -23.5t129 -67t101 -101.5t67.5 -129.5t24 -147.5q0 -64 -17 -125t-47.5 -112t-74 -94.5t-94.5 -74t-112 -47.5t-125 -17q-95 0 -182 37.5t-150 100.5t-100 150t-37 182t37 182t100 150t150 100t182 37zM505 -104q112 0 206.5 55t149.5 149.5
+t55 206.5q0 37 -6.5 73.5t-19.5 69.5t-30.5 64t-40.5 57.5t-49.5 49.5t-57.5 40.5t-64 30t-69.5 19t-73.5 6.5q-111 0 -205.5 -55t-149.5 -149.5t-55 -206t55 -206t149.5 -149.5t205.5 -55zM528 138v-59h-58v59h58zM470 564h58v-349h-58v349z" />
+    <glyph glyph-name="uniE62D" unicode="&#xe62d;" 
+d="M828 618q65 -65 98 -148t33 -169t-33 -169t-98 -148q-66 -66 -149 -99q-16 -6 -33 -11.5t-33.5 -9t-33.5 -6.5t-34 -4t-35 -1q-43 0 -85 8t-84 24q-82 33 -148 98q-66 66 -98.5 149t-32.5 169t32.5 169t98.5 149q66 65 148.5 97.5t168.5 32.5q15 0 29 -0.5t28 -2.5
+t28.5 -4.5t28.5 -6.5t27.5 -8.5t27.5 -9.5q83 -33 149 -99v0zM258 49q53 -53 118.5 -79t134.5 -26q34 0 68 6.5t67 19.5q65 26 117.5 78.5t78.5 118t26 134.5q0 35 -6.5 68.5t-19.5 66.5q-26 65 -78 118q-53 53 -119 79t-135 26q-23 0 -45.5 -3t-44.5 -9t-44 -14
+q-66 -26 -118 -78.5t-78.5 -118t-26.5 -134.5t26.5 -134.5t78.5 -118.5v0zM748 602l69 -72l-531 -530l-70 70zM748 602z" />
+    <glyph glyph-name="uniE62E" unicode="&#xe62e;" horiz-adv-x="1025" 
+d="M491 6q9 -10 21.5 -10t21.5 10l357 407q4 5 5.5 9.5t0 8t-6 5.5t-11.5 2h-133q-14 0 -23.5 9.5t-9.5 22.5v261q0 9 -4.5 16.5t-12.5 11.5t-17 4h-333q-14 0 -24 -9.5t-10 -22.5v-261q0 -13 -9.5 -22.5t-23.5 -9.5h-133q-14 0 -17.5 -7.5t5.5 -17.5z" />
+    <glyph glyph-name="uniE62F" unicode="&#xe62f;" 
+d="M512 809v0q-58 0 -112.5 -12t-105.5 -38t-80.5 -44t-77.5 -51v-450q0 -57 19.5 -110.5t49 -93.5t69 -76t75.5 -59.5t73.5 -43t57 -28t32.5 -12.5q13 4 32.5 12.5t57 28t73.5 43t75.5 59.5t69 76t49 93.5t19.5 110.5v450q-48 33 -77.5 51t-80.5 44t-105.5 38t-112.5 12z
+M808 214q0 -76 -36.5 -138t-112.5 -117q-39 -28 -78.5 -49.5t-68.5 -32.5q-74 29 -147 82q-76 55 -112.5 117t-36.5 138v421q87 53 146.5 75t149.5 23q90 -1 149.5 -23t146.5 -75v-421zM512 671q-46 0 -81.5 -6t-67.5 -18.5t-83 -37.5v-399q0 -35 12.5 -68.5t30 -57.5
+t44 -46t47 -35.5t46 -26t34 -16t18.5 -6.5q10 3 18.5 6.5t34 16t46 26t47 35.5t44 46t30 57.5t12.5 68.5v399q-74 37 -119.5 49.5t-112.5 12.5v0zM667 515v-47h-105v-67h92v-61h-92v-77h116v-57h-332v57h42v168h64v-168h46v205h-138v61h307v-14z" />
+    <glyph glyph-name="uniE630" unicode="&#xe630;" horiz-adv-x="1163" 
+d="M295 196q67 0 114 -47t47 -113.5t-47 -114t-114 -47.5t-114 47.5t-47 113.5q0 44 21.5 81t58.5 58.5t81 21.5zM917 196q67 0 114 -47t47 -114q0 -32 -12.5 -62t-34 -51.5t-51.5 -34.5t-63 -13q-66 0 -113.5 47.5t-47.5 113.5q0 79 62 127q44 34 99 34zM400 894v-99h-210
+v0l-187 -294v-372h95q27 56 80 90.5t117 34.5q43 0 82 -16t68.5 -44t46.5 -65h228q27 56 80 90.5t117 34.5q22 0 43 -4.5t39.5 -12t36 -18.5t32 -25t26.5 -30.5t20 -34.5h46v765h-760zM400 452h-283l159 250l124 1v-251v0zM893 701l-131 -276l-63 31l101 206h-105v68h198
+v-29v0z" />
   </font>
 </defs></svg>

@@ -211,8 +211,6 @@
 
     .footerbottom {
         width: 100%;
-
-
     }
 
     .promise {
@@ -224,7 +222,17 @@
             line-height: 30px;
             font-size: 12px;
             font-weight: bold;
+
+            .iconfont {
+                display: inline-block;
+                font-weight: normal;
+                font-size: 24px;
+                vertical-align: middle;
+                margin-right: 5px;
+                line-height: 24px;
+            }
         }
+
     }
 
     .subscribe {
@@ -243,7 +251,7 @@
 
         a {
             margin-left: 10px;
-            font-size: 18px;
+            font-size: 20px;
             line-height: 32px;
             opacity: 0.5;
             filter: alpha(opacity=50);

@@ -70,6 +70,10 @@ a:focus {
     outline: none;
 }
 
+input,textarea {
+    outline: none;
+}
+
 .center-content {
     width: 1150px;
     margin-left: auto;