diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-10-19 18:16:14 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-10-19 18:16:14 +0200 |
| commit | 938ffb92da1ea898f661aec04745f7630e2f378c (patch) | |
| tree | 7faeed8433101836cd0239cf6c23629ef1f1289d /addons/web_editor/static/src/xml | |
| parent | 1f9e92dfef325b6727e1bee3de55bff095ec6cf2 (diff) | |
| parent | 6466aa499fc37bba5f4feeeecac99448ef88e62e (diff) | |
[MERGE] forward port branch 10.0 up to 6466aa4
Diffstat (limited to 'addons/web_editor/static/src/xml')
| -rw-r--r-- | addons/web_editor/static/src/xml/editor.xml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/addons/web_editor/static/src/xml/editor.xml b/addons/web_editor/static/src/xml/editor.xml index 27213d7fdd8..2ad47703700 100644 --- a/addons/web_editor/static/src/xml/editor.xml +++ b/addons/web_editor/static/src/xml/editor.xml @@ -251,31 +251,31 @@ <span class="caret"/></a> <ul aria-labelledby="dLabel" class="dropdown-menu" role="menu"> <li> - <label class="btn btn-link">Link + <label class="btn btn-link o_btn_preview">Link <input checked="checked" class="link-style" name="link-style-type" type="radio" value=""/></label> </li> <li> - <label class="btn btn-default">Basic + <label class="btn btn-default o_btn_preview">Basic <input class="link-style" name="link-style-type" type="radio" value="btn-default"/></label> </li> <li> - <label class="btn btn-success">Success + <label class="btn btn-success o_btn_preview">Success <input class="link-style" name="link-style-type" type="radio" value="btn-success"/></label> </li> <li> - <label class="btn btn-primary">Primary + <label class="btn btn-primary o_btn_preview">Primary <input class="link-style" name="link-style-type" type="radio" value="btn-primary"/></label> </li> <li> - <label class="btn btn-info">Info + <label class="btn btn-info o_btn_preview">Info <input class="link-style" name="link-style-type" type="radio" value="btn-info"/></label> </li> <li> - <label class="btn btn-warning">Warning + <label class="btn btn-warning o_btn_preview">Warning <input class="link-style" name="link-style-type" type="radio" value="btn-warning"/></label> </li> <li> - <label class="btn btn-danger">Danger + <label class="btn btn-danger o_btn_preview">Danger <input class="link-style" name="link-style-type" type="radio" value="btn-danger"/></label> </li> </ul> @@ -287,19 +287,19 @@ <span class="caret"/></a> <ul aria-labelledby="dLabel" class="dropdown-menu" role="menu"> <li> - <label class="btn btn-default btn-xs">Extra Small + <label class="btn btn-default btn-xs o_btn_preview">Extra Small <input class="link-style" name="link-style-size" type="radio" value="btn-xs"/></label> </li> <li> - <label class="btn btn-default btn-sm">Small + <label class="btn btn-default btn-sm o_btn_preview">Small <input class="link-style" name="link-style-size" type="radio" value="btn-sm"/></label> </li> <li> - <label class="btn btn-default">Default + <label class="btn btn-default o_btn_preview">Default <input checked="checked" class="link-style" name="link-style-size" type="radio" value=""/></label> </li> <li> - <label class="btn btn-default btn-lg">Large + <label class="btn btn-default btn-lg o_btn_preview">Large <input class="link-style" name="link-style-size" type="radio" value="btn-lg"/></label> </li> </ul> |