From e440c562deb868e5ac6c74b1f2710d7ccdd0cf64 Mon Sep 17 00:00:00 2001
From: Nino <ninofocus@gmail.com>
Date: Mon, 26 Dec 2016 16:36:06 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=98=B2=E6=AD=A2=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=A2=AB=20button[disabled]=20=E7=9A=84=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E8=A6=86=E7=9B=96=EF=BC=8C=E6=89=80=E4=BB=A5=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E4=BA=86important?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dist/btn/index.wxss | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/dist/btn/index.wxss b/dist/btn/index.wxss
index 312b9c3f..0d3e4060 100644
--- a/dist/btn/index.wxss
+++ b/dist/btn/index.wxss
@@ -125,11 +125,12 @@
 
 /* disabled */
 .zui-btn.zui-btn--disabled {
-  color: #999;
-  background: #f8f8f8;
-  border-color: #e5e5e5;
-  cursor: not-allowed;
-  opacity: 1;
+  /* 防止样式被 button[disabled] 的规则覆盖，所以使用了important */
+  color: #999 ! important;
+  background: #f8f8f8 ! important;
+  border-color: #e5e5e5 ! important;
+  cursor: not-allowed ! important;
+  opacity: 1 ! important;
 }
 
 /* ::last-child */

From 29eb1276acf9261d300c2ecf189fa15267619d0e Mon Sep 17 00:00:00 2001
From: Nino <ninofocus@gmail.com>
Date: Mon, 26 Dec 2016 16:38:47 +0800
Subject: [PATCH 2/3] rename zui-btn--big to zui-btn--large

---
 dist/btn/index.wxss        | 2 +-
 example/btn/index.wxml     | 6 +++---
 example/dialog/index.wxml  | 2 +-
 example/toast/index.wxml   | 2 +-
 example/toptips/index.wxml | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dist/btn/index.wxss b/dist/btn/index.wxss
index 0d3e4060..04a9d145 100644
--- a/dist/btn/index.wxss
+++ b/dist/btn/index.wxss
@@ -60,7 +60,7 @@
   padding-left: 5px;
   padding-right: 5px;
 }
-.zui-btn--big {
+.zui-btn--large {
   border-radius: 0;
   margin-bottom: 0;
   border: none;
diff --git a/example/btn/index.wxml b/example/btn/index.wxml
index ac3dd5d7..2d659adb 100644
--- a/example/btn/index.wxml
+++ b/example/btn/index.wxml
@@ -8,9 +8,9 @@
   </view>
 
   <view class="zui-panel">
-    <button class="zui-btn zui-btn--big zui-btn--primary">确认付款</button>
-    <button class="zui-btn zui-btn--big zui-btn--warn">立即购买</button>
-    <button class="zui-btn zui-btn--big zui-btn--danger">立即购买</button>
+    <button class="zui-btn zui-btn--large zui-btn--primary">确认付款</button>
+    <button class="zui-btn zui-btn--large zui-btn--warn">立即购买</button>
+    <button class="zui-btn zui-btn--large zui-btn--danger">立即购买</button>
   </view>
 
   <view class="zui-panel" style="padding: 15px;">
diff --git a/example/dialog/index.wxml b/example/dialog/index.wxml
index 7faacbf8..b0335096 100644
--- a/example/dialog/index.wxml
+++ b/example/dialog/index.wxml
@@ -2,7 +2,7 @@
 
   <view class="zui-btns">
     <button
-      class="zui-btn zui-btn--primary zui-btn--big"
+      class="zui-btn zui-btn--primary zui-btn--large"
       bindtap="toggleDialog"
       style="margin-top: 40vh;"
     >
diff --git a/example/toast/index.wxml b/example/toast/index.wxml
index a7ec390d..e3dcbb9a 100644
--- a/example/toast/index.wxml
+++ b/example/toast/index.wxml
@@ -3,7 +3,7 @@
 <view class="container">
   <view class="zui-btns">
     <button
-      class="zui-btn zui-btn--primary zui-btn--big"
+      class="zui-btn zui-btn--primary zui-btn--large"
       catchtap="showToast"
       style="margin-top: 40vh;"
     >
diff --git a/example/toptips/index.wxml b/example/toptips/index.wxml
index ca1a3e11..c46d5499 100644
--- a/example/toptips/index.wxml
+++ b/example/toptips/index.wxml
@@ -3,7 +3,7 @@
 <view class="container">
   <view class="zui-btns">
     <button
-      class="zui-btn zui-btn--primary zui-btn--big"
+      class="zui-btn zui-btn--primary zui-btn--large"
       catchtap="showTopTips"
       style="margin-top: 40vh;"
     >

From ed112e6cc3799886d2503ba00079c5d2ff298f54 Mon Sep 17 00:00:00 2001
From: Nino <ninofocus@gmail.com>
Date: Tue, 27 Dec 2016 15:01:46 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=95=B0=E9=87=8F=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=99=A8=E6=B7=BB=E5=8A=A0=E5=B0=8F=E5=8F=B7=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dist/quantity/index.wxml    | 2 +-
 dist/quantity/index.wxss    | 9 +++++++++
 example/quantity/index.js   | 7 ++++++-
 example/quantity/index.wxml | 7 +++++++
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/dist/quantity/index.wxml b/dist/quantity/index.wxml
index dc4f4c59..15cd7391 100644
--- a/dist/quantity/index.wxml
+++ b/dist/quantity/index.wxml
@@ -1,5 +1,5 @@
 <template name="zui-quantity">
-  <view class="zui-quantity">
+  <view class="zui-quantity {{ size === 'small' ? 'zui-quantity--small' : '' }}">
     <view
       class="zui-quantity__minus {{ quantity <= min ? 'zui-quantity--disabled' : '' }}"
       data-component-id="{{ componentId }}"
diff --git a/dist/quantity/index.wxss b/dist/quantity/index.wxss
index 9b81aeed..b39bf63c 100644
--- a/dist/quantity/index.wxss
+++ b/dist/quantity/index.wxss
@@ -35,3 +35,12 @@
   color: #bbb;
   border-color: #e8e8e8;
 }
+.zui-quantity--small view {
+  min-width: 36px;
+  line-height: 18px;
+}
+.zui-quantity--small .zui-quantity__text {
+  width: 36px;
+  line-height: 28px;
+  height: 28px;
+}
diff --git a/example/quantity/index.js b/example/quantity/index.js
index 11c6926c..4406c270 100644
--- a/example/quantity/index.js
+++ b/example/quantity/index.js
@@ -3,7 +3,7 @@ var ZUI = require('../../dist/index');
 Page(Object.assign({}, ZUI.Quantity, {
   data: {
     quantity1: {
-      quantity: 1,
+      quantity: 10,
       min: 1,
       max: 20
     },
@@ -11,6 +11,11 @@ Page(Object.assign({}, ZUI.Quantity, {
       quantity: 1,
       min: 1,
       max: 1
+    },
+    quantity3: {
+      quantity: 10,
+      min: 1,
+      max: 20
     }
   },
 
diff --git a/example/quantity/index.wxml b/example/quantity/index.wxml
index 3d3b65e0..42aa274e 100644
--- a/example/quantity/index.wxml
+++ b/example/quantity/index.wxml
@@ -4,7 +4,14 @@
   <view style="padding: 40px 15px">
     <template is="zui-quantity" data="{{ ...quantity1, componentId: 'quantity1' }}" />
   </view>
+
+  <!-- 当最大值等于最小值时，组件不可用 -->
   <view style="padding: 40px 15px ">
     <template is="zui-quantity" data="{{ ...quantity2, componentId: 'quantity2' }}" />
   </view>
+
+  <!-- small size -->
+  <view style="padding: 40px 15px ">
+    <template is="zui-quantity" data="{{ ...quantity3, componentId: 'quantity3', size: 'small' }}" />
+  </view>
 </view>