change cancel button

This commit is contained in:
vitalets 2012-11-27 14:21:08 +04:00
parent 5ef1a9e184
commit 5d8861a49a
5 changed files with 10 additions and 5 deletions

@ -3,6 +3,7 @@ X-editable changelog
Version 1.1.0 wip Version 1.1.0 wip
---------------------------- ----------------------------
[enh] added support for IE7+ (vitalets)
[enh #9] 'name' or 'id' is not required anymore (vitalets) [enh #9] 'name' or 'id' is not required anymore (vitalets)
[enh] 'clear' button added in date and dateui (vitalets) [enh] 'clear' button added in date and dateui (vitalets)
[enh] form template changed: added DIV.editable-input, DIV.editable.buttons and $.fn.editableform buttons (vitalets) [enh] form template changed: added DIV.editable-input, DIV.editable.buttons and $.fn.editableform buttons (vitalets)

@ -13,7 +13,7 @@ Your feedback is very appreciated!
## Contribution ## Contribution
A few steps how to start contributing: A few steps how to start contributing:
1.[Fork X-editable](https://github.com/vitalets/x-editable/fork) 1.[Fork X-editable](https://github.com/vitalets/x-editable/fork) and pull the latest changes from <code>dev</code> branch
2.Arrange local directory structure. It should be: 2.Arrange local directory structure. It should be:
**x-editable** **x-editable**

@ -15,7 +15,7 @@ Editableform based on Twitter Bootstrap
//buttons //buttons
$.fn.editableform.buttons = '<button type="submit" class="btn btn-primary editable-submit"><i class="icon-ok icon-white"></i></button>'+ $.fn.editableform.buttons = '<button type="submit" class="btn btn-primary editable-submit"><i class="icon-ok icon-white"></i></button>'+
'<button type="button" class="btn editable-cancel"><i class="icon-ban-circle"></i></button>'; '<button type="button" class="btn editable-cancel"><i class="icon-remove"></i></button>';
//error classes //error classes
$.fn.editableform.errorGroupClass = 'error'; $.fn.editableform.errorGroupClass = 'error';

@ -14,7 +14,7 @@ Editableform based on jQuery UI
text: false text: false
}).removeAttr('title'); }).removeAttr('title');
this.$form.find('.editable-cancel').button({ this.$form.find('.editable-cancel').button({
icons: { primary: "ui-icon-cancel" }, icons: { primary: "ui-icon-closethick" },
text: false text: false
}).removeAttr('title'); }).removeAttr('title');

@ -47,11 +47,15 @@
.editable-error-block { .editable-error-block {
max-width: 300px; max-width: 300px;
padding-top: 3px; margin: 5px 0 0 0;
margin: 0;
width: auto; width: auto;
} }
/*add padding for jquery ui*/
.editable-error-block.ui-state-error {
padding: 3px;
}
.editable-error { .editable-error {
color: red; color: red;
} }