From 5a621210db943b90aa7c6a92a7908882b96c1beb Mon Sep 17 00:00:00 2001 From: Julien Melissas Date: Tue, 13 Oct 2015 11:51:57 -0400 Subject: [PATCH] Removed `editor-style` style files in favor of adding a simple `_tinymce.scss` partial. This cuts styles compiling time in about half. `add_editor_style` now just references `main.css` --- assets/manifest.json | 5 ----- assets/styles/{editor-style.scss => layouts/_tinymce.scss} | 4 +--- assets/styles/main.scss | 1 + lib/setup.php | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) rename assets/styles/{editor-style.scss => layouts/_tinymce.scss} (54%) diff --git a/assets/manifest.json b/assets/manifest.json index de917dc..abf01a3 100644 --- a/assets/manifest.json +++ b/assets/manifest.json @@ -12,11 +12,6 @@ ], "main": true }, - "editor-style.css": { - "files": [ - "styles/editor-style.scss" - ] - }, "jquery.js": { "bower": ["jquery"] } diff --git a/assets/styles/editor-style.scss b/assets/styles/layouts/_tinymce.scss similarity index 54% rename from assets/styles/editor-style.scss rename to assets/styles/layouts/_tinymce.scss index b318c99..7a91799 100644 --- a/assets/styles/editor-style.scss +++ b/assets/styles/layouts/_tinymce.scss @@ -1,5 +1,3 @@ -@import "main"; - -body { +body#tinymce { margin: 12px !important; } diff --git a/assets/styles/main.scss b/assets/styles/main.scss index 9fc7113..0d51262 100644 --- a/assets/styles/main.scss +++ b/assets/styles/main.scss @@ -16,3 +16,4 @@ @import "layouts/_footer"; @import "layouts/_pages"; @import "layouts/_posts"; +@import "layouts/_tinymce"; diff --git a/lib/setup.php b/lib/setup.php index a534e92..992e0a3 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -45,7 +45,7 @@ function setup() { add_theme_support('html5', ['caption', 'comment-form', 'comment-list', 'gallery', 'search-form']); // Custom stylesheet for visual editor - add_editor_style(Assets\asset_path('styles/editor-style.css')); + add_editor_style(Assets\asset_path('styles/main.css')); } add_action('after_setup_theme', __NAMESPACE__ . '\\setup');