Skip to content

Commit

Permalink
Merge pull request #27 from ilovepdf/develop
Browse files Browse the repository at this point in the history
v2.0.5
  • Loading branch information
diegocrombie authored Mar 7, 2024
2 parents 8d99f22 + 6850e97 commit f2a03af
Show file tree
Hide file tree
Showing 23 changed files with 1,865 additions and 1,652 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
=== PDF Compressor & Watermark - iLovePDF ===
Plugin Name: Image Compressor & Optimizer - iLovePDF
Version: 2.0.4
Version: 2.0.5
Author: iLovePDF
Author URI: https://www.ilovepdf.com/
Contributors: iLovePDF
Tags: compress, watermark, optimize, performance, pdf optimizer
Requires at least: 5.3
Tested up to: 6.4.1
Stable tag: 2.0.4
Tested up to: 6.4.3
Stable tag: 2.0.5
Requires PHP: 7.4
License: GPLv2 or later
License URI: https://www.gnu.org/licenses/gpl-2.0.html
Expand Down
11 changes: 8 additions & 3 deletions README.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
=== PDF Compressor & Watermark - iLovePDF ===
Plugin Name: Image Compressor & Optimizer - iLovePDF
Version: 2.0.4
Version: 2.0.5
Author: iLovePDF
Author URI: https://www.ilovepdf.com/
Contributors: iLovePDF
Tags: compress, watermark, optimize, performance, pdf optimizer
Requires at least: 5.3
Tested up to: 6.4.1
Stable tag: 2.0.4
Tested up to: 6.4.3
Stable tag: 2.0.5
Requires PHP: 7.4
License: GPLv2 or later
License URI: https://www.gnu.org/licenses/gpl-2.0.html
Expand Down Expand Up @@ -82,6 +82,11 @@ We will send you an email before limit is reached. When limit is reached, no mor

== Changelog ==

== 2.0.5 ==
Improved
* Update Libraries.
* Assets.

== 2.0.4 ==
Fixed
* Compatibility issue with the Woocommerce plugin.
Expand Down
9 changes: 6 additions & 3 deletions admin/Ilove_Pdf_Admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@ public function enqueue_styles() {
global $pagenow;

if ( ( 'upload.php' === $pagenow || 'options-general.php' === $pagenow || 'media-new.php' === $pagenow || 'post.php' === $pagenow ) && get_current_screen()->post_type !== 'product' ) {
wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/ilove-pdf-admin.css', array(), $this->version, 'all' );
wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/grid.css', array(), $this->version, 'all' );
wp_enqueue_style( $this->plugin_name, plugins_url( '/assets/css/app.min.css', __DIR__ ), array(), $this->version, 'all' );
}

wp_enqueue_style( 'font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', array(), '4.7.0' );
Expand All @@ -101,6 +100,10 @@ public function enqueue_scripts() {
* class.
*/

wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/ilove-pdf-admin.js', array( 'jquery' ), $this->version, false );
// Add the color picker css file
wp_enqueue_style( 'wp-color-picker' );

// Include our custom jQuery file with WordPress Color Picker dependency
wp_enqueue_script( 'ilove-pdf-admin', plugins_url( '/assets/js/main.min.js', __DIR__ ), array( 'wp-color-picker' ), '1.0.0', true );
}
}
321 changes: 0 additions & 321 deletions admin/css/_ilove-pdf-admin.css

This file was deleted.

Loading

0 comments on commit f2a03af

Please sign in to comment.