diff options
| author | Dharmraj Jhala (OpenERP) <dizzy.zala@gmail.com> | 2014-03-19 14:31:39 +0530 |
|---|---|---|
| committer | Dharmraj Jhala (OpenERP) <dizzy.zala@gmail.com> | 2014-03-19 14:31:39 +0530 |
| commit | e07861bb19a151d1aaf2155ef70113f9c1f386e7 (patch) | |
| tree | bba5f2d1b0f89dece636ae083e10a557d435fe94 /addons/website/static/src/xml | |
| parent | ac8b0fcfc5299b5ea62543b8382cb419fed4868e (diff) | |
| parent | edf0f26d5963a5a9736d9358bbf37b9fd7b9d5d7 (diff) | |
[MERGE] with latest trunk addons
bzr revid: dizzy.zala@gmail.com-20140319090139-1eaj26atlah94n7y
Diffstat (limited to 'addons/website/static/src/xml')
| -rw-r--r-- | addons/website/static/src/xml/website.editor.xml | 2 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.snippets.xml | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml index 09aa3783c3f..6edf553b7cb 100644 --- a/addons/website/static/src/xml/website.editor.xml +++ b/addons/website/static/src/xml/website.editor.xml @@ -6,7 +6,7 @@ <button type="button" data-action="save" class="btn btn-primary">Save</button> or - <a href="#" data-action="cancel">Discard</a> + <a href="#" data-action="cancel" class="btn btn-link">Discard</a> </form> <ul class="nav navbar-nav pull-right"> </ul> diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml index 511876b116d..c5cf94d4791 100644 --- a/addons/website/static/src/xml/website.snippets.xml +++ b/addons/website/static/src/xml/website.snippets.xml @@ -38,7 +38,10 @@ <div class='oe_handle n readonly'><div></div></div> <div class='oe_handle e readonly'><div></div></div> <div class='oe_handle w readonly'><div></div></div> - <div class='oe_handle size readonly'><div class="oe_handle_button size">Resize</div></div> + <div class='oe_handle size readonly'> + <div class="oe_handle_button size">Resize</div> + <div class="oe_handle_button auto_size">x</div> + </div> <div class='oe_handle s readonly'><div></div></div> </div> </div> |