diff --git a/assets/js/Admin.js b/assets/js/Admin.js index 1552bc122e..c498dc13cf 100644 --- a/assets/js/Admin.js +++ b/assets/js/Admin.js @@ -213,7 +213,7 @@ const Admin = { Admin.log('[core|setup_xeditable] configure xeditable on', subject); jQuery('.x-editable', subject).editable({ emptyclass: 'editable-empty btn btn-sm btn-default', - emptytext: '', + emptytext: '', container: 'body', placement: 'auto', success(response) { diff --git a/assets/scss/app.scss b/assets/scss/app.scss index def7d8357d..71079b0d74 100644 --- a/assets/scss/app.scss +++ b/assets/scss/app.scss @@ -8,7 +8,12 @@ */ @import "~bootstrap/dist/css/bootstrap.css"; -@import "~font-awesome/scss/font-awesome"; + +// Add Font Awesome Free and the v4 compatibility layer +// this layer should only be removed when we are sure we have replaced +// all icons to the new naming on all Sonata code +@import "~@fortawesome/fontawesome-free/css/all.css"; +@import "~@fortawesome/fontawesome-free/css/v4-shims.css"; // Add Source Sans Pro Font with all options // This font is used by AdminLTE diff --git a/docs/cookbook/recipe_custom_action.rst b/docs/cookbook/recipe_custom_action.rst index bb0aca91f4..8faf9521cd 100644 --- a/docs/cookbook/recipe_custom_action.rst +++ b/docs/cookbook/recipe_custom_action.rst @@ -280,7 +280,7 @@ Create a template for that button: