Rumperuu/footnotes
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Squash merge branch linting

Browse source
This commit is contained in:
Ben Goldsworthy 2021-04-26 17:15:48 +01:00
parent 0c7c0d155b
commit c8950e6d1a
35 changed files with 15883 additions and 1769 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/includes/class-footnotes.php
View file

@ -258,7 +258,11 @@ class Footnotes {
*/
wp_enqueue_script(
'mci-footnotes-jquery-tools',
<<<<<<< HEAD:src/includes/class-footnotes.php
plugins_url( 'footnotes/public/js/jquery.tools.min.js' ),
=======
plugins_url( 'footnotes/js/jquery.tools' . ( ( PRODUCTION_ENV ) ? '.min' : '' ) . '.js' ),
>>>>>>> linting:src/class/init.php
array(),
'1.2.7.redacted.2',
false
@ -402,7 +406,7 @@ class Footnotes {
* Enqueues external stylesheets, ONLY in development now.
*
* @since 2.1.4 optionally enqueue an extra stylesheet.
*
*
* This optional layout fix is useful by lack of layout support.
*/
wp_enqueue_style(