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

@@ -10,6 +10,28 @@
     .demo-page {
         padding: 10px;
     }
+
+    .icon_lists li{  
+        float: left;
+        width: 100px;
+        height: 80px;
+        text-align: center; 
+        margin-top: 20px; 
+    }
+
+    .iconfont {
+        font-family: "iconfont" !important;
+        font-size: 16px;
+        font-style: normal;
+        -webkit-font-smoothing: antialiased;
+        -webkit-text-stroke-width: 0.2px;
+        -moz-osx-font-smoothing: grayscale;
+    }
+
+    .modality {
+        color: #219dd6;
+        font-size: 20px;
+    }
 </style>
 <div class="demo-page blk-page">
     {{# content}}
@@ -72,6 +94,73 @@
         <p class="title">12. 楼层</p>
         {{# floor}}
            {{> floor}}
-        {{/ floor}}  
+        {{/ floor}} 
+
+        <p class="title">13. 各类图标</p>
+        <div style="border: 1px solid #000;overflow: hidden;">
+            <ul class="icon_lists clear">
+            
+                <li>
+                <i class="iconfont" style="color: #868686; font-size: 20px;">&#xe684;</i>
+                    <div class="name">delete</div>
+                    <div class="code">&amp;#xe684;</div>
+                </li>
+            
+                <li>
+                <i class="iconfont">&#xe608;</i>
+                    <div class="name">赞</div>
+                    <div class="code">&amp;#xe608;</div>
+                </li>
+            
+                <li>
+                <i class="iconfont modality">&#xf0066;</i>
+                    <div class="name">感叹圈</div>
+                    <div class="code">&amp;#xf0066;</div>
+                </li>
+            
+                <li>
+                <i class="iconfont modality">&#xe602;</i>
+                    <div class="name">对号</div>
+                    <div class="code">&amp;#xe602;</div>
+                </li>
+            
+                <li>
+                <i class="iconfont modality">&#xe60f;</i>
+                    <div class="name">问号</div>
+                    <div class="code">&amp;#xe60f;</div>
+                </li>
+            
+                <li>
+                <i class="iconfont modality">&#xe675;</i>
+                    <div class="name">对号</div>
+                    <div class="code">&amp;#xe675;</div>
+                </li>
+            
+                <li>
+                <i class="iconfont modality">&#xe663;</i>
+                    <div class="name">感叹号</div>
+                    <div class="code">&amp;#xe663;</div>
+                </li>
+            
+                <li>
+                <i class="iconfont modality">&#xe601;</i>
+                    <div class="name">时钟</div>
+                    <div class="code">&amp;#xe601;</div>
+                </li>
+            
+                <li>
+                <i class="iconfont modality">&#xe68a;</i>
+                    <div class="name">差号-圆</div>
+                    <div class="code">&amp;#xe68a;</div>
+                </li>
+            
+                <li>
+                <i class="iconfont modality">&#xf0054;</i>
+                    <div class="name">对号</div>
+                    <div class="code">&amp;#xf0054;</div>
+                </li>
+            
+        </ul> 
+        </div>
     {{/ content}}
 </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 Jun 30 11:48:37 2016
+Created by FontForge 20120731 at Fri Jul  1 10:31:43 2016
  By admin
 </metadata>
 <defs>
@@ -16,10 +16,10 @@ Created by FontForge 20120731 at Thu Jun 30 11:48:37 2016
     ascent="896"
     descent="-128"
     x-height="792"
-    bbox="0 -212 1024 896"
+    bbox="0 -128 1024 896"
     underline-thickness="50"
     underline-position="-100"
-    unicode-range="U+0078-E607"
+    unicode-range="U+0078-F0066"
   />
 <missing-glyph horiz-adv-x="374" 
 d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" />
@@ -33,25 +33,40 @@ 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
 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" />
-    <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" />
+d="M512 -30q-112 0 -207.5 55.5t-151 151t-55.5 207.5t55.5 207.5t151 151t207.5 55.5t207.5 -55.5t151 -151t55.5 -207.5t-55.5 -207.5t-151 -151t-207.5 -55.5zM512 734q-95 0 -175.5 -47t-127.5 -127.5t-47 -175.5t47 -175.5t127.5 -127.5t175.5 -47t175.5 47
+t127.5 127.5t47 175.5t-47 175.5t-127.5 127.5t-175.5 47zM633 259l-184 59v280h64v-233l140 -45z" />
     <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
-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" />
+d="M512 896q-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 -35q-114 0 -210.5 56t-152.5 152.5t-56 210.5t56 210.5
+t152.5 152.5t210.5 56t210.5 -56t152.5 -152.5t56 -210.5t-56 -210.5t-152.5 -152.5t-210.5 -56zM727 586l-20 14q-13 8 -27.5 5.5t-23.5 -14.5l-226 -298l-105 109q-9 11 -23.5 12.5t-25.5 -8.5l-18 -15q-11 -9 -12.5 -23.5t8.5 -25.5l136 -141l4 -4l4 -4l1 -1q1 -1 2 -1
+q12 -10 19 -14q13 -9 28 -6t23 15l265 350q8 12 5.5 26.5t-14.5 23.5zM694 570q-10 0 -19 -5q-6 -4 -10 -9l-238 -297l-111 116q-8 9 -20 9h-4q-15 0 -25 -10t-10 -25q0 -3 0.5 -6t1.5 -5q4 -13 16 -19l135 -142q7 -8 17.5 -9t18.5 6q4 3 8 8l266 330q0 1 1 2l1 1v1
+q6 8 6 19q0 15 -10 25t-24 10zM512 896q-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 -58q-90 0 -172.5 35t-141.5 94
+t-94.5 141t-35.5 172t35.5 172t94.5 141t141.5 94t172.5 35t172.5 -35t141.5 -94t94.5 -141t35.5 -172t-35.5 -172t-94.5 -141t-141.5 -94t-172.5 -35z" />
+    <glyph glyph-name="uniE608" unicode="&#xe608;" 
+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="M498 765q-105 0 -193.5 -51t-139.5 -139.5t-51 -193t51 -193t139.5 -140t193 -51.5t193 51.5t140 140t51.5 193t-51.5 193t-140 139.5t-192.5 51zM498 45q-92 0 -169 45t-122 122.5t-45 169t45 168.5t122 122t168.5 45t169 -45t122.5 -122t45 -168.5t-45 -169
+t-122.5 -122.5t-168.5 -45zM498 45zM463 198q0 -15 10 -25t24.5 -10t25 10t10.5 24.5t-10.5 25t-25 10.5t-24.5 -10.5t-10 -24.5zM463 198zM498 605q-49 0 -83 -33.5t-34 -81.5q0 -10 7 -17t16.5 -7t16.5 7t7 17q0 29 20 49t50 20q29 0 49.5 -21t20.5 -50q0 -15 -39 -54
+q-17 -17 -26.5 -27.5t-19 -29t-9.5 -36.5v-39q0 -10 7 -17t16.5 -7t16.5 7t7 17v39q0 19 41 60q17 17 26 27t17.5 27t8.5 33q0 49 -34 83t-82 34zM498 605z" />
+    <glyph glyph-name="uniE663" unicode="&#xe663;" 
+d="M512 641l-392 -682h784zM512 583l341 -595h-682zM512 119zM512 77q-14 0 -23.5 9.5t-9.5 23t9.5 23t23.5 9.5t23.5 -9.5t9.5 -23t-9.5 -23t-23.5 -9.5zM512 175q-7 0 -11.5 9.5t-4.5 23.5l-17 148q0 13 9.5 22.5t23.5 9.5t23.5 -9.5t9.5 -22.5l-17 -148q0 -14 -4.5 -23.5
+t-11.5 -9.5zM512 175z" />
+    <glyph glyph-name="uniE675" unicode="&#xe675;" 
+d="M511 832q-90 0 -173 -35.5t-143 -95.5t-95 -142.5t-35 -173.5t35 -174t95 -143t143 -95t173.5 -35t173.5 35t143 95t95 143t35 174t-35 173.5t-95 142.5t-143 95.5t-174 35.5zM775 532q-1 -25 -17 -42l-290 -305l4 3q-16 -16 -42 -16.5t-42 16.5l-124 131
+q-16 17 -15.5 40t16.5 40t39.5 16.5t39.5 -17.5l86 -90l252 265q16 17 39 17.5t39 -16.5t15 -42zM775 532z" />
+    <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
+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" />
+    <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="uF0054" unicode="&#xf0054;" 
+d="M903 577l-68 69l-388 -388l-231 230l-68 -68l299 -298l65 65z" />
+    <glyph glyph-name="uF0066" unicode="&#xf0066;" 
+d="M493 487h69v-259h-69v259zM527.5 179q-17.5 0 -30 -12.5t-12.5 -30t12.5 -30t30 -12.5t30 12.5t12.5 30t-12.5 30t-30 12.5zM626 573q-27 11 -57 16t-68.5 3.5t-83 -19.5t-88.5 -52q-104 -83 -100 -225q13 -210 159 -272q72 -31 144 -30q39 0 90 14.5t94 47.5
+q46 37 75 97.5t29 140.5q0 63 -17.5 113.5t-48 82.5t-61 51t-67.5 32zM518 58q-158 8 -211 144q-50 171 64 269q81 70 180 60q56 -10 97.5 -34.5t64.5 -56.5t34 -65t11 -67q0 -19 -1 -36.5t-6 -45t-14.5 -49.5t-27.5 -46t-42.5 -40t-63 -25.5t-85.5 -7.5z" />
   </font>
 </defs></svg>
+

-.path-nav {
-    font-size: 14px;
-    height: 48px;
-    line-height: 48px;
-    font-family: "黑体";
-
-    a {
-        color: #666;
-        text-decoration: none;
-    }
-}
-
-.last {
-    font-weight: 700;
-}
-
-.iconfont {
-    font-family: iconfont !important;
-    font-size: 14px;
-    font-style: normal;
-    text-decoration: none;
-    margin-left: 6px;
-    margin-right: 6px;
-}