Skip to content

Commit

Permalink
rename weui_dialog button
Browse files Browse the repository at this point in the history
  • Loading branch information
jfengjiang committed Oct 9, 2015
1 parent 13adf90 commit f8f31aa
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 17 deletions.
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ gulp -ws
<div class="weui_dialog_hd"><strong class="weui_dialog_title">弹窗标题</strong></div>
<div class="weui_dialog_bd">自定义弹窗内容<br>...</div>
<div class="weui_dialog_ft">
<a href="javascript:;" class="btn_weui_dialog default">取消</a>
<a href="javascript:;" class="btn_weui_dialog primary">确定</a>
<a href="javascript:;" class="weui_btn_dialog default">取消</a>
<a href="javascript:;" class="weui_btn_dialog primary">确定</a>
</div>
</div>
</div>
Expand All @@ -148,7 +148,7 @@ gulp -ws
<div class="weui_dialog_hd"><strong class="weui_dialog_title">弹窗标题</strong></div>
<div class="weui_dialog_bd">弹窗内容，告知当前页面信息等</div>
<div class="weui_dialog_ft">
<a href="javascript:;" class="btn_weui_dialog primary">确定</a>
<a href="javascript:;" class="weui_btn_dialog primary">确定</a>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions dist/example/example.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ $(function () {

$container.on('click', '#showDialog1', function () {
$('#dialog1').show();
$('#dialog1').find('.btn_weui_dialog').on('click', function () {
$('#dialog1').find('.weui_btn_dialog').on('click', function () {
$('#dialog1').hide();
});
});
$container.on('click', '#showDialog2', function () {
$('#dialog2').show();
$('#dialog2').find('.btn_weui_dialog').on('click', function () {
$('#dialog2').find('.weui_btn_dialog').on('click', function () {
$('#dialog2').hide();
});
})
Expand Down
6 changes: 3 additions & 3 deletions dist/example/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -395,8 +395,8 @@ <h1 class="page_title">Dialog</h1>
<div class="weui_dialog_hd"><strong class="weui_dialog_title">弹窗标题</strong></div>
<div class="weui_dialog_bd">自定义弹窗内容<br>...</div>
<div class="weui_dialog_ft">
<a href="javascript:;" class="btn_weui_dialog default">取消</a>
<a href="javascript:;" class="btn_weui_dialog primary">确定</a>
<a href="javascript:;" class="weui_btn_dialog default">取消</a>
<a href="javascript:;" class="weui_btn_dialog primary">确定</a>
</div>
</div>
</div>
Expand All @@ -408,7 +408,7 @@ <h1 class="page_title">Dialog</h1>
<div class="weui_dialog_hd"><strong class="weui_dialog_title">弹窗标题</strong></div>
<div class="weui_dialog_bd">弹窗内容，告知当前页面信息等</div>
<div class="weui_dialog_ft">
<a href="javascript:;" class="btn_weui_dialog primary">确定</a>
<a href="javascript:;" class="weui_btn_dialog primary">确定</a>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions dist/style/weui.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -723,10 +723,10 @@ input.weui_btn_mini {
overflow: hidden;
*zoom: 1;
}
.btn_weui_dialog.default {
.weui_btn_dialog.default {
color: #353535;
}
.btn_weui_dialog.primary {
.weui_btn_dialog.primary {
color: #0BB20C;
}
@media screen and (min-width: 1024px) {
Expand Down
2 changes: 1 addition & 1 deletion dist/style/weui.min.css
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/example/example.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ $(function () {

$container.on('click', '#showDialog1', function () {
$('#dialog1').show();
$('#dialog1').find('.btn_weui_dialog').on('click', function () {
$('#dialog1').find('.weui_btn_dialog').on('click', function () {
$('#dialog1').hide();
});
});
$container.on('click', '#showDialog2', function () {
$('#dialog2').show();
$('#dialog2').find('.btn_weui_dialog').on('click', function () {
$('#dialog2').find('.weui_btn_dialog').on('click', function () {
$('#dialog2').hide();
});
})
Expand Down
6 changes: 3 additions & 3 deletions src/example/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -395,8 +395,8 @@ <h1 class="page_title">Dialog</h1>
<div class="weui_dialog_hd"><strong class="weui_dialog_title">弹窗标题</strong></div>
<div class="weui_dialog_bd">自定义弹窗内容<br>...</div>
<div class="weui_dialog_ft">
<a href="javascript:;" class="btn_weui_dialog default">取消</a>
<a href="javascript:;" class="btn_weui_dialog primary">确定</a>
<a href="javascript:;" class="weui_btn_dialog default">取消</a>
<a href="javascript:;" class="weui_btn_dialog primary">确定</a>
</div>
</div>
</div>
Expand All @@ -408,7 +408,7 @@ <h1 class="page_title">Dialog</h1>
<div class="weui_dialog_hd"><strong class="weui_dialog_title">弹窗标题</strong></div>
<div class="weui_dialog_bd">弹窗内容，告知当前页面信息等</div>
<div class="weui_dialog_ft">
<a href="javascript:;" class="btn_weui_dialog primary">确定</a>
<a href="javascript:;" class="weui_btn_dialog primary">确定</a>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/style/widget/weui_tips/weui_dialog.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
}
}

.btn_weui_dialog {
.weui_btn_dialog {
&.default {
color: #353535;
}
Expand Down

0 comments on commit f8f31aa

Please sign in to comment.