remove old code. consolodate css/js

ghoppe · Jan 8, 2020 · 5d8f39a · 5d8f39a
1 parent 99f67f6
commit 5d8f39a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 15 deletions.
diff --git a/app/assets/javascripts/refinery/tinymce_manifest.js b/app/assets/javascripts/refinery/tinymce_manifest.js
@@ -9,6 +9,8 @@
 /*
  *= require tinymce/tinymce.min.js
  *= require tinymce/jquery.tinymce.min.js
+ *= require tinymce/themes/silver/theme.min.js
+ *= require tinymce/themes/mobile/theme.min.js
  *= require tinymce/plugins/link/plugin.min.js
  *= require tinymce/plugins/image/plugin.min.js
  *= require tinymce/plugins/fullscreen/plugin.min.js
@@ -17,6 +19,6 @@
  *= require tinymce/plugins/stylebuttons/plugin.min.js
  *= require tinymce/plugins/refineryimage/plugin.min.js
  *= require tinymce/plugins/refinerylink/plugin.min.js
-*= require refinery/boot_tinymce
+ *= require refinery/boot_tinymce
  *= require_self
 */
diff --git a/app/assets/stylesheets/refinery-fix.css b/app/assets/stylesheets/refinery-fix.css
diff --git a/app/assets/stylesheets/tinymce.scss b/app/assets/stylesheets/tinymce.scss
@@ -1,7 +1,7 @@
 /* IMPORTS STYLES USED FOR SITE */
 @import url(asset-path("tinymce/skins/ui/oxide/skin.min.css"));
+@import url(asset-path("tinymce/skins/ui/oxide/skin.mobile.min.css"));
 @import url(asset-path("tinymce/skins/content/default/content.min.css"));
-@import url(asset-path("application.css"));
 
 body.mce-content-body {
   margin: 20px;

diff --git a/lib/refinery/tinymce/engine.rb b/lib/refinery/tinymce/engine.rb
@@ -10,7 +10,6 @@ class Engine < ::Rails::Engine
       config.to_prepare do
         Rails.application.config.assets.precompile += %w(
           tinymce/themes/modern/theme.js
-          refinery-fix.css
           tinymce.css
           tinymce/skins/content/default/*
           tinymce/skins/ui/oxide/*
@@ -40,11 +39,7 @@ class Engine < ::Rails::Engine
       end
 
       after_inclusion do
-        %w(tinymce/skins/content/default/content.min refinery-fix).each do |stylesheet|
-          Refinery::Core.config.register_visual_editor_stylesheet stylesheet
-        end
-
-        %W(refinery/tinymce_manifest tinymce/themes/silver/theme).each do |javascript|
+        %W(refinery/tinymce_manifest).each do |javascript|
           Refinery::Core.config.register_visual_editor_javascript javascript
         end