Skip to content

Commit 16fa599

Browse files
AndiDittrichAndiDittrich
committed
enforce enlighterjs css dependency
1 parent 38f95f4 commit 16fa599

File tree

5 files changed

+28
-33
lines changed

5 files changed

+28
-33
lines changed

‎CHANGES.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
* Added: EnlighterJS Theme-Customizer `v2.2.0`
77
* Added: compatbility mode for [CodeColorer](https://wordpress.org/support/plugin/codecolorer/) . features requested [by ajtruckle on GitHub](https://github.com/EnlighterJS/Plugin.WordPress/issues/222)
88
* Added: filters to alter the editor config (Gutenberg+TinyMCE) - features requested [by ajtruckle on GitHub](https://github.com/EnlighterJS/Plugin.WordPress/issues/251)
9+
* Added: documentation how to use external themes (linked within contextual help)
10+
* Changed: external themes requires `enlighterjs` as css dependency to avoid styling issues
11+
* Changed: removed Enlighter version string from external themes
912
* Bugfix: added missing languages to the list (abap,scala,qml,verilog)
1013

1114
* Added: [apachehttpd/htaccess](https://httpd.apache.org/docs/2.4/configuring.html) support

‎build.xml

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,6 @@
2323
<tar destfile=".hidden/enlighter-beta.tar" basedir="dist/"/>
2424
</target>
2525

26-
<!-- Plugin Test - DEVELOPMENT ONLY -->
27-
<target name="devcopy" depends="dist">
28-
<!-- Credentials, Host Settings !-->
29-
<loadproperties srcFile=".credentials/account.conf" prefix="dev"/>
30-
31-
<!-- cleanup old plugin files !-->
32-
<echo message="Removing old plugin files [Single Site]"/>
33-
<sshexec host="${dev.host}" trust="true"
34-
username="${dev.user}"
35-
keyfile="${user.home}/${dev.keyfile}"
36-
port="${dev.port}"
37-
command="rm -rf ${dev.path}/*"
38-
/>
39-
40-
<!-- transfer deploy plugin !-->
41-
<echo message="Uploading files [Single Site]"/>
42-
<scp todir="${dev.user}@${dev.host}:${dev.path}" trust="true" port="${dev.port}" sftp="true"
43-
keyfile="${user.home}/${dev.keyfile}">
44-
<fileset dir="dist"/>
45-
</scp>
46-
</target>
47-
4826
<!-- GitHub readme + changes => WordPress transformation !-->
4927
<target name="readme">
5028
<!-- merge readme + changes !-->
@@ -79,7 +57,7 @@
7957

8058
<!-- Run Webserver !-->
8159
<exec executable="docker" failonerror="true">
82-
<arg line="run --name enlighter-test -p 8080:8080 --rm -e WP_DSN=${WP.DSN} -i enlighter-test"/>
60+
<arg line="run --name enlighter-test -p 8080:8080 --rm -e WP_DSN=${WP.DSN} -i -v ${basedir}/.wpcontent/themes:/srv/app/public/wp-content/themes enlighter-test"/>
8361
</exec>
8462
</target>
8563

‎modules/core/ThemeManager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function __construct(){
3333
public function enqueue(){
3434
// embed available external themes
3535
foreach ($this->getUserThemes() as $theme => $sources) {
36-
ResourceManager::enqueueStyle('enlighter-theme-' . strtolower($theme), $sources[1], array());
36+
ResourceManager::enqueueStyle('enlighter-theme-' . strtolower($theme), $sources[1], array('enlighterjs'), null);
3737
}
3838
}
3939

‎views/admin/about/Changelog.html

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
</li>
66
<li><p>Added: compatbility mode for <a href="https://wordpress.org/support/plugin/codecolorer/">CodeColorer</a> . features requested <a href="https://github.com/EnlighterJS/Plugin.WordPress/issues/222">by ajtruckle on GitHub</a></p>
77
</li>
8+
<li><p>Added: filters to alter the editor config (Gutenberg+TinyMCE) - features requested <a href="https://github.com/EnlighterJS/Plugin.WordPress/issues/251">by ajtruckle on GitHub</a></p>
9+
</li>
810
<li><p>Bugfix: added missing languages to the list (abap,scala,qml,verilog)</p>
911
</li>
1012
<li><p>Added: <a href="https://httpd.apache.org/docs/2.4/configuring.html">apachehttpd/htaccess</a> support</p>
@@ -23,12 +25,22 @@
2325
</li>
2426
</ul>
2527
<ul>
26-
<li>Added: option to customize the raw code pane</li>
27-
<li>Added: option to set the token base styles inlcuding font-size - feature requested <a href="https://github.com/EnlighterJS/Plugin.ThemeCustomizer/issues/6">on GitHub</a></li>
28-
<li>Added: option to set button background-color and line-height</li>
29-
<li>Added: tab <code>defaults</code> to change global settings</li>
30-
<li>Changed: moved button related settings to tab <code>buttons</code></li>
31-
<li>Changed: moved line-number settings to tab <code>lines</code></li>
32-
<li>Changed: removed tab &quot;fonts&quot;</li>
33-
<li>Bugfix: highlighted-line hover selector was invalid -&gt; selection of <code>background-color:hover</code> was not possible - thanks to <a href="https://github.com/EnlighterJS/Plugin.ThemeCustomizer/issues/4">ajtruckle on GitHub</a> #4</li>
28+
<li><p>Added: option to customize the raw code pane</p>
29+
</li>
30+
<li><p>Added: option to set the token base styles inlcuding font-size - feature requested <a href="https://github.com/EnlighterJS/Plugin.ThemeCustomizer/issues/6">on GitHub</a></p>
31+
</li>
32+
<li><p>Added: option to set button background-color and line-height</p>
33+
</li>
34+
<li><p>Added: tab <code>defaults</code> to change global settings</p>
35+
</li>
36+
<li><p>Changed: moved button related settings to tab <code>buttons</code></p>
37+
</li>
38+
<li><p>Changed: moved line-number settings to tab <code>lines</code></p>
39+
</li>
40+
<li><p>Changed: removed tab &quot;fonts&quot;</p>
41+
</li>
42+
<li><p>Bugfix: highlighted-line hover selector was invalid -&gt; selection of <code>background-color:hover</code> was not possible - thanks to <a href="https://github.com/EnlighterJS/Plugin.ThemeCustomizer/issues/4">ajtruckle on GitHub</a> #4</p>
43+
</li>
44+
<li><p>Bugfix: removed typos in code edit dialog - thanks to <a href="https://github.com/EnlighterJS/Plugin.TinyMCE/issues/10">ajtruckle on GitHub</a></p>
45+
</li>
3446
</ul>

‎views/contextualhelp/externalthemes.en_EN.phtml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<p>You can use your own <a href="https://enlighterjs.org">EnlighterJS</a> Themes by uploading them into a directory named <code>enlighter/</code> within your theme (you have to create it by your own).<br />
2-
Please pay attention to the different types:</p>
2+
The full documentation about external themes is <a href="https://github.com/EnlighterJS/documentation/blob/master/wordpress/ExternalThemes.md">available here.</a></p>
3+
4+
<p>Please pay attention to the different theme types:</p>
35

46
<hr />
57
<p><strong>Type 1: Public/Payed WordPress Themes</strong></p>

0 commit comments

Comments
 (0)