Merge branch 'b-7.2.x-fix_media_icon-OXDEV-7570' into b-7.2.x

OXID-eSales · Sep 5, 2024 · cf785e2 · cf785e2
2 parents 802f091 + bffbcfc
commit cf785e2
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 9 deletions.
diff --git a/assets/out/src/css/backend.min.css b/assets/out/src/css/backend.min.css
diff --git a/assets/out/src/css/wysiwyg.min.css b/assets/out/src/css/wysiwyg.min.css
diff --git a/assets/out/src/js/ddoesummernote.min.js b/assets/out/src/js/ddoesummernote.min.js
diff --git a/assets/out/src/js/ddoesummernote.min.js.map b/assets/out/src/js/ddoesummernote.min.js.map
diff --git a/build/less/backend_editor.less b/build/less/backend_editor.less
@@ -18,4 +18,8 @@
     div.codeview textarea.note-codable {
         color: white;
     }
+
+    i.fa {
+        height: 12px
+    }
 }
diff --git a/build/vendor/summernote/dist/plugin/ddmedia.summernote.js b/build/vendor/summernote/dist/plugin/ddmedia.summernote.js
@@ -11,6 +11,7 @@
             {
                 var layoutInfo = context.layoutInfo;
                 var $toolbar   = layoutInfo.toolbar;
+                var lang       = context.options.langInfo;
 
                 var ui = $.summernote.ui;
 
@@ -19,8 +20,8 @@
                     // create button
                     var button = ui.button(
                         {
-                            className: 'btn-info',
-                            contents: '<i class="fa fa-file-image-o"></i>',
+                            contents: '<i class="fa fa-file-image-o fa-file-image"></i>',
+                            tooltip: lang.image.image,
                             click: function (e) {
                                 if (typeof MediaLibrary === 'undefined') {
                                     if (top.basefrm && top.basefrm.OverlayInstance) {

diff --git a/build/vendor/summernote/plugin/ddmedia.summernote.js b/build/vendor/summernote/plugin/ddmedia.summernote.js
@@ -11,6 +11,7 @@
             {
                 var layoutInfo = context.layoutInfo;
                 var $toolbar   = layoutInfo.toolbar;
+                var lang       = context.options.langInfo;
 
                 var ui = $.summernote.ui;
 
@@ -19,8 +20,8 @@
                     // create button
                     var button = ui.button(
                         {
-                            className: 'btn-info',
-                            contents: '<i class="fa fa-file-image-o"></i>',
+                            contents: '<i class="fa fa-file-image-o fa-file-image"></i>',
+                            tooltip: lang.image.image,
                             click: function (e) {
                                 if (typeof MediaLibrary === 'undefined') {
                                     if (top.basefrm && top.basefrm.OverlayInstance) {