diff options
| author | Frederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com> | 2014-08-25 16:42:57 +0200 |
|---|---|---|
| committer | Frederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com> | 2014-08-25 16:42:57 +0200 |
| commit | d7f93defb899b2b48a14d679e5dffffdb4a00eff (patch) | |
| tree | f8572183b480477622917a1f504cf49a8e202f6e /addons/website/static/src/xml/website.snippets.xml | |
| parent | 2b67528fe9e366829d44d8aba756bc6e359b4c61 (diff) | |
| parent | 36146b3fadc47543f4b696ab75c31b3459afb15b (diff) | |
Merge branch 'master' into master-pos-new-payment-screen-fva
Conflicts:
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_view.xml
Diffstat (limited to 'addons/website/static/src/xml/website.snippets.xml')
| -rw-r--r-- | addons/website/static/src/xml/website.snippets.xml | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml index 4b37ccc5e65..1db2433a4d4 100644 --- a/addons/website/static/src/xml/website.snippets.xml +++ b/addons/website/static/src/xml/website.snippets.xml @@ -4,7 +4,7 @@ <!-- Snippet loader --> <t t-name="website.snippets_button"> <li class="navbar-form js_hide_on_translate" style="margin-top: 6px;"> - <button type="button" data-action="snippet" class="hidden btn btn-primary btn-xs">Insert Blocks</button> + <button type="button" data-action="snippet" class="btn btn-primary btn-xs">Insert Blocks</button> </li> </t> <t t-name="website.snippets_style"> @@ -53,13 +53,4 @@ <div class='oe_snippet_manipulator'></div> </t> - <!-- snippet objects --> - - <div t-name="website.snippets.resize" data-snippet-id='resize'> - <!-- custom data for the widget --> - <div class='oe_snippet_thumbnail'>Margin resize</div> - </div> - - <div t-name="website.snippets.colmd" data-snippet-id='colmd' data-selector-vertical-children='.row'></div> - </templates> |