diff options
| author | qsm-odoo <qsm@odoo.com> | 2018-05-22 13:17:47 +0200 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2018-07-27 12:36:54 +0200 |
| commit | 443735949e799bcb362f87a6072c4baf46088022 (patch) | |
| tree | a04c96fcbc1655b0f2135b18d1d9add2c2a206b5 /addons/web_editor/static/lib | |
| parent | b437808f6696a8d202dac079fe8e40ade9779704 (diff) | |
[REF] *: BS4, replace img-rounded/img-circle classes
'img-rounded' -> 'rounded'
'img-circle' -> 'rounded-circle'
Diffstat (limited to 'addons/web_editor/static/lib')
3 files changed, 8 insertions, 8 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 e461bdb892f..ce39a7d3db2 100644 --- a/addons/web_editor/static/lib/summernote/src/js/Renderer.js +++ b/addons/web_editor/static/lib/summernote/src/js/Renderer.js @@ -450,12 +450,12 @@ define([ var roundedButton = tplIconButton(options.iconPrefix + options.icons.image.shapeRounded, { title: lang.image.shapeRounded, event: 'imageShape', - value: 'img-rounded' + value: 'rounded' }); var circleButton = tplIconButton(options.iconPrefix + options.icons.image.shapeCircle, { title: lang.image.shapeCircle, event: 'imageShape', - value: 'img-circle' + value: 'rounded-circle' }); var thumbnailButton = tplIconButton(options.iconPrefix + options.icons.image.shapeThumbnail, { title: lang.image.shapeThumbnail, 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 b7a1614d4db..59e3fa19f63 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 @@ -43,17 +43,17 @@ define([ if (styleInfo.image) { var $img = $(styleInfo.image); - btnState('button[data-event="imageShape"][data-value="img-rounded"]', function () { - return $img.hasClass('img-rounded'); + btnState('button[data-event="imageShape"][data-value="rounded"]', function () { + return $img.hasClass('rounded'); }); - btnState('button[data-event="imageShape"][data-value="img-circle"]', function () { - return $img.hasClass('img-circle'); + btnState('button[data-event="imageShape"][data-value="rounded-circle"]', function () { + return $img.hasClass('rounded-circle'); }); btnState('button[data-event="imageShape"][data-value="img-thumbnail"]', function () { return $img.hasClass('img-thumbnail'); }); btnState('button[data-event="imageShape"]:not([data-value])', function () { - return !$img.is('.img-rounded, .img-circle, .img-thumbnail'); + return !$img.is('.rounded, .rounded-circle, .img-thumbnail'); }); var imgFloat = $img.css('float'); diff --git a/addons/web_editor/static/lib/summernote/src/js/module/Editor.js b/addons/web_editor/static/lib/summernote/src/js/module/Editor.js index 99947c346cf..50bb9857fdf 100644 --- a/addons/web_editor/static/lib/summernote/src/js/module/Editor.js +++ b/addons/web_editor/static/lib/summernote/src/js/module/Editor.js @@ -760,7 +760,7 @@ define([ this.imageShape = function ($editable, value, $target) { beforeCommand($editable); - $target.removeClass('img-rounded img-circle img-thumbnail'); + $target.removeClass('rounded rounded-circle img-thumbnail'); if (value) { $target.addClass(value); |
