Merge branch 'master' into master

plone · Jun 1, 2018 · 5bca309 · 5bca309 · mister-roboto · Jun 1, 2018
2 parents ba201ea + 2c3c68b
commit 5bca309
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -36,6 +36,9 @@ Bug fixes:
   make sure that 'Original' is prefilled in the scale drop down
   [frapell]
 
+- Tinymce: Fix issue where Webpack less-loader was unable to load TinyMCE bundle styles
+  [datakurre]
+
 - Fix for loading country specific language codes
   [lyralemos]
 

diff --git a/mockup/patterns/filemanager/js/findinfiles.js b/mockup/patterns/filemanager/js/findinfiles.js
@@ -22,7 +22,7 @@ define([
       '<form>' +
         '<div class="input-group">' +
           '<input type="text" class="search form-control" ' +
-                  'id="file-search-field" placeholder="<%= _t("Find text witin theme resource in plone") %>">' +
+                  'id="file-search-field" placeholder="<%= _t("Find text within theme resource in plone") %>">' +
         '</div>' +
         '<div class="input-group">' +
           '<input type="submit" class="btn btn-primary" value="<%= _t("Search") %>"/>' +

diff --git a/mockup/patterns/tinymce/less/pattern.tinymce.less b/mockup/patterns/tinymce/less/pattern.tinymce.less
@@ -1,5 +1,5 @@
-@import (inline) "@{bowerPath}tinymce-builded/js/tinymce/skins/lightgray/skin.min.css";
-@import (inline) "@{bowerPath}tinymce-builded/js/tinymce/skins/lightgray/content.min.css";
+@import (css) "@{bowerPath}tinymce-builded/js/tinymce/skins/lightgray/skin.min.css";
+@import (css) "@{bowerPath}tinymce-builded/js/tinymce/skins/lightgray/content.min.css";
 @import (inline) "@{bowerPath}tinymce-builded/js/tinymce/plugins/visualblocks/css/visualblocks.css";
 @import "@{mockupPath}/modal/pattern.modal.less";
 @import "@{mockupPath}/autotoc/pattern.autotoc.less";