Merge branch 'dev'

docs/demos/views/icon.vue

@@ -93,7 +93,14 @@ const icons = [
   'tosend',
   'sign',
   'home',
-  'phone'
+  'phone',
+  'play',
+  'pause',
+  'stop',
+  'hot',
+  'new',
+  'hot-sale',
+  'new-arrival'
 ];
 
 export default {
@@ -134,5 +141,5 @@ export default {
   span {
     font-size: 14px;
   }
-} 
+}
 </style>

docs/markdown/en-US/changelog.md

@@ -1,5 +1,24 @@
 ## Changelog
 
+### [0.11.1](https://github.com/youzan/vant/tree/v0.11.1)
+`2017-11-24`
+
+**Improvements**
+- Actionsheet: update close icon style [\#340](https://github.com/youzan/vant/pull/340) [@chenjiahan](https://github.com/chenjiahan)
+- Popup: add overlayClass and overlayStyle props [\#349](https://github.com/youzan/vant/pull/349) [\#343](https://github.com/youzan/vant/pull/343) [@mickeyinfoshan](https://github.com/mickeyinfoshan) [@chenjiahan](https://github.com/chenjiahan)
+- Icon: adjust unicode for better display [\#330](https://github.com/youzan/vant/pull/330) [@chenjiahan](https://github.com/chenjiahan)
+- ImagePreview: support manually close [\#346](https://github.com/youzan/vant/pull/346) [@chenjiahan](https://github.com/chenjiahan)
+- Tabbar: add slot-scope to avoid check by index [\#347](https://github.com/youzan/vant/pull/347) [@chuangbo](https://github.com/chuangbo)
+- SubmitBar: add left slot [\#345](https://github.com/youzan/vant/pull/345) [@chenjiahan](https://github.com/chenjiahan)
+- optimize component static classnames [\#337](https://github.com/youzan/vant/pull/337) [@chenjiahan](https://github.com/chenjiahan)
+- optimize single line text ellipsis [\#334](https://github.com/youzan/vant/pull/334) [@chenjiahan](https://github.com/chenjiahan)
+- optimize button css layer and GPU cost [\#336](https://github.com/youzan/vant/pull/336) [@deepkolos](https://github.com/deepkolos)
+
+**Bug Fixes**
+- fix some bugs in SSR [\#344](https://github.com/youzan/vant/pull/344) [@chenjiahan](https://github.com/chenjiahan)
+- fix DateTimePicker crashed when pass invalid props [\#333](https://github.com/youzan/vant/pull/333) [@chenjiahan](https://github.com/chenjiahan)
+
+
 ### [0.11.0](https://github.com/youzan/vant/tree/v0.11.0)
 `2017-11-17`
 

docs/markdown/zh-CN/changelog-generated.md

@@ -1,5 +1,33 @@
 ## 更新日志
 
+## [v0.11.1](https://github.com/youzan/vant/tree/v0.11.1) (2017-11-24)
+[Full Changelog](https://github.com/youzan/vant/compare/v0.11.0...v0.11.1)
+
+**Breaking changes**
+
+- 能不能考虑增加一个分页功能？ [\#92](https://github.com/youzan/vant/issues/92)
+
+**Issue**
+
+- card组件使用slot添加tags问题 [\#329](https://github.com/youzan/vant/issues/329)
+
+**Improvements**
+
+- \[bugfix\] Popup: update overlay style & class [\#349](https://github.com/youzan/vant/pull/349) ([chenjiahan](https://github.com/chenjiahan))
+- \[Doc\] add switch lang button in mobile [\#348](https://github.com/youzan/vant/pull/348) ([chenjiahan](https://github.com/chenjiahan))
+- \[improvement\] TabbarItem: add slot-scope to avoid check by index [\#347](https://github.com/youzan/vant/pull/347) ([chuangbo](https://github.com/chuangbo))
+- \[new feature\] ImagePreview support manually close [\#346](https://github.com/youzan/vant/pull/346) ([chenjiahan](https://github.com/chenjiahan))
+- \[Improvement\] SubmitBar: add left slot [\#345](https://github.com/youzan/vant/pull/345) ([chenjiahan](https://github.com/chenjiahan))
+- \[bugfix\] should not access window when ssr [\#344](https://github.com/youzan/vant/pull/344) ([chenjiahan](https://github.com/chenjiahan))
+- \[new feature\]Popup: 增加遮罩层overlayClass和overlayStyle属性，以提供遮罩层自定义样式  [\#343](https://github.com/youzan/vant/pull/343) ([mickeyinfoshan](https://github.com/mickeyinfoshan))
+- \[Improvement\] update actionsheet close icon style [\#340](https://github.com/youzan/vant/pull/340) ([chenjiahan](https://github.com/chenjiahan))
+- \[Improvement\] optimize staticClass [\#337](https://github.com/youzan/vant/pull/337) ([chenjiahan](https://github.com/chenjiahan))
+- \[optimize & bug fix\] Button: 优化layer, 修复滚动时, gpu占用过高情况 [\#336](https://github.com/youzan/vant/pull/336) ([deepkolos](https://github.com/deepkolos))
+- \[improvement\] optimize single line ellipsis [\#334](https://github.com/youzan/vant/pull/334) ([chenjiahan](https://github.com/chenjiahan))
+- \[bugfix\] DateTimePicker validate date props [\#333](https://github.com/youzan/vant/pull/333) ([chenjiahan](https://github.com/chenjiahan))
+- \[improvement\] Icon spinner color inherit [\#331](https://github.com/youzan/vant/pull/331) ([chenjiahan](https://github.com/chenjiahan))
+- \[improvement\] adjust icon-font unicode [\#330](https://github.com/youzan/vant/pull/330) ([chenjiahan](https://github.com/chenjiahan))
+
 ## [v0.11.0](https://github.com/youzan/vant/tree/v0.11.0) (2017-11-17)
 [Full Changelog](https://github.com/youzan/vant/compare/v0.10.9...v0.11.0)
 

docs/markdown/zh-CN/changelog.md

@@ -1,5 +1,23 @@
 ## 更新日志
 
+### [0.11.1](https://github.com/youzan/vant/tree/v0.11.1)
+`2017-11-24`
+
+**Improvements**
+- Actionsheet: 更新关闭按钮样式 [\#340](https://github.com/youzan/vant/pull/340) [@chenjiahan](https://github.com/chenjiahan)
+- Popup: 新增 overlayClass、overlayStyle 属性 [\#349](https://github.com/youzan/vant/pull/349) [\#343](https://github.com/youzan/vant/pull/343) [@mickeyinfoshan](https://github.com/mickeyinfoshan) [@chenjiahan](https://github.com/chenjiahan)
+- Icon: 调整 unicode，避免展示特殊字符 [\#330](https://github.com/youzan/vant/pull/330) [@chenjiahan](https://github.com/chenjiahan)
+- ImagePreview: 支持手动关闭 [\#346](https://github.com/youzan/vant/pull/346) [@chenjiahan](https://github.com/chenjiahan)
+- Tabbar: 支持通过 slot-scope 判断 active 状态 [\#347](https://github.com/youzan/vant/pull/347) [@chuangbo](https://github.com/chuangbo)
+- SubmitBar: 新增左侧内容 slot [\#345](https://github.com/youzan/vant/pull/345) [@chenjiahan](https://github.com/chenjiahan)
+- 优化组件 staticClass 渲染效率 [\#337](https://github.com/youzan/vant/pull/337) [@chenjiahan](https://github.com/chenjiahan)
+- 优化文字截取相关样式 [\#334](https://github.com/youzan/vant/pull/334) [@chenjiahan](https://github.com/chenjiahan)
+- 优化按钮 css layer 及 GPU 开销 [\#336](https://github.com/youzan/vant/pull/336) [@deepkolos](https://github.com/deepkolos)
+
+**Bug Fixes**
+- 修复 SSR 过程中报错的问题 [\#344](https://github.com/youzan/vant/pull/344) [@chenjiahan](https://github.com/chenjiahan)
+- 修复 DateTimePicker 接受非法参数时卡死的问题 [\#333](https://github.com/youzan/vant/pull/333) [@chenjiahan](https://github.com/chenjiahan)
+
 ### [0.11.0](https://github.com/youzan/vant/tree/v0.11.0)
 `2017-11-17`
 

packages/vant-css/scripts/icon-config.js

@@ -328,6 +328,34 @@ module.exports = {
     {
       src: '电话.svg',
       css: 'phone'
+    },
+    {
+      src: '播放.svg',
+      css: 'play'
+    },
+    {
+      src: '暂停.svg',
+      css: 'pause'
+    },
+    {
+      src: '停止.svg',
+      css: 'stop'
+    },
+    {
+      src: 'HOT.svg',
+      css: 'hot'
+    },
+    {
+      src: 'NEW.svg',
+      css: 'new'
+    },
+    {
+      src: '新品.svg',
+      css: 'new-arrival'
+    },
+    {
+      src: '热卖.svg',
+      css: 'hot-sale'
     }
   ]
 };

packages/vant-css/src/icon.css

@@ -2,7 +2,7 @@
   font-style: normal;
   font-weight: normal;
   font-family: 'vant-icon';
-  src: url('https://b.yzcdn.cn/zanui/icon/vant-icon-6e8d2dd9.ttf') format('truetype');
+  src: url('https://b.yzcdn.cn/zanui/icon/vant-icon-75c072da.ttf') format('truetype');
 }
 
 .van-icon {
@@ -142,123 +142,144 @@
 .van-icon-home:before {
   content: "\F029";
 }
-.van-icon-like-o:before {
+.van-icon-hot-sale:before {
   content: "\F02A";
 }
-.van-icon-like:before {
+.van-icon-hot:before {
   content: "\F02B";
 }
-.van-icon-location:before {
+.van-icon-like-o:before {
   content: "\F02C";
 }
-.van-icon-logistics:before {
+.van-icon-like:before {
   content: "\F02D";
 }
-.van-icon-member-day-privilege:before {
+.van-icon-location:before {
   content: "\F02E";
 }
-.van-icon-other-pay:before {
+.van-icon-logistics:before {
   content: "\F02F";
 }
-.van-icon-passed:before {
+.van-icon-member-day-privilege:before {
   content: "\F030";
 }
-.van-icon-password-not-view:before {
+.van-icon-new-arrival:before {
   content: "\F031";
 }
-.van-icon-password-view:before {
+.van-icon-new:before {
   content: "\F032";
 }
-.van-icon-peer-pay:before {
+.van-icon-other-pay:before {
   content: "\F033";
 }
-.van-icon-pending-deliver:before {
+.van-icon-passed:before {
   content: "\F034";
 }
-.van-icon-pending-evaluate:before {
+.van-icon-password-not-view:before {
   content: "\F035";
 }
-.van-icon-pending-orders:before {
+.van-icon-password-view:before {
   content: "\F036";
 }
-.van-icon-pending-payment:before {
+.van-icon-pause:before {
   content: "\F037";
 }
-.van-icon-phone:before {
+.van-icon-peer-pay:before {
   content: "\F038";
 }
-.van-icon-photo:before {
+.van-icon-pending-deliver:before {
   content: "\F039";
 }
-.van-icon-photograph:before {
+.van-icon-pending-evaluate:before {
   content: "\F03A";
 }
-.van-icon-point-gift:before {
+.van-icon-pending-orders:before {
   content: "\F03B";
 }
-.van-icon-points-mall:before {
+.van-icon-pending-payment:before {
   content: "\F03C";
 }
-.van-icon-points:before {
+.van-icon-phone:before {
   content: "\F03D";
 }
-.van-icon-qr-invalid:before {
+.van-icon-photo:before {
   content: "\F03E";
 }
-.van-icon-qr:before {
+.van-icon-photograph:before {
   content: "\F03F";
 }
-.van-icon-question:before {
+.van-icon-play:before {
   content: "\F040";
 }
-.van-icon-receive-gift:before {
+.van-icon-point-gift:before {
   content: "\F041";
 }
-.van-icon-records:before {
+.van-icon-points-mall:before {
   content: "\F042";
 }
-.van-icon-search:before {
+.van-icon-points:before {
   content: "\F043";
 }
-.van-icon-send-gift:before {
+.van-icon-qr-invalid:before {
   content: "\F044";
 }
-.van-icon-setting:before {
+.van-icon-qr:before {
   content: "\F045";
 }
-.van-icon-shop-collect:before {
+.van-icon-question:before {
   content: "\F046";
 }
-.van-icon-shop:before {
+.van-icon-receive-gift:before {
   content: "\F047";
 }
-.van-icon-shopping-cart:before {
+.van-icon-records:before {
   content: "\F048";
 }
-.van-icon-sign:before {
+.van-icon-search:before {
   content: "\F049";
 }
-.van-icon-success:before {
+.van-icon-send-gift:before {
   content: "\F04A";
 }
-.van-icon-tosend:before {
+.van-icon-setting:before {
   content: "\F04B";
 }
-.van-icon-underway:before {
+.van-icon-shop-collect:before {
   content: "\F04C";
 }
-.van-icon-upgrade:before {
+.van-icon-shop:before {
   content: "\F04D";
 }
-.van-icon-value-card:before {
+.van-icon-shopping-cart:before {
   content: "\F04E";
 }
-.van-icon-wap-home:before {
+.van-icon-sign:before {
   content: "\F04F";
 }
-.van-icon-wap-nav:before {
+.van-icon-stop:before {
   content: "\F050";
 }
-.van-icon-wechat:before {
+.van-icon-success:before {
   content: "\F051";
 }
+.van-icon-tosend:before {
+  content: "\F052";
+}
+.van-icon-underway:before {
+  content: "\F053";
+}
+.van-icon-upgrade:before {
+  content: "\F054";
+}
+.van-icon-value-card:before {
+  content: "\F055";
+}
+.van-icon-wap-home:before {
+  content: "\F056";
+}
+.van-icon-wap-nav:before {
+  content: "\F057";
+}
+.van-icon-wechat:before {
+  content: "\F058";
+}