Merge pull request #1353 from tvdeyen/tinymce-update

Update bundled TinyMCE to 4.7.5
AlchemyCMS · Jan 23, 2018 · cd9aa31 · cd9aa31
2 parents 7e02913 + c5f4f08
commit cd9aa31
Show file tree

Hide file tree

Showing 10 changed files with 1,041 additions and 806 deletions.
diff --git a/app/assets/stylesheets/tinymce/skins/alchemy/skin.min.css.scss b/app/assets/stylesheets/tinymce/skins/alchemy/skin.min.css.scss
@@ -446,9 +446,17 @@ div.mce-fullscreen {
 
   .mce-btn {
     border-radius: $default-border-radius;
+    border: 0 none;
 
     button {
-      padding: 0.5em 1.5em;
+      padding: 0.3em 1.5em;
+      width: auto !important;
+      height: auto !important;
+      border: 1px solid $button-border-color;
+    }
+
+    .mce-txt {
+      vertical-align: middle;
     }
   }
 }

diff --git a/lib/alchemy/tinymce.rb b/lib/alchemy/tinymce.rb
@@ -22,7 +22,8 @@ module Tinymce
       convert_urls: false,
       entity_encoding: 'raw',
       paste_as_text: true,
-      element_format: 'html'
+      element_format: 'html',
+      branding: false
     }
 
     class << self