diff options
| author | Deep Patel <dep@odoo.com> | 2017-08-25 18:55:37 +0530 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2017-10-10 16:19:29 +0200 |
| commit | bfba2c0e758d3ef4bdda1f704bbb044569fa4683 (patch) | |
| tree | 0b1cf268816df1c160243270f7f95fd4dc7f291f /addons | |
| parent | 7f6d32d5e0005fd694d1c59538f685f0867f6dfa (diff) | |
[FIX] web_editor, portal: some edition fixes
- Hide navbar divider in mobile view
- Change font to default when applying header style
- Remove form tag from media dialog search input to avoid redirection
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/portal/static/src/less/website.wrapwrap.less | 3 | ||||
| -rw-r--r-- | addons/web_editor/static/src/js/editor/summernote.js | 1 | ||||
| -rw-r--r-- | addons/web_editor/static/src/xml/editor.xml | 10 |
3 files changed, 8 insertions, 6 deletions
diff --git a/addons/portal/static/src/less/website.wrapwrap.less b/addons/portal/static/src/less/website.wrapwrap.less index 15ec112407e..5bb719b70e5 100644 --- a/addons/portal/static/src/less/website.wrapwrap.less +++ b/addons/portal/static/src/less/website.wrapwrap.less @@ -191,6 +191,9 @@ hr { &.divider { .o-w-fill-navbar(); border-right: 1px solid @navbar-default-link-disabled-color; + @media (max-width: @screen-xs-max) { + display: none; + } } &.active + .divider { diff --git a/addons/web_editor/static/src/js/editor/summernote.js b/addons/web_editor/static/src/js/editor/summernote.js index fa919a5a908..ef102bf081d 100644 --- a/addons/web_editor/static/src/js/editor/summernote.js +++ b/addons/web_editor/static/src/js/editor/summernote.js @@ -1761,6 +1761,7 @@ $.summernote.pluginEvents.outdent = function (event, editor, layoutInfo) { }; $.summernote.pluginEvents.formatBlock = function (event, editor, layoutInfo, sTagName) { + $.summernote.pluginEvents.applyFont(event, editor, layoutInfo, null, null, "Default"); var $editable = layoutInfo.editable(); $editable.data('NoteHistory').recordUndo($editable); event.preventDefault(); diff --git a/addons/web_editor/static/src/xml/editor.xml b/addons/web_editor/static/src/xml/editor.xml index ee3f0cd70e3..104c9b63049 100644 --- a/addons/web_editor/static/src/xml/editor.xml +++ b/addons/web_editor/static/src/xml/editor.xml @@ -62,12 +62,10 @@ </ul> </li> <li class="search"> - <form action="#"> - <div class="form-group"> - <input class="form-control" id="icon-search" type="search"/> - <span class="fa fa-search"/> - </div> - </form> + <div class="form-group"> + <input class="form-control" id="icon-search" type="search"/> + <span class="fa fa-search"/> + </div> </li> </ul> <!-- Tab panes --> |