framework/sage
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1560 from JulienMelissas/tinymce

Browse Source 
Simplify/speed up editor style process.
This commit is contained in:
Ben Word
2015-10-14 17:03:21 -05:00
parent 8e271f98bd 5a621210db
commit 695d7a5080
4 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
assets/manifest.json
View File

@@ -12,11 +12,6 @@
], ],
"main": true "main": true
}, },
"editor-style.css": {
"files": [
"styles/editor-style.scss"
]
},
"jquery.js": { "jquery.js": {
"bower": ["jquery"] "bower": ["jquery"]
} }

4
assets/styles/editor-style.scss → assets/styles/layouts/_tinymce.scss
View File

@@ -1,5 +1,3 @@
@import "main"; body#tinymce {
body {
margin: 12px !important; margin: 12px !important;
} }

1
assets/styles/main.scss
View File

@@ -16,3 +16,4 @@
@import "layouts/_footer"; @import "layouts/_footer";
@import "layouts/_pages"; @import "layouts/_pages";
@import "layouts/_posts"; @import "layouts/_posts";
@import "layouts/_tinymce";

2
lib/setup.php
View File

@@ -45,7 +45,7 @@ function setup() {
add_theme_support('html5', ['caption', 'comment-form', 'comment-list', 'gallery', 'search-form']); add_theme_support('html5', ['caption', 'comment-form', 'comment-list', 'gallery', 'search-form']);
// Custom stylesheet for visual editor // 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'); add_action('after_setup_theme', __NAMESPACE__ . '\\setup');