Skip to content

Commit 1379862

Browse files
authored
feat(dialog): 新增按钮变量 (#3173)
1 parent a0e26ee commit 1379862

File tree

7 files changed

+10
-0
lines changed

7 files changed

+10
-0
lines changed

src/packages/dialog/dialog.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@
127127

128128
&-cancel.nut-dialog-footer-cancel {
129129
margin-right: $dialog-footer-cancel-margin-right;
130+
background: $dialog-footer-cancel-bg;
130131
}
131132

132133
&-ok {

src/packages/dialog/doc.en-US.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ The component provides the following CSS variables, which can be used to customi
159159
| \--nutui-dialog-footer-justify-content | dialog footer justify content | `space-around` |
160160
| \--nutui-dialog-footer-button-min-width | dialog footer button min width | `117px` |
161161
| \--nutui-dialog-footer-cancel-margin-right | dialog footer cancel button's margin right | `12px` |
162+
| \--nutui-dialog-footer-cancel-bg | dialog footer cancel button's bg | `transparent` |
162163
| \--nutui-dialog-footer-ok-max-width | dialog footer confirm button's max width | `128px` |
163164
| \--nutui-dialog-vertical-footer-ok-margin-top | dialog vertical footer confirm button margin top | `5px` |
164165
| \--nutui-dialog-close-width | dialog close the width of the button | `18px` |

src/packages/dialog/doc.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ export default function App() {
159159
| \--nutui-dialog-footer-justify-content | 对话框底部按钮排布 | `space-around` |
160160
| \--nutui-dialog-footer-button-min-width | 对话框底部按钮最小宽度 | `117px` |
161161
| \--nutui-dialog-footer-cancel-margin-right | 对话框取消按钮的margin-right | `12px` |
162+
| \--nutui-dialog-footer-cancel-bg | 取消按钮的背景色 | `transparent` |
162163
| \--nutui-dialog-footer-ok-max-width | 对话框确认按钮的最大宽度 | `128px` |
163164
| \--nutui-dialog-vertical-footer-ok-margin-top | 对话框底部按钮纵向排布时的margin值 | `5px` |
164165
| \--nutui-dialog-close-width | 对话框关闭按钮的宽度 | `18px` |

src/packages/dialog/doc.taro.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ DialogOptions 是 DialogProps 的子集,包含如下属性:title, content, f
139139
| \--nutui-dialog-footer-justify-content | 对话框底部按钮排布 | `space-around` |
140140
| \--nutui-dialog-footer-button-min-width | 对话框底部按钮最小宽度 | `117px` |
141141
| \--nutui-dialog-footer-cancel-margin-right | 对话框取消按钮的margin-right | `12px` |
142+
| \--nutui-dialog-footer-cancel-bg | 取消按钮的背景色 | `transparent` |
142143
| \--nutui-dialog-footer-ok-max-width | 对话框确认按钮的最大宽度 | `128px` |
143144
| \--nutui-dialog-vertical-footer-ok-margin-top | 对话框底部按钮纵向排布时的margin值 | `5px` |
144145
| \--nutui-dialog-close-width | 对话框关闭按钮的宽度 | `18px` |

src/packages/dialog/doc.zh-TW.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ export default function App() {
159159
| \--nutui-dialog-footer-justify-content | 對話框底部按鈕排布 | `space-around` |
160160
| \--nutui-dialog-footer-button-min-width | 對話框底部按鈕最小寬度 | `117px` |
161161
| \--nutui-dialog-footer-cancel-margin-right | 對話框取消按鈕的margin-right | `12px` |
162+
| \--nutui-dialog-footer-cancel-bg | 取消按鈕的背景色 | `transparent` |
162163
| \--nutui-dialog-footer-ok-max-width | 對話框確認按鈕的最大寬度 | `128px` |
163164
| \--nutui-dialog-vertical-footer-ok-margin-top | 對話框底部按鈕縱向排布時的margin值 | `5px` |
164165
| \--nutui-dialog-close-width | 對話框關閉按鈕的寬度 | `18px` |

src/styles/variables-jmapp.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1316,6 +1316,7 @@ $dialog-footer-cancel-margin-right: var(
13161316
--nutui-dialog-footer-cancel-margin-right,
13171317
12px
13181318
) !default;
1319+
$dialog-footer-cancel-bg: var(--nutui-dialog-footer-cancel-bg, transparent);
13191320
$dialog-footer-ok-max-width: var(
13201321
--nutui-dialog-footer-ok-max-width,
13211322
128px

src/styles/variables.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1264,6 +1264,10 @@ $dialog-footer-cancel-margin-right: var(
12641264
--nutui-dialog-footer-cancel-margin-right,
12651265
12px
12661266
) !default;
1267+
$dialog-footer-cancel-bg: var(
1268+
--nutui-dialog-footer-cancel-bg,
1269+
$button-default-background-color
1270+
);
12671271
$dialog-footer-ok-max-width: var(
12681272
--nutui-dialog-footer-ok-max-width,
12691273
128px

0 commit comments

Comments
 (0)