diff options
Diffstat (limited to 'addons/web_editor/static/lib/summernote/src')
| -rw-r--r-- | addons/web_editor/static/lib/summernote/src/js/Renderer.js | 6 | ||||
| -rw-r--r-- | addons/web_editor/static/lib/summernote/src/js/module/Button.js | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/addons/web_editor/static/lib/summernote/src/js/Renderer.js b/addons/web_editor/static/lib/summernote/src/js/Renderer.js index 6f5af317bfa..2c856d4b152 100644 --- a/addons/web_editor/static/lib/summernote/src/js/Renderer.js +++ b/addons/web_editor/static/lib/summernote/src/js/Renderer.js @@ -162,7 +162,7 @@ define([ style: function (lang, options) { var items = options.styleTags.reduce(function (memo, v) { var label = lang.style[v === 'p' ? 'normal' : v]; - return memo + '<li><a data-event="formatBlock" href="#" data-value="' + v + '">' + + return memo + '<li><a class="dropdown-item" data-event="formatBlock" href="#" data-value="' + v + '">' + ( (v === 'p' || v === 'pre') ? label : '<' + v + '>' + label + '</' + v + '>' @@ -225,12 +225,12 @@ define([ }); var items = [ - '<li><div class="btn-group">', + '<li class="flex"><div class="btn-group flex-column">', '<div class="note-palette-title">' + lang.color.background + '</div>', '<div class="note-color-reset" data-event="backColor"', ' data-value="inherit" title="' + lang.color.transparent + '">' + lang.color.setTransparent + '</div>', '<div class="note-color-palette" data-target-event="backColor"></div>', - '</div><div class="btn-group">', + '</div><div class="btn-group flex-column">', '<div class="note-palette-title">' + lang.color.foreground + '</div>', '<div class="note-color-reset" data-event="foreColor" data-value="inherit" title="' + lang.color.reset + '">', lang.color.resetToDefault, diff --git a/addons/web_editor/static/lib/summernote/src/js/module/Button.js b/addons/web_editor/static/lib/summernote/src/js/module/Button.js index 59e3fa19f63..c6d28494cd0 100644 --- a/addons/web_editor/static/lib/summernote/src/js/module/Button.js +++ b/addons/web_editor/static/lib/summernote/src/js/module/Button.js @@ -21,10 +21,10 @@ define([ * @param {Number} value */ var checkDropdownMenu = function ($btn, value) { - $btn.find('.dropdown-menu li a').each(function () { + $btn.find('.dropdown-menu .dropdown-item').each(function () { // always compare string to avoid creating another func. var isChecked = ($(this).data('value') + '') === (value + ''); - this.className = isChecked ? 'checked' : ''; + this.className = 'dropdown-item' + (isChecked ? ' checked' : ''); }); }; |
