diff options
| author | Kevin Baptiste <kba@odoo.com> | 2019-08-12 07:18:23 +0000 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2019-11-28 10:05:12 +0000 |
| commit | ff1c35513aecef5fbc30f7c2f3834450e719714e (patch) | |
| tree | 8149f14df17095845e735d6cccaf9317a1f97af6 /addons/web_editor/static/lib | |
| parent | 4c030311ada2ad19a2ee81b15544b7aed35b642b (diff) | |
[IMP] web: update to fontawesome 4.7.0 to 5.11.2
FontAwesome 5 introduced new names for some icons as described on
https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4#name-changes
This commit replaces the old names to the new ones.
closes odoo/odoo#35826
Taskid: 2050241
Related: odoo/enterprise#5180
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Diffstat (limited to 'addons/web_editor/static/lib')
| -rw-r--r-- | addons/web_editor/static/lib/jQuery.transfo.js | 4 | ||||
| -rw-r--r-- | addons/web_editor/static/lib/summernote/src/js/defaults.js | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/addons/web_editor/static/lib/jQuery.transfo.js b/addons/web_editor/static/lib/jQuery.transfo.js index 855d6f48560..c82efe81d7b 100644 --- a/addons/web_editor/static/lib/jQuery.transfo.js +++ b/addons/web_editor/static/lib/jQuery.transfo.js @@ -135,8 +135,8 @@ OTHER DEALINGS IN THE SOFTWARE. + '<div class="transfo-controls">' + '<div style="cursor: crosshair; position: absolute; margin: -30px; top: 0; right: 0; padding: 1px 0 0 1px;" class="transfo-rotator">' + '<span class="fa-stack fa-lg">' - + '<i class="fa fa-circle fa-stack-2x"></i>' - + '<i class="fa fa-repeat fa-stack-1x fa-inverse"></i>' + + '<i class="far fa-circle fa-stack-2x"></i>' + + '<i class="fas fa-redo fa-stack-1x fa-inverse"></i>' + '</span>' + '</div>' + '<div style="' + css + 'top: 0%; left: 0%; cursor: nw-resize;" class="transfo-scaler-tl"></div>' diff --git a/addons/web_editor/static/lib/summernote/src/js/defaults.js b/addons/web_editor/static/lib/summernote/src/js/defaults.js index 9d8e0bab661..fa8de80e134 100644 --- a/addons/web_editor/static/lib/summernote/src/js/defaults.js +++ b/addons/web_editor/static/lib/summernote/src/js/defaults.js @@ -70,15 +70,15 @@ define('summernote/defaults', function () { subscript: 'subscript' }, image: { - image: 'picture-o', + image: 'image', floatLeft: 'align-left', floatRight: 'align-right', floatNone: 'align-justify', shapeRounded: 'square', - shapeCircle: 'circle-o', - shapeThumbnail: 'picture-o', + shapeCircle: 'circle', + shapeThumbnail: 'image', shapeNone: 'times', - remove: 'trash-o' + remove: 'trash-alt' }, link: { link: 'link', @@ -117,7 +117,7 @@ define('summernote/defaults', function () { }, history: { undo: 'undo', - redo: 'repeat' + redo: 'redo' }, misc: { check: 'check' |