From bfba2c0e758d3ef4bdda1f704bbb044569fa4683 Mon Sep 17 00:00:00 2001
From: Deep Patel <dep@odoo.com>
Date: Fri, 25 Aug 2017 18:55:37 +0530
Subject: [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
---
 addons/web_editor/static/src/js/editor/summernote.js |  1 +
 addons/web_editor/static/src/xml/editor.xml          | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'addons/web_editor/static/src')

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 -->
-- 
cgit v1.2.3