Hotfix: fixed conflicts.

README.md

@@ -0,0 +1,111 @@
+# Imagify Image Optimizer
+
+Dramatically reduce image file sizes without losing quality, make your website load faster, boost your SEO and save money on your bandwidth.
+
+Imagify is the most advanced image compression tool, you can now use this power directly in WordPress.
+After enabling it all your images including thumbnails and retina images from WP Retina x2 will be automatically optimized on the fly when you will add in into WordPress.
+
+WooCommerce and NextGen Gallery compatible.
+
+![Bulk Optimization](https://ps.w.org/imagify/assets/screenshot-1.png "Bulk Optimization")
+
+![Settings Page](https://ps.w.org/imagify/assets/screenshot-2.png "Settings Page")
+
+![Media Page](https://ps.w.org/imagify/assets/screenshot-3.png "Media Page")
+
+## What is Image Compression?
+
+Learn more about image compression, check that: [https://imagify.io/images-compression](https://imagify.io/images-compression).
+
+## Why use Imagify to optimize your images?
+
+You already have lots of unoptimized images? Not a problem, you will love the Bulk Optimizer to optimize all your existing images in one click.
+
+Imagify can directly resize your images, **you won't have to lose time anymore on resizing your images before uploading them**.
+
+Three level of compression are available:
+
+- Normal, a lossless compression algorithm. The image quality won't be altered at all.
+- Aggressive, a lossy compression algorithm. Stronger compression with a tiny loss of quality most of the time this is not even noticeable at all.
+- Ultra, our strongest compression method using a lossy algorithm.
+
+With the backup option, you can change your mind whenever you want by restoring your images to their original version or optimize them to another compression level.
+
+## What our users think of Imagify?
+
+> "Imagify is an awesome tool that is powerful & easy to use. It's fast, rivals and surpasses other established plugins/software. Awesome!" — [Simon Harper](https://twitter.com/SRHDesign/status/663758140505235456)
+>
+> "If you want to "squeeze" your images as much as possible and "trim out" your website on the highest professional level... Imagify" — [Ivica Delic](https://twitter.com/Free_LanceTools/status/685503950909476865)
+>
+> "Clearly Imagify is the most awesome WordPress plugin to compress images on your website! A must try" — [Eric Walter](https://twitter.com/EricWaltR/status/679053496382038016)
+>
+
+## Is Imagify Free?
+
+You can optimize for free 25MB of images (about 250 images) every month and you will receive a 25MB bonus upon registration.
+
+Need more? Have a look at our plans: [https://imagify.io/pricing](https://imagify.io/pricing).
+
+## What's next?
+
+Have a look at our upcoming features by following our development roadmap: [https://trello.com/b/3Q8ZnSN6/imagify-roadmap](https://trello.com/b/3Q8ZnSN6/imagify-roadmap).
+
+## Who we are?
+
+We are [WP Media](https://wp-media.me/), the startup behind WP Rocket the best caching plugin for WordPress.
+
+Our mission is to improve the web, we are making it faster with [WP Rocket](https://wp-rocket.me/) we want to make it lighter with Imagify.
+
+## Get in touch!
+
+* Website: [Imagify.io](https://imagify.io)
+* Contact Us: [https://imagify.io/contact](https://imagify.io/contact)
+* Twitter: [https://twitter.com/imagify](https://twitter.com/imagify)
+
+## Related Plugins
+* [WP Rocket](https://wp-rocket.me/): Best caching plugin to speed-up your WordPress website.
+* [Rocket Lazy Load](https://wordpress.org/plugins/rocket-lazy-load/): Best Lazy Load script to reduce the number of HTTP requests and improves the websites loading time.
+
+License: [GPLv2 or later](http://www.gnu.org/licenses/gpl-2.0.html).
+
+## Frequently Asked Questions
+
+### Which formats can be optimized?
+
+Imagify can optimize jpg, png and gif (whether animated or not) formats.
+
+### Can I use the plugin with a free account?
+
+Absolutely. You are limited to a quota of 25 MB of images per month with a free account. Once this quota is reached, you cannot optimize new images until your quota is renewed or you purchase credits.
+
+### On how many websites can I use the plugin?
+
+You can use the plugin on as many sites as you wish. The only limit is the optimization quota of your account.
+
+### I used Kraken, Shortpixel, Optimus, EWWW or WP Smush, will Imagify further optimize my images?
+
+Absolutely. Most of the time, Imagify will still be able to optimize your images even if you have already compressed them with another tool.
+
+### What is the difference between the Normal, Aggressive and Ultra compression levels?
+
+Normal compression is a "lossless" optimization. This means there is no loss of image quality. Aggressive and Ultra compression are more powerful, so the picture quality will be somewhat reduced. The weight of the image will be much less.
+
+### Is the EXIF data of images removes?
+
+By default EXIF data is removed. It is however possible to keep it by enabling the option.
+
+### Will the original images be deleted?
+
+No. Imagify automatically replaces the images with an optimized image. The backup option allows you to keep the original images and restore them with one click.
+
+### Is it possible to re-optimize images with a different level?
+
+Yes. By activating the backup option in the plugin, you can re-optimize each image with a different compression level.
+
+### If I use Imagify, do I need to continue optimizing and resizing my images with Photoshop?
+
+Do not waste your time resizing and optimizing your images in Photoshop. Imagify takes care of everything!
+
+### What happens when the plugin is disabled?
+
+When the plugin is disabled, your existing images remain optimized. Backups of the original images are still available if you have enabled the images backup option.

assets/css/admin.css

@@ -132,34 +132,18 @@ body.imagify-modal-is-open {
 
 /* Doughnut */
 .imagify-chart {
-	width: 33.33%;
 	position: relative;
+	top: 1px;
+	display: inline-block;
+	vertical-align: middle;
 }
-
-.imagify-chart {
-	float: left;
-	margin-bottom: 20px;
-}
-
 .imagify-chart-container {
 	position: relative;
-	width: 180px;
-	float: left;
-	margin-right: 20px;
-}
-
-/* On library page */
-td .imagify-chart {
-	top: 4px;
-	float: none;
-	margin-bottom: 0;
+	display: inline-block;
+	margin-right: 5px;
 }
-
-td .imagify-chart-container {
-	width: 18px;
-	height: 18px;
-	float: none;
-	margin-right: 10px;
+.imagify-chart-container canvas {
+	display: block;
 }
 
 /**
@@ -779,13 +763,6 @@ ul.imagify-datas-list .big {
 .imagify-data-item {
 	overflow: hidden;
 }
-.imagify-data-item .imagify-chart {
-	display: inline-block;
-	top: 1px;
-	width: 20px;
-	vertical-align: middle;
-	margin-bottom: 0;
-}
 li.imagify-data-item {
 	clear: both;
 	margin-bottom: 2px;
@@ -816,9 +793,13 @@ ul.imagify-datas-list .imagify-data-item strong {
 	float: none;
 }
 .media-sidebar .imagify-datas-list .imagify-data-item strong {
+	display: inline-block;
 	width: auto;
 	float: none;
 }
+.media-sidebar .imagify-datas-list .imagify-data-item .imagify-chart {
+	float: left;
+}
 .imagify-datas-more-action.imagify-datas-more-action {
 	margin: .4em auto;
 	background: linear-gradient(to bottom, transparent, transparent 49%, rgba(0,0,0,.075) 50%, rgba(0,0,0,.075) 58%, transparent 58%, transparent);

assets/css/bulk.css

@@ -45,11 +45,16 @@
 	color: #46b1ce;
 }
 
+.imagify-overview-chart-container {
+	float: left;
+	margin-right: 20px;
+}
 .imagify-chart-percent {
 	position: absolute;
 	left: 0; right: 0;
 	top: 50%;
-	margin-top: -14px;
+	margin-top: -.5em;
+	line-height: 1;
 	text-align: center;
 	font-size: 55px;
 	font-weight: bold;
@@ -751,4 +756,4 @@ td.imagify-cell-filename {
 	to {
 		transform: rotate(360deg);
 	}
-}
+}

assets/css/twentytwenty.css

@@ -254,22 +254,11 @@
 	margin: 15px 0;
 	overflow: hidden;
 }
-.imagify-comparison-levels div {
+.imagify-comparison-levels .imagify-c-level {
 	display: none;
 	min-width: 175px;
 	font-size: 11px;
 }
-.imagify-comparison-levels .imagify-chart,
-.imagify-comparison-levels .imagify-chart-container {
-	width: 25px;
-	float: none;
-	margin: 0;
-}
-.imagify-visual-comparison .imagify-chart-container canvas {
-	width: 15px!important;
-	height: 15px!important;
-	margin-right: 5px;
-}
 .imagify-c-level.go-left {
 	float: left;
 }
@@ -300,9 +289,6 @@
 	color: #8bc34a;
 	font-weight: bold;
 }
-.imagify-c-level-row .value .imagify-chart {
-	top: 1px;
-}
 
 /* TT Loader */
 .imagify-modal .loader {