From 63f5de48f85de3276fd771a5c90ff7259de1bed3 Mon Sep 17 00:00:00 2001 From: koppthe Date: Thu, 2 Aug 2018 21:33:37 +0800 Subject: [PATCH] =?UTF-8?q?feat(doc):=20=E5=AE=8C=E5=96=84=20Button=20?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=B1=95=E7=A4=BA=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/basic/button/index.js | 164 +++++++++++++++++++----------- src/pages/basic/button/index.scss | 15 +-- 2 files changed, 115 insertions(+), 64 deletions(-) diff --git a/src/pages/basic/button/index.js b/src/pages/basic/button/index.js index 7f18a7669..9867a9720 100644 --- a/src/pages/basic/button/index.js +++ b/src/pages/basic/button/index.js @@ -30,57 +30,57 @@ export default class ButtonPage extends Taro.Component { 主操作 - - 页面主操作 + + 主操作按钮 - + 带loading - + 带icon - + 点击态 - + 不可操作 - {/* 次操作 */} + {/* 次要操作 */} - 主操作 + 次要操作 - - 页面次操作 + + 次操作按钮 - + 带icon - + 点击态 - + 不可操作 - {/* 线框按钮 */} + {/* 次次要操作 */} - 线框按钮 + 次次要操作 - - 页面次要操作 + + 次次要操作按钮 - + 带icon - + 点击态 - + 不可操作 @@ -90,25 +90,49 @@ export default class ButtonPage extends Taro.Component { 小按钮 - - 按钮 - 按钮 - 按钮 - - - - - - - - 按钮 - 按钮 - 按钮 - - - 按钮 - 按钮 - 按钮 + + + 按钮 + + + 按钮 + + + 按钮 + + + + + + + + + + + + + + + + 按钮 + + + 按钮 + + + 按钮 + + + + + 按钮 + + + 按钮 + + + 按钮 + @@ -117,25 +141,49 @@ export default class ButtonPage extends Taro.Component { 圆角按钮 - - 按钮 - 按钮 - 按钮 - - - - - - - - 按钮 - 按钮 - 按钮 - - - 按钮 - 按钮 - 按钮 + + + 按钮 + + + 按钮 + + + 按钮 + + + + + + + + + + + + + + + + 按钮 + + + 按钮 + + + 按钮 + + + + + 按钮 + + + 按钮 + + + 按钮 + diff --git a/src/pages/basic/button/index.scss b/src/pages/basic/button/index.scss index c54bfec0b..5d6b73799 100644 --- a/src/pages/basic/button/index.scss +++ b/src/pages/basic/button/index.scss @@ -1,11 +1,14 @@ -.example { - margin-bottom: 15px; +.panel__content { + .btn-item { + margin-bottom: 20px; - &.small { - text-align: center; + &:last-child { + margin-bottom: 0; + } - .at-button { - margin: 0 20px; + .subitem { + display: inline-block; + margin-left: 24px; } } }