Merge branch 'develop'

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ### Added
 * allow to use `window.tinymceModes` to add or override tinymce modes
+* add border color on tinymce editor
 ### Fixed
 * fix default crud sort
 * fix hidden save button in file manager

src/core/Resources/assets/css/admin.scss

@@ -744,8 +744,15 @@ label.required::after {
   background: map-get($theme-colors, 'dark-blue');
 }
 
-.tox.tox-silver-sink.tox-tinymce-aux {
+.tox {
-  z-index: 3000 !important;
+  &.tox-silver-sink.tox-tinymce-aux {
+    z-index: 3000 !important;
+  }
+
+  &.tox-tinymce {
+    border-color: $input-border-color;
+    border-radius: 5px;
+  }
 }
 
 .field-boolean {