Merge branch 'develop' of git.yoho.cn:fe/yoho-blk into develop

@@ -110,5 +110,5 @@ try {
 
 
 // listener
 // listener
 app.listen(config.port, function() {
 app.listen(config.port, function() {
-    logger.info('yohobuy start');
+    logger.info('yohoblk start');
 });
 });

+const getContent = () => {
+    const content = {
+        content: [
+        {
+            slider: [
+                {
+                    img: '//img10.static.yhbimg.com/yhb-img01/2016/06/28/11/015a86ade17dc6213bab85b2162adebcd6.jpg?imageView2/2/w/1150/h/450',
+                    link: '/'
+                },
+                {
+                    img: '//img10.static.yhbimg.com/yhb-img01/2016/06/28/11/015a86ade17dc6213bab85b2162adebcd6.jpg?imageView2/2/w/1150/h/450',
+                    link: '/'
+                },
+                {
+                    img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
+                    link: '/'
+                },
+                {
+                    img: '//img10.static.yhbimg.com/yhb-img01/2016/06/28/11/015a86ade17dc6213bab85b2162adebcd6.jpg?imageView2/2/w/1150/h/450',
+                    link: '/'
+                },
+                {
+                    img: '//img10.static.yhbimg.com/yhb-img01/2016/06/28/11/015a86ade17dc6213bab85b2162adebcd6.jpg?imageView2/2/w/1150/h/450',
+                    link: '/'
+                },
+                {
+                    img: '//img10.static.yhbimg.com/yhb-img01/2016/06/28/11/015a86ade17dc6213bab85b2162adebcd6.jpg?imageView2/2/w/1150/h/450',
+                    link: '/'
+                }
+            ]
+        },
+        {
+            brandsAd: [
+                {
+                    img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
+                    name: 'GINZA',
+                    des: '藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场',
+                    btnText: 'shop now'
+                },
+                {
+                    img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
+                    name: 'STUSSY',
+                    des: '藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场藤原浩于银座停车场',
+                    btnText: 'shop now'
+                }
+            ]
+        },
+        {
+            floorZh: '新品抢鲜看',
+            floorEn: 'NEW ARRIVALS',
+            newArrivals: [
+                {
+                    img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
+                    name: 'STUSSY',
+                    link: '/',
+                    smallImg: true
+                },
+                {
+                    img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
+                    name: 'DAILY PAPER',
+                    link: '/',
+                    even: true
+                },
+                {
+                    img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
+                    name: 'BAPE',
+                    link: '/'
+                },
+                {
+                    img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
+                    name: 'SUPREME',
+                    link: '/',
+                    even: true,
+                    smallImg: true
+                },
+            ]
+        },
+        {
+            floorZh: '经典品牌',
+            floorEn: 'CLASSIC BRANDS',
+            classicBrands: [
+                {
+                    big: [
+                        {
+                            img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
+                            link: ''
+                        }
+                    ],
+                    small: [
+                        {
+                            img: '//img10.static.yhbimg.com/yhb-img01/2016/06/30/10/01714bacda5e9fa323a1dc5f720a7f7140.jpg?imageView2/1/w/185/h/248',
+                            link: ''
+                        },
+                        {
+                            img: '//img10.static.yhbimg.com/yhb-img01/2016/06/30/10/01714bacda5e9fa323a1dc5f720a7f7140.jpg?imageView2/1/w/185/h/248',
+                            link: ''
+                        }
+                    ],
+                    bottomSpace: true
+                },
+                {
+                    big: [
+                        {
+                            img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
+                            link: ''
+                        }
+                    ],
+                    small: [
+                        {
+                            img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
+                            link: ''
+                        },
+                        {
+                            img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
+                            link: ''
+                        }
+                    ],
+                    right: true,
+                    bottomSpace: true
+                },
+                {
+                    big: [
+                        {
+                            img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
+                            link: ''
+                        }
+                    ],
+                    small: [
+                        {
+                            img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
+                            link: ''
+                        },
+                        {
+                            img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
+                            link: ''
+                        }
+                    ]
+                },
+                {
+                    big: [
+                        {
+                            img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
+                            link: ''
+                        }
+                    ],
+                    small: [
+                        {
+                            img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
+                            link: ''
+                        },
+                        {
+                            img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
+                            link: ''
+                        }
+                    ],
+                    right: true
+                }
+            ]
+        },
+        {
+            floorZh: '潮流标志',
+            floorEn: 'STYLE ICON',
+            styleIcon: [
+                {
+                    img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
+                    name: 'COTE&CIEL',
+                    des: '这都什么时代了？短发女生这都什么时代了？短发女生这都什么时代了？短发女生这都什么时代了？短发女生',
+                    link: '/ ',
+                    btnText: '去看看'
+                },
+                {
+                    img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
+                    name: 'COTE&CIEL',
+                    des: '这都什么时代了？短发女生这都什么时代了？短发女生这都什么时代了？短发女生这都什么时代了？短发女生',
+                    link: '/ ',
+                    btnText: '去看看'
+                },
+                {
+                    img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
+                    name: 'COTE&CIEL',
+                    des: '这都什么时代了？短发女生这都什么时代了？短发女生这都什么时代了？短发女生这都什么时代了？短发女生',
+                    link: '/ ',
+                    btnText: '去看看'
+                },
+                {
+                    img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
+                    name: 'COTE&CIEL',
+                    des: '这都什么时代了？短发女生这都什么时代了？短发女生这都什么时代了？短发女生这都什么时代了？短发女生',
+                    link: '/ ',
+                    btnText: '去看看'
+                }
+            ]
+        },
+        {
+            adBanner: {
+                img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
+                link: ''
+            }
+        },
+        {
+            floorZh: '资讯',
+            floorEn: 'EDITORIAL',
+            editorial: {
+                big: {
+                    img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
+                    link: ''
+                },
+                small: [
+                    {
+                        img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
+                        link: '/',
+                        bottomSpace: true,
+                        rightSpace: true
+                    },
+                    {
+                        img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
+                        link: '/',
+                        bottomSpace: true
+                    },
+                    {
+                        img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
+                        link: '/',
+                        rightSpace: true
+                    },
+                    {
+                        img: '//img10.static.yhbimg.com/yhb-img01/2016/06/23/13/01ebff30179db84975c42a4f3c8b1f4d44.jpg?imageView2/1/w/1150/h/450',
+                        link: ''
+                    }
+                ]
+            }
+        }
+        ]
+    };
+
+    return content;
+}
+
+module.exports = {
+    getContent: getContent
+};

+<div class="home-page">
+    {{# content}}
+        {{#if slider}}
+        {{> slider}}
+        {{/if}}
+    {{/ content}}
+    <div class="main-container">
+        {{# content}}
+            {{#if brandsAd}}
+            {{> ad}}
+            {{/if}}
+            {{#if newArrivals}}
+            {{> new-arrival}}
+            {{/if}}
+            {{#if classicBrands}}
+            {{> classic-brands}}
+            {{/if}}
+            {{#if styleIcon}}
+            {{> style-icon}}
+            {{/if}}
+            {{#if adBanner}}
+            {{> ad-banner}}
+            {{/if}}
+            {{#if editorial}}
+            {{> editorial}}
+            {{/if}}
+        {{/ content}}
+    </div>
+</div>

+<div class="ad-banner">
+    {{#adBanner}}
+    <img src="{{image img 864 120}}" alt="">
+    {{/adBanner}}
+</div>

+<div class="ad-container">
+    {{# brandsAd}}
+        <div class="ad {{#if @first}}first{{/if}}">
+        <img src="{{image img 165 165}}" alt="">
+        {{> brand-text-box}}
+    </div>
+    {{/ brandsAd}}
+</div>

+{{# classicBrands}}
+    <div class="brand-img-box {{#if right}}right{{/if}} {{#if bottomSpace}}mb10{{/if}}">
+        {{# big}}
+            <img class="big-img" src="{{image img 426 250}}" alt="big-img">
+        {{/ big}}
+        {{# small}}
+            <img class="small-img {{#if @first}}first{{/if}}" src="{{image img 213 213}}" alt="big-img">
+        {{/ small}}
+</div>
+{{/ classicBrands}}

+<div class="brand-text-box">
+    <h4>{{name}}</h4>
+    <p>{{des}}</p>
+    <button>{{btnText}}</button>
+</div>

+<div class="classic-brands-container">
+    {{> floor-header}}
+    {{#if classicBrands}}
+        {{> brand-img-box}}
+    {{/if}}
+</div>

+<div class="editorial-container">
+    {{> floor-header}}
+    {{# editorial}}
+        <div class="news left">
+            {{# big}}
+                <img src="{{image img 288 375}}" alt="">
+            {{/ big}}
+        </div>
+        <div class="news right">
+            {{# small}}
+                <img class="{{#if bottomSpace}}bottomSpace{{/if}} {{#if rightSpace}}rightSpace{{/if}}" src="{{image img 260 176}}" alt="">
+            {{/ small}}
+        </div>
+    {{/ editorial}}
+</div>

+<div class="floor-header">
+    <h4 class="en-title">{{floorEn}}</h4>
+    <h4 class="zh-title">{{floorZh}}</h4>
+</div>

+<div class="new-arrival">
+    {{> floor-header}}
+    <div class="arrival-item-box">
+        {{# newArrivals}}
+        <div class="arrival-item {{#if smallImg}}small-img{{/if}} {{#if @last}}last{{^}}normal{{/if}}">
+            {{#if even}}
+            <img src="{{image img 245 370}}" alt="">
+            <div class="brand-name">
+                <span class="bottom">{{name}}</span>
+            </div>
+            {{^}}
+            <div class="brand-name">
+                <span class="top">{{name}}</span>
+            </div>
+            <img src="{{image img 245 370}}" alt="">
+            {{/if}}
+        </div>
+        {{/ newArrivals}}
+    </div>
+</div>

+<div class="style-icon-container">
+    {{> floor-header}}
+    <div class="smooth-card-container">
+        {{# styleIcon}}
+        <div class="card {{#if @first}}active{{/if}} {{#if @last}}last{{/if}}">
+            <div class="img" style="background-image: url('{{image img 160 240}}')"></div>
+            {{> brand-text-box}}
+        </div>
+        {{/ styleIcon}}
+    </div>
+</div>

@@ -123,6 +123,7 @@
                     {{> icon/solid-round}}
                     {{> icon/solid-round}}
                     {{> icon/collection}}
                     {{> icon/collection}}
                     {{> icon/bookmarks}}
                     {{> icon/bookmarks}}
+                    {{> icon/refresh}}
                 </div>
                 </div>
             </ul>
             </ul>
         </div>
         </div>

+<span class="iconfont">&#xe613;</span>

@@ -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 Jul  4 11:37:11 2016
+Created by FontForge 20120731 at Mon Jul  4 14:15:43 2016
  By admin
  By admin
 </metadata>
 </metadata>
 <defs>
 <defs>
@@ -19,7 +19,7 @@ Created by FontForge 20120731 at Mon Jul  4 11:37:11 2016
     bbox="0 -212 1303 896.303"
     bbox="0 -212 1303 896.303"
     underline-thickness="50"
     underline-thickness="50"
     underline-position="-100"
     underline-position="-100"
-    unicode-range="U+0078-E61B"
+    unicode-range="U+0078-F0054"
   />
   />
 <missing-glyph horiz-adv-x="374" 
 <missing-glyph horiz-adv-x="374" 
 d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" />
 d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" />
@@ -33,77 +33,79 @@ d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" />
 d="M281 543q-27 -1 -53 -1h-83q-18 0 -36.5 -6t-32.5 -18.5t-23 -32t-9 -45.5v-76h912v41q0 16 -0.5 30t-0.5 18q0 13 -5 29t-17 29.5t-31.5 22.5t-49.5 9h-133v-97h-438v97zM955 310v-52q0 -23 0.5 -52t0.5 -58t-10.5 -47.5t-26 -30t-33 -16t-31.5 -4.5q-14 -1 -29.5 -0.5
 d="M281 543q-27 -1 -53 -1h-83q-18 0 -36.5 -6t-32.5 -18.5t-23 -32t-9 -45.5v-76h912v41q0 16 -0.5 30t-0.5 18q0 13 -5 29t-17 29.5t-31.5 22.5t-49.5 9h-133v-97h-438v97zM955 310v-52q0 -23 0.5 -52t0.5 -58t-10.5 -47.5t-26 -30t-33 -16t-31.5 -4.5q-14 -1 -29.5 -0.5
 t-29.5 0.5h-32l-45 128h-439l-44 -128h-29h-34q-20 0 -45 1q-25 0 -41 9.5t-25.5 23t-13.5 29.5t-4 30v167h911zM163 247q-12 0 -21 -8.5t-9 -21.5t9 -21.5t21 -8.5q13 0 22 8.5t9 21.5t-9 21.5t-22 8.5zM316 123q-8 -26 -14 -48q-5 -19 -10.5 -37t-7.5 -25t-3 -15t1 -14.5
 t-29.5 0.5h-32l-45 128h-439l-44 -128h-29h-34q-20 0 -45 1q-25 0 -41 9.5t-25.5 23t-13.5 29.5t-4 30v167h911zM163 247q-12 0 -21 -8.5t-9 -21.5t9 -21.5t21 -8.5q13 0 22 8.5t9 21.5t-9 21.5t-22 8.5zM316 123q-8 -26 -14 -48q-5 -19 -10.5 -37t-7.5 -25t-3 -15t1 -14.5
 t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-5 19 -11 39h-368zM336 498v228q0 11 2.5 23t10 21.5t20.5 15.5t34 6h188q31 0 51.5 -14.5t20.5 -52.5v-227h-327z" />
 t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-5 19 -11 39h-368zM336 498v228q0 11 2.5 23t10 21.5t20.5 15.5t34 6h188q31 0 51.5 -14.5t20.5 -52.5v-227h-327z" />
-    <glyph glyph-name="uniE600" unicode="&#xe600;" 
-d="M900 660h-776q-8 0 -14 -6t-6 -14v-21q0 -8 6 -14t14 -6h776q8 0 14 6t6 14v21q0 8 -6 14t-14 6zM900 415h-776q-8 0 -14 -6t-6 -15v-20q0 -9 6 -15t14 -6h776q8 0 14 6t6 15v20q0 9 -6 15t-14 6zM900 169h-776q-8 0 -14 -6t-6 -14v-21q0 -8 6 -14t14 -6h776q8 0 14 6
-t6 14v21q0 8 -6 14t-14 6z" />
-    <glyph glyph-name="uniE601" unicode="&#xe601;" 
-d="M0 896h1024v-1024h-1024v1024zM85 -43h854v854h-854v-854z" />
     <glyph glyph-name="uniE602" unicode="&#xe602;" 
     <glyph glyph-name="uniE602" unicode="&#xe602;" 
-d="M1024 896h-1024v-1024h1024v1024zM448 101l-237 238l90 90l147 -146l307 306l90 -90l-397 -397v-1z" />
-    <glyph glyph-name="uniE603" unicode="&#xe603;" 
 d="M512 -128q-139 0 -257 68.5t-186.5 186.5t-68.5 257t68.5 257t186.5 186.5t257 68.5t257 -68.5t186.5 -186.5t68.5 -257t-68.5 -257t-186.5 -186.5t-257 -68.5zM512 -14q108 0 200 53t145 145t53 200t-53 200t-145 145t-200 53t-200 -53t-145 -145t-53 -200t53 -200
 d="M512 -128q-139 0 -257 68.5t-186.5 186.5t-68.5 257t68.5 257t186.5 186.5t257 68.5t257 -68.5t186.5 -186.5t68.5 -257t-68.5 -257t-186.5 -186.5t-257 -68.5zM512 -14q108 0 200 53t145 145t53 200t-53 200t-145 145t-200 53t-200 -53t-145 -145t-53 -200t53 -200
 t145 -145t200 -53zM512 100q118 0 201 83t83 201t-83 201t-201 83t-201 -83t-83 -201t83 -201t201 -83z" />
 t145 -145t200 -53zM512 100q118 0 201 83t83 201t-83 201t-201 83t-201 -83t-83 -201t83 -201t201 -83z" />
-    <glyph glyph-name="uniE604" unicode="&#xe604;" 
-d="M512 684q159 0 271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5zM512 812q-139 0 -257 -68.5t-186.5 -186.5t-68.5 -257t68.5 -257t186.5 -186.5t257 -68.5t257 68.5t186.5 186.5t68.5 257t-68.5 257
-t-186.5 186.5t-257 68.5z" />
-    <glyph glyph-name="uniE605" unicode="&#xe605;" 
-d="M968 -37l-163 164q69 108 69 234q0 119 -57.5 219t-157 158.5t-216 58.5t-216 -58.5t-157 -158.5t-57.5 -218.5t57.5 -219t157 -158.5t216.5 -58q124 0 231 69l163 -164q27 -28 65 -28t65 27.5t27 66t-27 66.5zM443.5 50q-127.5 0 -217.5 91.5t-90 220t90 219.5t217.5 91
-t217.5 -91t90 -219.5t-90 -220t-217.5 -91.5z" />
-    <glyph glyph-name="uniE606" unicode="&#xe606;" 
-d="M387 158l45 -46l272 272l-272 272l-45 -46l226 -226z" />
-    <glyph glyph-name="uniE607" unicode="&#xe607;" 
-d="M704 665l-41 39l-343 -320l343 -320l41 39l-301 281z" />
     <glyph glyph-name="uniE608" unicode="&#xe608;" 
     <glyph glyph-name="uniE608" unicode="&#xe608;" 
-d="M959 -62l-85 -85l-362 362l-362 -362l-85 85l362 362l-362 362l85 85l362 -362l362 362l85 -85l-362 -362z" />
+d="M972 373q-6 37 -32.5 66t-67.5 42q-36 11 -119 31q36 51 55 105t19 96t-13 76q-13 30 -36 46t-53 16q-22 0 -39.5 -7.5t-28 -17t-20 -27.5t-13 -28.5t-9.5 -29.5q-5 -14 -7 -22q-11 -32 -60.5 -80t-119.5 -87q-73 -41 -147 -100q-16 -12 -16 -32v-400q0 -21 17 -34
+q42 -30 165 -53.5t209 -23.5q62 0 88 15q58 32 156 305q40 30 58.5 67.5t13.5 76.5v0zM122 492q-28 0 -47.5 -20t-19.5 -47v-409q0 -27 19.5 -47t47.5 -20t47.5 20t19.5 47v409q0 27 -19.5 47t-47.5 20v0zM122 492z" />
     <glyph glyph-name="uniE609" unicode="&#xe609;" 
     <glyph glyph-name="uniE609" unicode="&#xe609;" 
-d="M774 201h-524l262 366z" />
-    <glyph glyph-name="uniE60A" unicode="&#xe60a;" 
-d="M512 188l-280 392h560z" />
+d="M512 747q-91 0 -174 -35t-143 -95t-95 -143t-35 -174t35 -174t95 -143t143 -95t174 -35t174 35t143 95t95 143t35 174t-35 174t-95 143t-143 95t-174 35zM769 416l-290 -289q-10 -10 -23.5 -12t-25.5 5q-4 3 -8 7l-167 166q-11 12 -11 29t11.5 28.5t28.5 11.5t29 -11
+l138 -138l260 260q12 12 29 12t28.5 -12t11.5 -28.5t-11 -28.5zM769 416z" />
     <glyph glyph-name="uniE60B" unicode="&#xe60b;" 
     <glyph glyph-name="uniE60B" unicode="&#xe60b;" 
-d="M903 577l-68 69l-388 -388l-231 230l-68 -68l299 -298l65 65z" />
-    <glyph glyph-name="uniE60C" unicode="&#xe60c;" 
-d="M511 833q-91 0 -174 -36t-143 -96t-95.5 -143t-35.5 -174t35.5 -174t95.5 -143t143 -95.5t174 -35.5t174 35.5t143 95.5t95.5 143t35.5 174t-35.5 174t-95.5 143t-143 96t-174 36zM770 193q15 -14 15 -34t-14.5 -34t-34 -14t-33.5 14l-192 191l-192 -191q-14 -14 -34 -14
-t-34 14t-14 34t14 34l192 191l-192 192q-14 14 -14 34t14 34t34 14t34 -14l192 -192l192 192q14 14 33.5 14t34 -14t14.5 -34t-15 -34l-191 -192z" />
-    <glyph glyph-name="uniE60D" unicode="&#xe60d;" 
-d="M512 702l-460 -802h921zM512 634l402 -700h-803zM495 378h35v-239h-35v239zM512.5 88q-10.5 0 -18 -7.5t-7.5 -18t7.5 -18t18 -7.5t18 7.5t7.5 18t-7.5 18t-18 7.5z" />
+d="M838 185l40 39l-366 366l-366 -366l40 -39l326 326z" />
     <glyph glyph-name="uniE60E" unicode="&#xe60e;" 
     <glyph glyph-name="uniE60E" unicode="&#xe60e;" 
-d="M972 373q-6 37 -32.5 66t-67.5 42q-36 11 -119 31q36 51 55 105t19 96t-13 76q-13 30 -36 46t-53 16q-22 0 -39.5 -7.5t-28 -17t-20 -27.5t-13 -28.5t-9.5 -29.5q-5 -14 -7 -22q-11 -32 -60.5 -80t-119.5 -87q-73 -41 -147 -100q-16 -12 -16 -32v-400q0 -21 17 -34
-q42 -30 165 -53.5t209 -23.5q62 0 88 15q58 32 156 305q40 30 58.5 67.5t13.5 76.5v0zM122 492q-28 0 -47.5 -20t-19.5 -47v-409q0 -27 19.5 -47t47.5 -20t47.5 20t19.5 47v409q0 27 -19.5 47t-47.5 20v0zM122 492z" />
-    <glyph glyph-name="uniE60F" unicode="&#xe60f;" 
+d="M704 665l-41 39l-343 -320l343 -320l41 39l-301 281z" />
+    <glyph glyph-name="uniE610" unicode="&#xe610;" 
+d="M795 342q0 -109 -78 -185.5t-188.5 -76.5t-189 76.5t-78.5 185t78.5 185.5t188.5 77q19 0 38 -3v75q-19 2 -38 2q-93 0 -172 -45t-125 -122.5t-46 -169t46 -169t125 -122.5t172 -45t172 45t125 122.5t46 169.5h-76zM566 790v-336l191 168z" />
+    <glyph glyph-name="uniE611" unicode="&#xe611;" 
+d="M900 660h-776q-8 0 -14 -6t-6 -14v-21q0 -8 6 -14t14 -6h776q8 0 14 6t6 14v21q0 8 -6 14t-14 6zM900 415h-776q-8 0 -14 -6t-6 -15v-20q0 -9 6 -15t14 -6h776q8 0 14 6t6 15v20q0 9 -6 15t-14 6zM900 169h-776q-8 0 -14 -6t-6 -14v-21q0 -8 6 -14t14 -6h776q8 0 14 6
+t6 14v21q0 8 -6 14t-14 6z" />
+    <glyph glyph-name="uniE617" unicode="&#xe617;" 
+d="M968 -37l-163 164q69 108 69 234q0 119 -57.5 219t-157 158.5t-216 58.5t-216 -58.5t-157 -158.5t-57.5 -218.5t57.5 -219t157 -158.5t216.5 -58q124 0 231 69l163 -164q27 -28 65 -28t65 27.5t27 66t-27 66.5zM443.5 50q-127.5 0 -217.5 91.5t-90 220t90 219.5t217.5 91
+t217.5 -91t90 -219.5t-90 -220t-217.5 -91.5z" />
+    <glyph glyph-name="uniE618" unicode="&#xe618;" 
+d="M416 3q-38 0 -63 27l-187 200q-25 27 -22 65q2 36 29 62l362 337q7 7 15 5l275 -23q8 -1 13 -6.5t6 -13.5l4 -276q0 -9 -6 -15l-362 -337q-27 -25 -64 -25zM556 659zM740 578q-8 9 -19.5 9.5t-20 -7.5t-9 -20t7.5 -21t19.5 -9.5t20 7.5t9 20t-7.5 21zM740 578z" />
+    <glyph glyph-name="uniE61A" unicode="&#xe61a;" 
 d="M512 748q-91 0 -174 -35.5t-143 -95.5t-95.5 -143t-35.5 -174t35.5 -174t95.5 -143t143 -95.5t174 -35.5t174 35.5t143 95.5t95.5 143t35.5 174t-35.5 174t-95.5 143t-143 95.5t-174 35.5zM796.5 15.5q-55.5 -55.5 -127.5 -86.5q-75 -31 -157 -31t-157 31
 d="M512 748q-91 0 -174 -35.5t-143 -95.5t-95.5 -143t-35.5 -174t35.5 -174t95.5 -143t143 -95.5t174 -35.5t174 35.5t143 95.5t95.5 143t35.5 174t-35.5 174t-95.5 143t-143 95.5t-174 35.5zM796.5 15.5q-55.5 -55.5 -127.5 -86.5q-75 -31 -157 -31t-157 31
 q-72 31 -127.5 86.5t-86.5 127.5q-31 75 -31 157t31 157q31 72 86.5 127.5t127.5 86.5q75 31 157 31t157 -31q72 -31 127.5 -86.5t86.5 -127.5q31 -75 31 -157t-31 -157q-31 -72 -86.5 -127.5zM776 472q7 -7 7 -16.5t-7 -16.5l-154 -154l-17 -16l-148 -149l-6 -5
 q-72 31 -127.5 86.5t-86.5 127.5q-31 75 -31 157t31 157q31 72 86.5 127.5t127.5 86.5q75 31 157 31t157 -31q72 -31 127.5 -86.5t86.5 -127.5q31 -75 31 -157t-31 -157q-31 -72 -86.5 -127.5zM776 472q7 -7 7 -16.5t-7 -16.5l-154 -154l-17 -16l-148 -149l-6 -5
 q-2 -3 -5 -5q-2 -1 -4.5 -1.5t-4.5 -0.5h-5q-2 0 -4 0.5t-4 1.5q-3 2 -5 5l-6 5l-165 165q-7 7 -7 16.5t7 16.5l5 5q7 7 16.5 7t16.5 -7l149 -149l132 133l17 16l154 154q7 7 16.5 7t16.5 -7z" />
 q-2 -3 -5 -5q-2 -1 -4.5 -1.5t-4.5 -0.5h-5q-2 0 -4 0.5t-4 1.5q-3 2 -5 5l-6 5l-165 165q-7 7 -7 16.5t7 16.5l5 5q7 7 16.5 7t16.5 -7l149 -149l132 133l17 16l154 154q7 7 16.5 7t16.5 -7z" />
-    <glyph glyph-name="uniE610" unicode="&#xe610;" 
-d="M512 747q-91 0 -174 -35t-143 -95t-95 -143t-35 -174t35 -174t95 -143t143 -95t174 -35t174 35t143 95t95 143t35 174t-35 174t-95 143t-143 95t-174 35zM769 416l-290 -289q-10 -10 -23.5 -12t-25.5 5q-4 3 -8 7l-167 166q-11 12 -11 29t11.5 28.5t28.5 11.5t29 -11
-l138 -138l260 260q12 12 29 12t28.5 -12t11.5 -28.5t-11 -28.5zM769 416z" />
-    <glyph glyph-name="uniE611" unicode="&#xe611;" 
+    <glyph glyph-name="uniE61C" unicode="&#xe61c;" 
+d="M483 -90q-114 0 -210.5 56t-153 152.5t-56.5 210.5t56.5 210.5t153 152.5t210 56t210.5 -56t153 -152.5t56 -210.5t-56 -210.5t-153 -152.5t-210 -56zM483 692q-99 0 -182.5 -48.5t-132.5 -132t-49 -182.5t49 -182.5t132.5 -132t182 -48.5t182.5 48.5t132.5 132
+t48.5 182.5t-48.5 182.5t-132.5 132t-182 48.5zM483 78q-24 0 -40 16t-16 39.5t16 39.5t39.5 16t39.5 -16t16 -39.5t-16 -39.5t-39 -16zM483 245q-12 0 -20 16.5t-8 39.5l-28 252q0 23 16 39t39.5 16t39.5 -16t16 -39l-27 -252q0 -23 -8.5 -39.5t-19.5 -16.5zM483 245z" />
+    <glyph glyph-name="uniE61E" unicode="&#xe61e;" 
+d="M512 -212q-104 0 -199 40.5t-163.5 109t-109 163.5t-40.5 199t40.5 199t109 163.5t163.5 109t199 40.5t199 -40.5t163.5 -109t109 -163.5t40.5 -199t-40.5 -199t-109 -163.5t-163.5 -109t-199 -40.5zM512 747q-91 0 -173.5 -35.5t-142.5 -95.5t-95.5 -142.5t-35.5 -173.5
+t35.5 -173.5t95.5 -142.5t142.5 -95.5t173.5 -35.5t173.5 35.5t142.5 95.5t95.5 142.5t35.5 173.5t-35.5 173.5t-95.5 142.5t-142.5 95.5t-173.5 35.5zM482 267l-1 351h63v-319l198 -166l-39 -55z" />
+    <glyph glyph-name="uniE620" unicode="&#xe620;" 
+d="M1024 896h-1024v-1024h1024v1024zM448 101l-237 238l90 90l147 -146l307 306l90 -90l-397 -397v-1z" />
+    <glyph glyph-name="uniE629" unicode="&#xe629;" 
+d="M512 684q159 0 271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5zM512 812q-139 0 -257 -68.5t-186.5 -186.5t-68.5 -257t68.5 -257t186.5 -186.5t257 -68.5t257 68.5t186.5 186.5t68.5 257t-68.5 257
+t-186.5 186.5t-257 68.5z" />
+    <glyph glyph-name="uniE639" unicode="&#xe639;" 
+d="M959 -62l-85 -85l-362 362l-362 -362l-85 85l362 362l-362 362l85 85l362 -362l362 362l85 -85l-362 -362z" />
+    <glyph glyph-name="uniE63D" unicode="&#xe63d;" 
 d="M512 384zM64 384q0 91 35.5 174t95.5 143t143 95.5t174 35.5t174 -35.5t143 -95.5t95.5 -143t35.5 -174t-35.5 -174t-95.5 -143t-143 -95.5t-174 -35.5t-174 35.5t-143 95.5t-95.5 143t-35.5 174z" />
 d="M512 384zM64 384q0 91 35.5 174t95.5 143t143 95.5t174 35.5t174 -35.5t143 -95.5t95.5 -143t35.5 -174t-35.5 -174t-95.5 -143t-143 -95.5t-174 -35.5t-174 35.5t-143 95.5t-95.5 143t-35.5 174z" />
-    <glyph glyph-name="uniE612" unicode="&#xe612;" 
-d="M511 748q91 0 174 -35.5t143 -96t95.5 -143.5t35.5 -174t-35.5 -174t-96 -143t-143.5 -95.5t-173 -35.5q-92 0 -174.5 36t-142.5 96t-95.5 142.5t-36 173.5t35.5 174t96 143.5t143 96t174 35.5zM917 300q0 110 -54.5 203t-148 147.5t-203.5 54.5q-110 1 -203.5 -53.5
-t-148 -148t-54.5 -203.5t54 -203.5t147.5 -148t204.5 -54.5q109 0 203 54t148.5 148t54.5 204zM536 155h-57v33q2 37 18 64q13 20 34 40q41 39 48 45q16 16 21 31q15 44 -16 81q-23 28 -60.5 32.5t-61.5 -11.5q-29 -17 -41 -55q-1 -1 -9 -32q-56 7 -61 7q2 15 3 15
-q8 45 32 74q31 38 82 48q55 11 103 -5q68 -22 89 -84q21 -63 -20 -116q-6 -8 -14 -16.5t-14 -14.5t-16.5 -15.5t-14.5 -13.5q-18 -18 -26 -27q-15 -18 -17 -49q0 -2 -2 -31zM475 34v68h68v-68h-68z" />
-    <glyph glyph-name="uniE614" unicode="&#xe614;" 
+    <glyph glyph-name="uniE643" unicode="&#xe643;" 
+d="M387 158l45 -46l272 272l-272 272l-45 -46l226 -226z" />
+    <glyph glyph-name="uniE657" unicode="&#xe657;" horiz-adv-x="1304" 
+d="M1303 538l-161 242h-304v-443h233q19 0 32.5 14t13.5 33t-13.5 33t-32.5 14h-140v256h161l118 -177v-242h-442v577q0 21 -15 36t-36 15h-666q-21 0 -36 -15t-15 -36v-620q0 -21 15 -35.5t36 -14.5h142q-30 -49 -30 -105q0 -82 58 -140t140 -58t140 58t58 140
+q0 56 -31 105h363q-30 -49 -30 -105q0 -82 58 -140t140 -58t140 58t58 140q0 56 -31 105h77v363zM93 803h582v-535h-582v535zM465 70q0 -43 -30.5 -74t-74 -31t-74 31t-30.5 74t30.5 74t74 31t74 -31t30.5 -74zM1164 70q0 -43 -31 -74t-74 -31t-74 31t-31 74t31 74t74 31
+t74 -31t31 -74z" />
+    <glyph glyph-name="uniE673" unicode="&#xe673;" 
+d="M774 201h-524l262 366z" />
+    <glyph glyph-name="uniE674" unicode="&#xe674;" 
+d="M512 188l-280 392h560z" />
+    <glyph glyph-name="uniE675" unicode="&#xe675;" 
+d="M0 896h1024v-1024h-1024v1024zM85 -43h854v854h-854v-854z" />
+    <glyph glyph-name="uniE681" unicode="&#xe681;" 
+d="M512 702l-460 -802h921zM512 634l402 -700h-803zM495 378h35v-239h-35v239zM512.5 88q-10.5 0 -18 -7.5t-7.5 -18t7.5 -18t18 -7.5t18 7.5t7.5 18t-7.5 18t-18 7.5z" />
+    <glyph glyph-name="uniE684" unicode="&#xe684;" 
 d="M911 725h-242v123q0 21 -13.5 34.5t-34.5 13.5h-246q-20 0 -33.5 -13.5t-13.5 -34.5v-123h-246q-21 0 -34.5 -13.5t-13.5 -34t13.5 -34t34.5 -13.5h293h243h293q21 0 34.5 13.5t13.5 34t-13.5 34t-34.5 13.5zM423 725v72h147v-72h-147zM765 579q-21 0 -34.5 -14
 d="M911 725h-242v123q0 21 -13.5 34.5t-34.5 13.5h-246q-20 0 -33.5 -13.5t-13.5 -34.5v-123h-246q-21 0 -34.5 -13.5t-13.5 -34t13.5 -34t34.5 -13.5h293h243h293q21 0 34.5 13.5t13.5 34t-13.5 34t-34.5 13.5zM423 725v72h147v-72h-147zM765 579q-21 0 -34.5 -14
 t-13.5 -34v-560h-441v560q0 20 -13.5 34t-34 14t-34 -14t-13.5 -34v-611q0 -21 13.5 -34.5t34.5 -13.5h536q20 0 33.5 13.5t13.5 34.5v611q3 20 -11.5 34t-35.5 14zM447 67v389q0 20 -13.5 33.5t-34 13.5t-34 -13.5t-13.5 -33.5v-389q0 -21 13.5 -34.5t34 -13.5t34 13.5
 t-13.5 -34v-560h-441v560q0 20 -13.5 34t-34 14t-34 -14t-13.5 -34v-611q0 -21 13.5 -34.5t34.5 -13.5h536q20 0 33.5 13.5t13.5 34.5v611q3 20 -11.5 34t-35.5 14zM447 67v389q0 20 -13.5 33.5t-34 13.5t-34 -13.5t-13.5 -33.5v-389q0 -21 13.5 -34.5t34 -13.5t34 13.5
 t13.5 34.5zM645 67v389q0 20 -13.5 33.5t-34.5 13.5q-20 0 -35.5 -13.5t-15.5 -33.5v-389q0 -21 13.5 -34.5t34.5 -13.5t36 13.5t15 34.5z" />
 t13.5 34.5zM645 67v389q0 20 -13.5 33.5t-34.5 13.5q-20 0 -35.5 -13.5t-15.5 -33.5v-389q0 -21 13.5 -34.5t34.5 -13.5t36 13.5t15 34.5z" />
-    <glyph glyph-name="uniE615" unicode="&#xe615;" 
-d="M416 3q-38 0 -63 27l-187 200q-25 27 -22 65q2 36 29 62l362 337q7 7 15 5l275 -23q8 -1 13 -6.5t6 -13.5l4 -276q0 -9 -6 -15l-362 -337q-27 -25 -64 -25zM556 659zM740 578q-8 9 -19.5 9.5t-20 -7.5t-9 -20t7.5 -21t19.5 -9.5t20 7.5t9 20t-7.5 21zM740 578z" />
-    <glyph glyph-name="uniE616" unicode="&#xe616;" 
+    <glyph glyph-name="uniE68A" unicode="&#xe68a;" 
+d="M511 833q-91 0 -174 -36t-143 -96t-95.5 -143t-35.5 -174t35.5 -174t95.5 -143t143 -95.5t174 -35.5t174 35.5t143 95.5t95.5 143t35.5 174t-35.5 174t-95.5 143t-143 96t-174 36zM770 193q15 -14 15 -34t-14.5 -34t-34 -14t-33.5 14l-192 191l-192 -191q-14 -14 -34 -14
+t-34 14t-14 34t14 34l192 191l-192 192q-14 14 -14 34t14 34t34 14t34 -14l192 -192l192 192q14 14 33.5 14t34 -14t14.5 -34t-15 -34l-191 -192z" />
+    <glyph glyph-name="uniE6C9" unicode="&#xe6c9;" 
+d="M511 748q91 0 174 -35.5t143 -96t95.5 -143.5t35.5 -174t-35.5 -174t-96 -143t-143.5 -95.5t-173 -35.5q-92 0 -174.5 36t-142.5 96t-95.5 142.5t-36 173.5t35.5 174t96 143.5t143 96t174 35.5zM917 300q0 110 -54.5 203t-148 147.5t-203.5 54.5q-110 1 -203.5 -53.5
+t-148 -148t-54.5 -203.5t54 -203.5t147.5 -148t204.5 -54.5q109 0 203 54t148.5 148t54.5 204zM536 155h-57v33q2 37 18 64q13 20 34 40q41 39 48 45q16 16 21 31q15 44 -16 81q-23 28 -60.5 32.5t-61.5 -11.5q-29 -17 -41 -55q-1 -1 -9 -32q-56 7 -61 7q2 15 3 15
+q8 45 32 74q31 38 82 48q55 11 103 -5q68 -22 89 -84q21 -63 -20 -116q-6 -8 -14 -16.5t-14 -14.5t-16.5 -15.5t-14.5 -13.5q-18 -18 -26 -27q-15 -18 -17 -49q0 -2 -2 -31zM475 34v68h68v-68h-68z" />
+    <glyph glyph-name="uniE73F" unicode="&#xe73f;" 
 d="M894 554l-43 43l-339 -339l-339 339l-43 -43l382 -383z" />
 d="M894 554l-43 43l-339 -339l-339 339l-43 -43l382 -383z" />
-    <glyph glyph-name="uniE617" unicode="&#xe617;" 
-d="M838 185l40 39l-366 366l-366 -366l40 -39l326 326z" />
-    <glyph glyph-name="uniE618" unicode="&#xe618;" 
-d="M483 -90q-114 0 -210.5 56t-153 152.5t-56.5 210.5t56.5 210.5t153 152.5t210 56t210.5 -56t153 -152.5t56 -210.5t-56 -210.5t-153 -152.5t-210 -56zM483 692q-99 0 -182.5 -48.5t-132.5 -132t-49 -182.5t49 -182.5t132.5 -132t182 -48.5t182.5 48.5t132.5 132
-t48.5 182.5t-48.5 182.5t-132.5 132t-182 48.5zM483 78q-24 0 -40 16t-16 39.5t16 39.5t39.5 16t39.5 -16t16 -39.5t-16 -39.5t-39 -16zM483 245q-12 0 -20 16.5t-8 39.5l-28 252q0 23 16 39t39.5 16t39.5 -16t16 -39l-27 -252q0 -23 -8.5 -39.5t-19.5 -16.5zM483 245z" />
-    <glyph glyph-name="uniE619" unicode="&#xe619;" horiz-adv-x="1173" 
+    <glyph glyph-name="uniE753" unicode="&#xe753;" horiz-adv-x="1173" 
 d="M586 672q-28 65 -69 113t-86.5 73.5t-96 34t-97.5 -2t-90 -39.5t-75.5 -73t-51.5 -107.5t-20 -138.5q0 -41 9 -78.5t24 -66.5t39 -57.5t47 -48.5t55.5 -43t56.5 -38t58.5 -35.5t53.5 -33.5q93 -61 162 -138.5t82 -120.5q10 39 81.5 118.5t160.5 142.5q24 17 71.5 47
 d="M586 672q-28 65 -69 113t-86.5 73.5t-96 34t-97.5 -2t-90 -39.5t-75.5 -73t-51.5 -107.5t-20 -138.5q0 -41 9 -78.5t24 -66.5t39 -57.5t47 -48.5t55.5 -43t56.5 -38t58.5 -35.5t53.5 -33.5q93 -61 162 -138.5t82 -120.5q10 39 81.5 118.5t160.5 142.5q24 17 71.5 47
 t79 50.5t71.5 54.5t64 67t41 81t16 102q0 75 -19.5 138t-52.5 105.5t-76.5 70.5t-91 37.5t-98 1t-96 -34.5t-85.5 -72.5t-67 -108.5z" />
 t79 50.5t71.5 54.5t64 67t41 81t16 102q0 75 -19.5 138t-52.5 105.5t-76.5 70.5t-91 37.5t-98 1t-96 -34.5t-85.5 -72.5t-67 -108.5z" />
-    <glyph glyph-name="uniE61A" unicode="&#xe61a;" horiz-adv-x="1304" 
-d="M1303 538l-161 242h-304v-443h233q19 0 32.5 14t13.5 33t-13.5 33t-32.5 14h-140v256h161l118 -177v-242h-442v577q0 21 -15 36t-36 15h-666q-21 0 -36 -15t-15 -36v-620q0 -21 15 -35.5t36 -14.5h142q-30 -49 -30 -105q0 -82 58 -140t140 -58t140 58t58 140
-q0 56 -31 105h363q-30 -49 -30 -105q0 -82 58 -140t140 -58t140 58t58 140q0 56 -31 105h77v363zM93 803h582v-535h-582v535zM465 70q0 -43 -30.5 -74t-74 -31t-74 31t-30.5 74t30.5 74t74 31t74 -31t30.5 -74zM1164 70q0 -43 -31 -74t-74 -31t-74 31t-31 74t31 74t74 31
-t74 -31t31 -74z" />
-    <glyph glyph-name="uniE61B" unicode="&#xe61b;" 
-d="M512 -212q-104 0 -199 40.5t-163.5 109t-109 163.5t-40.5 199t40.5 199t109 163.5t163.5 109t199 40.5t199 -40.5t163.5 -109t109 -163.5t40.5 -199t-40.5 -199t-109 -163.5t-163.5 -109t-199 -40.5zM512 747q-91 0 -173.5 -35.5t-142.5 -95.5t-95.5 -142.5t-35.5 -173.5
-t35.5 -173.5t95.5 -142.5t142.5 -95.5t173.5 -35.5t173.5 35.5t142.5 95.5t95.5 142.5t35.5 173.5t-35.5 173.5t-95.5 142.5t-142.5 95.5t-173.5 35.5zM482 267l-1 351h63v-319l198 -166l-39 -55z" />
+    <glyph glyph-name="uF0054" unicode="&#xf0054;" 
+d="M903 577l-68 69l-388 -388l-231 230l-68 -68l299 -298l65 65z" />
   </font>
   </font>
 </defs></svg>
 </defs></svg>

+require('../plugins/slider');
+$('.slide-container').slider();
+
+$('.card').mouseenter(function() {
+    var $this = $(this);
+
+    if($this.hasClass('active')) {
+        return false;
+    }
+
+    $('.active').removeClass('active');
+    $this.addClass('active');
+});

+/**
+ * 页面公共逻辑和接口
+ * @author: xuqi<qi.xu@yoho.cn>
+ * @date: 2015/11/23
+ */
+
+function cookie(name) {
+    var re = new RegExp(name + '=([^;$]*)', 'i'),
+        matchPattern = '$1';
+
+    return re.test(decodeURIComponent(document.cookie)) ? RegExp[matchPattern] : '';
+}
+
+function setCookie(name, value, options) {
+    var expires = '',
+        path,
+        domain,
+        secure,
+        date;
+
+    if (typeof value !== 'undefined') {
+        options = options || {};
+        if (value === null) {
+            value = '';
+            options.expires = -1;
+        }
+
+        if (options.expires &&
+            (typeof options.expires === 'number' || options.expires.toUTCString)) {
+            if (typeof options.expires === 'number') {
+                date = new Date();
+                date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000));
+            } else {
+                date = options.expires;
+            }
+            expires = '; expires=' + date.toUTCString();
+        }
+        path = options.path ? '; path=' + options.path : '';
+        domain = options.domain ? '; domain=' + options.domain : '';
+        secure = options.secure ? '; secure' : '';
+        document.cookie = [name, '=', encodeURIComponent(value), expires, path, domain, secure].join('');
+    }
+}
+
+function queryString() {
+    var vars = {},
+        hash,
+        i,
+        search = window.location.search,
+        hashes = search ? decodeURIComponent(search).slice(1).split('&') : [];
+
+    for (i = 0; i < hashes.length; i++) {
+        hash = hashes[i].split('=');
+        vars[hash[0]] = hash[1];
+    }
+    return vars;
+}
+
+window.cookie = cookie;
+
+window.setCookie = setCookie;
+
+window.queryString = queryString;

+.ad-banner {
+    height: 120px;
+    margin-top: 15px;
+
+    img {
+        width: 100%;
+        height: 100%;
+        border: none;
+    }
+}

+.ad-container {
+    height: 225px;
+    margin: 0 auto;
+    box-sizing: border-box;
+    border: 1PX solid $grayBorder;
+    background-color: #fff;
+
+    .ad {
+        display: inline-block;
+        float: left;
+        width: 50%;
+        height: 100%;
+        box-sizing: border-box;
+    }
+
+    .ad.first {
+        border-right: 1PX solid $grayBorder;
+    }
+
+    img {
+        display: inline-block;
+        float: left;
+        width: 50%;
+        height: 100%;
+        box-sizing: border-box;
+        padding: 25px;
+    }
+}

+.brand-img-box {
+    width: 426px;
+    box-sizing: border-box;
+    display: inline-block;
+
+    &.mb10 {
+        margin-bottom: 10px;
+    }
+
+    &.right {
+        float: right;
+    }
+
+
+    img {
+        float: left;
+    }
+
+    .big-img {
+        width: 100%;
+        height: 250px;
+    }
+
+    .small-img {
+        width: 50%;
+        height: 213px;
+        display: inline-block;
+        box-sizing: border-box;
+        border: 1px solid $grayBorder;
+        border-top: none;
+
+        &.first {
+            border-right: none;
+        }
+    }
+}

+.brand-text-box {
+    $size: 14px;
+    $line-height: 1.8;
+    $lines-to-show: 3;
+
+    display: inline-block;
+    float: left;
+    height: 100%;
+    width: 50%;
+    box-sizing: border-box;
+    padding: 34px 0;
+    position: relative;
+
+    h4 {
+        font-size: 12px;
+        font-weight: bold;
+    }
+
+    p {
+        display: -webkit-box;
+        height: calc($size*$line-height*$lines-to-show);
+        margin: 25px 0;
+        padding-right: 25px;
+        font-size: $size;
+        line-height: $line-height;
+        overflow: hidden;
+        -webkit-line-clamp: $lines-to-show;
+        -webkit-box-orient: vertical;
+        color: #505050;
+    }
+
+    button {
+        width: 105px;
+        height: 26px;
+        position: absolute;
+        bottom: 29px;
+        background-color: white;
+        outline: none;
+        border: 1PX solid black;
+        font-size: 12px;
+        cursor: pointer;
+    }
+}

+.classic-brands-container {
+    @extend .resource-container;
+}

+.editorial-container {
+    $bigImgWidth: 290px;
+    $smallImgWidth: 268px;
+    $smallImgHeight: 176px;
+    $space: 10px;
+
+    @extend .resource-container;
+
+    .news {
+        display: inline-block;
+        box-sizing: border-box;
+
+        .bottomSpace {
+            margin-bottom: $space;
+        }
+
+        .rightSpace {
+            margin-right: $space;
+        }
+
+        &.left {
+            width: $bigImgWidth;
+            float: left;
+
+            img {
+                width: $bigImgWidth;
+                height: calc($smallImgHeight*2+$space+2px);
+            }
+        }
+
+        &.right {
+            width: calc($smallImgWidth*2+$space*2);
+            float: right;
+
+            img {
+                width: $smallImgWidth;
+                height: $smallImgHeight;
+            }
+        }
+    }
+}

+.home-page {
+    width: 1150px;
+    margin: 10px auto 0;
+
+    .slide-container {
+        position: absolute;
+        left: 0;
+        right: 0;
+        height: 450px;
+    }
+
+    .slide-thumb-container {
+        height: 510px;
+    }
+
+    .slide-wrapper {
+        position: relative;
+        height: 450px;
+        overflow: hidden;
+
+        ul {
+            position: relative;
+            height: 100%;
+        }
+
+        &:hover .slide-switch.show {
+            display: block;
+        }
+
+        li {
+            display: none;
+            position: absolute;
+            top: 0;
+            right: 0;
+            width: 100%;
+            height: 100%;
+
+            a {
+                display: block;
+                height: 100%;
+                width: 100%;
+                margin: 0 auto;
+            }
+
+            &:first-child {
+                display: block;
+            }
+
+            img {
+                width: 100%;
+                height: 100%;
+            }
+        }
+    }
+
+    .slide-container-placeholder {
+        height: 450px;
+        width: 100%;
+
+    }
+
+    .slide-thumb-container-placeholder {
+        height: 510px;
+    }
+
+    .slide-switch {
+        display: block;
+
+        a {
+            position: absolute;
+            top: 50%;
+            margin: -30px 0 0;
+            width: 30px;
+            height: 60px;
+            line-height: 56px;
+            text-align: center;
+            z-index: 2;
+            background: #000;
+            opacity: 0.55;
+
+            &.prev {
+                left: 50%;
+                margin-left: -545px;
+            }
+
+            &.next {
+                right: 50%;
+                margin-right: -545px;
+            }
+
+            &:hover {
+                opacity: 0.9;
+            }
+
+            .iconfont {
+                font-size: 32px;
+                color: #59585a;
+            }
+        }
+    }
+
+    .thumb-pagination {
+        width: 1148px;
+        margin: 6px auto 0;
+        padding-left: 2px;
+
+        li {
+            position: relative;
+            float: left;
+            margin-left: 6px;
+            width: 138px;
+            height: 54px;
+
+            &:first-child {
+                margin: 0;
+            }
+
+            &.focus a {
+                opacity: 0;
+            }
+
+            a {
+                position: absolute;
+                left: 0;
+                right: 0;
+                bottom: 0;
+                top: 0;
+                background: #000;
+                opacity: 0.3;
+            }
+
+            img {
+                width: 100%;
+                height: 100%;
+            }
+        }
+    }
+
+    /* 大banner圆点 */
+    .slide-pagination {
+        font-size: 0;
+
+        .slide-shade {
+            position: absolute;
+            left: 0;
+            right: 0;
+            top: 0;
+            bottom: 0;
+            /*background: #000;*/
+        }
+
+        span {
+            position: relative;
+            display: inline-block;
+            margin: 0 3px;
+            width: 7px;
+            height: 7px;
+            background: #ccc;
+            cursor: pointer;
+            z-index: 2;
+
+            &.focus {
+                width: 12px;
+                height: 12px;
+                position: relative;
+                top: 2px;
+                background: #fff;
+            }
+        }
+    }
+
+    .debris-slider {
+        height: 510px;
+        width: 100%;
+
+        .col {
+            float: left;
+
+            a {
+                display: block;
+            }
+        }
+
+        .left-col a,
+        .right-col a {
+            margin-bottom: 10px;
+
+            &:last-child {
+                margin-bottom: 0;
+            }
+        }
+
+        .right-col img,
+        .left-col img {
+            height: 100%;
+            width: 100%;
+        }
+
+        .left-col {
+            margin-right: 10px;
+
+            a {
+                width: 280px;
+                height: 120px;
+            }
+
+            a:first-child {
+                height: 250px;
+            }
+        }
+
+        .center-col {
+            position: relative;
+            width: 570px;
+            height: 100%;
+            margin-right: 10px;
+            font-size: 0;
+
+            &:hover {
+                .slide-switch.show {
+                    display: block;
+                }
+            }
+
+            .slide-wrapper {
+                height: 100%;
+
+                a {
+                    width: 100%;
+                }
+            }
+
+            .slide-switch {
+                a.prev {
+                    left: 0;
+                    margin-left: 0;
+                }
+                a.next {
+                    right: 0;
+                    margin-right: 0;
+                }
+            }
+
+            img {
+                max-width: 100%;
+                max-height: 100%;
+            }
+        }
+
+        .right-col a {
+            width: 280px;
+            height: 120px;
+        }
+
+        .right-col a:first-child {
+            height: 380px;
+            margin-bottom: 11px;
+        }
+    }
+
+    .new-report {
+        img {
+            display: block;
+            width: 100%;
+            height: 100%;
+        }
+
+        .report-list {
+            float: left;
+            width: 868px;
+
+            li {
+                float: left;
+                margin: 0 8px 8px 0;
+                width: 185px;
+                height: 248px;
+                overflow: hidden;
+
+                &:first-child {
+                    margin-right: 7px;
+                    width: 282px;
+                    height: 504px;
+                }
+            }
+        }
+
+        .last-item {
+            float: left;
+            width: 282px;
+            height: 504px;
+            overflow: hidden;
+        }
+    }
+
+    /* 优选品牌 */
+    .preference-brand {
+        overflow: hidden;
+    }
+
+    .preference-brand-list {
+        margin-top: 8px;
+        width: 1158px;
+    }
+
+    .preference-brand-item {
+        float: left;
+        margin-right: 8px;
+        margin-bottom: 8px;
+
+        a {
+            display: table-cell;
+            width: 185px;
+            height: 86px;
+            text-align: center;
+            vertical-align: middle;
+        }
+
+        img {
+            display: block;
+            max-width: 100%;
+            max-height: 100%;
+            margin: 0 auto;
+        }
+    }
+
+    .preference-more {
+        float: left;
+        width: 185px;
+        height: 86px;
+        line-height: 100px;
+        text-align: center;
+        color: black;
+        font-size: 16px;
+    }
+
+    .img-slider-wrapper {
+        position: relative;
+        width: 100%;
+        height: 558px;
+        background: #8ae6e0;
+        overflow: hidden;
+
+        .img-brand-switch {
+            display: block;
+            a {
+                position: absolute;
+                top: 50%;
+                font-size: 36px;
+                color: #fff;
+
+                &.next {
+                    right: 30px;
+                }
+
+                &.prev {
+                    left: 30px;
+                }
+            }
+        }
+    }
+
+    .img-container-landscape {
+        box-sizing: border-box;
+        margin: 86px auto 0;
+        width: 982px;
+        height: 433px;
+        overflow: hidden;
+
+        .img-list {
+            width: 1000px;
+            height: 100%;
+        }
+
+        .img-item {
+            float: left;
+            box-sizing: border-box;
+            width: 320px !important;
+            height: 100%;
+            margin-right: 10px;
+
+            img {
+                width: 100%;
+                height: 100%;
+            }
+        }
+    }
+
+    .img-brand {
+        position: relative;
+        width: 100%;
+        height: 175px;
+        overflow: hidden;
+
+        &:hover {
+            .img-brand-switch {
+                display: block;
+            }
+        }
+        ul {
+            width: 1158px;
+        }
+        li {
+            float: left;
+            margin-right: 8px;
+            width: 378px !important;
+            height: 175px;
+            line-height: 175px;
+            overflow: hidden;
+            font-size: 0;
+            text-align: center;
+
+            img {
+                max-width: 100%;
+                max-height: 100%;
+                vertical-align: middle;
+            }
+        }
+        .img-brand-switch {
+            display: none;
+            a {
+                position: absolute;
+                top: 50%;
+                margin: -20px 0 0;
+                width: 40px;
+                height: 40px;
+                line-height: 40px;
+                text-align: center;
+                z-index: 2;
+                background: #fff;
+                opacity: 0.55;
+
+                &.prev {
+                    left: 0;
+                }
+                &.next {
+                    right: 0;
+                }
+                &:hover {
+                    opacity: 0.9;
+
+                }
+            }
+        }
+    }
+
+
+    .categorys-list {
+        ul {
+            width: 1158px;
+        }
+
+        li {
+            float: left;
+            margin: 0 8px 8px 0;
+            width: 185px;
+            height: 248px;
+
+            &.cate-item0 {
+                width: 185px;
+                height: 504px;
+            }
+
+            &.cate-item1 {
+                width: 377px;
+                height: 504px;
+            }
+
+            img {
+                display: block;
+                width: 100%;
+                height: 100%;
+            }
+        }
+    }
+
+    .floor-header {
+        text-align: center;
+        height: 60px;
+        line-height: 1.4;
+        font-weight: bold;
+        font-size: 16px;
+
+        .zh-title {
+            font-size: 14px;
+        }
+    }
+
+    .main-container {
+        position: relative;
+        top: 390px;
+        width: 864px;
+        margin: 0 auto;
+        box-sizing: border-box;
+    }
+}

+$grayBorder: #f0f0f0;
+
+.resource-container {
+    margin-top: 60px;
+}
+
+.cursor-pointer {
+    cursor: pointer;
+}
+
+@import "home";
+@import "ad";
+@import "brand-text-box";
+@import "brand-img-box";
+@import "new-arrival";
+@import "classic-brands";
+@import "style-icon";
+@import "ad-banner";
+@import "editorial";

+
+.new-arrival {
+    $textHeight: 35px;
+    $imgHeight: 370px;
+
+    @extend .resource-container;
+
+    height: calc($textHeight+$imgHeight+60px);/* 60px is the height of the floor header*/
+
+    .arrival-item-box {
+        box-sizing: border-box;
+
+        .arrival-item {
+            width: 245px;
+            display: inline-block;
+
+            .brand-name {
+                height: $textHeight;
+                text-align: center;
+                font-size: 12px;
+
+                span {
+                    @extend .cursor-pointer;
+
+                    padding-bottom: 3px;
+                    border-bottom: 1px solid #000;
+
+                    &.top {
+                        line-height: 20px;
+                    }
+
+                    &.bottom {
+                        line-height: 40px;
+                    }
+                }
+            }
+
+
+            img {
+                @extend .cursor-pointer;
+
+                width: 100%;
+                height: $imgHeight;
+            }
+
+            &.normal {
+                float: left;
+                margin-right: 18px;
+            }
+
+            &.last {
+                float: right;
+            }
+
+            &.small-img {
+                width: 160px;
+            }
+        }
+
+    }
+}

+.style-icon-container {
+    $width: 164px;
+    $height: 240px;
+    $space: 15px;
+
+    @extend .resource-container;
+
+    .smooth-card-container {
+        width: 880px;
+        height: $height;
+        margin: 0 auto;
+        overflow: hidden;
+    }
+
+    .card {
+        height: $height;
+        display: inline-block;
+        float: left;
+        position: relative;
+        box-sizing: border-box;
+
+
+        .img {
+            width: $width;
+            height: 100%;
+            display: inline-block;
+            float: left;
+            margin-right: $space;
+            background-size: 100% 100%;
+            background-position: center center;
+        }
+
+        &.last {
+            .img {
+                margin-right: 0;
+            }
+        }
+
+        .brand-text-box {
+            $size: 12px;
+            $line-height: 1.2;
+            $lines-to-show: 3;
+
+            width: 0;
+            border: none;
+
+
+            p {
+                height: calc($size*$line-height*$lines-to-show);
+                width: calc($width-2*$space);
+                padding-right: $space;
+                font-size: $size;
+                line-height: $line-height;
+                overflow: hidden;
+                -webkit-line-clamp: $lines-to-show;
+                -webkit-box-orient: vertical;
+                color: #505050;
+            }
+
+            button {
+                left: calc($width/2-105px/2);
+            }
+
+            * {
+                display: none;
+            }
+        }
+
+        &.active {
+            width: calc($width*2+$space);
+            float: left;
+
+            .img {
+                margin-right: 0;
+            }
+
+            .brand-text-box {
+                width: $width;
+                height: 100%;
+                display: inline-block;
+                float: left;
+                padding: 25px 0 25px $space;
+                border: 1px solid #404040;
+                border-left: none;
+
+                * {
+                    display: block;
+                }
+                p {
+                    display: -webkit-box;
+                }
+            }
+        }
+
+
+    }
+}

@@ -7,3 +7,4 @@
 /* 模块 */
 /* 模块 */
 @import "base";
 @import "base";
 @import "components/index";
 @import "components/index";
+@import "channel/index";

@@ -14,7 +14,7 @@
     position: absolute;
     position: absolute;
     left: 0;
     left: 0;
     right: 0;
     right: 0;
-    bottom: 12px;
+    bottom: 80px;
     text-align: center;
     text-align: center;
 }
 }
 
 
@@ -31,28 +31,23 @@
     right: 0;
     right: 0;
     top: 0;
     top: 0;
     bottom: 0;
     bottom: 0;
-    background: #000;
-    opacity: 0.3;
-    border-radius: 13px;
 }
 }
 
 
+/*
 .slide-pagination-last span {
 .slide-pagination-last span {
     display: block;
     display: block;
     float: left;
     float: left;
     position: relative;
     position: relative;
-    margin: 0 7px;
-    width: 12px;
-    height: 12px;
+    margin: 0 3px;
+    width: 6px;
+    height: 6px;
     background: #fff;
     background: #fff;
     cursor: pointer;
     cursor: pointer;
     opacity: 0.6;
     opacity: 0.6;
-    border-radius: 6px;
     z-index: 2;
     z-index: 2;
 
 
-    &.focus {
-        opacity: 1;
-    }
 }
 }
+*/
 
 
 .slide-switch {
 .slide-switch {
     display: none;
     display: none;
@@ -66,12 +61,12 @@
         position: absolute;
         position: absolute;
         top: 50%;
         top: 50%;
         margin: -30px 0 0;
         margin: -30px 0 0;
-        width: 60px;
+        width: 30px;
         height: 60px;
         height: 60px;
         line-height: 56px;
         line-height: 56px;
         text-align: center;
         text-align: center;
         z-index: 2;
         z-index: 2;
-        background: #fff;
+        background: #000;
         opacity: 0.55;
         opacity: 0.55;
 
 
         &:hover {
         &:hover {