Merge branch 'branch-1.9'

wp-media · May 6, 2019 · 1f27c54 · 1f27c54
2 parents 8359d58 + cf02bc9
commit 1f27c54
Show file tree

Hide file tree

Showing 198 changed files with 25,296 additions and 11,140 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 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.
+After enabling it, all your images including thumbnails will be automatically optimized when uploaded into WordPress. You can also use Imagify to convert and serve WebP images for free.
 
 WooCommerce and NextGen Gallery compatible.
 
@@ -44,7 +44,7 @@ With the backup option, you can change your mind whenever you want by restoring
 
 ## 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.
+You can optimize for free 25MB of images (about 250 images) every month. Converting to WebP is free.
 
 Need more? Have a look at our plans: [https://imagify.io/pricing](https://imagify.io/pricing).
 

diff --git a/assets/css/admin.css b/assets/css/admin.css
@@ -621,8 +621,18 @@ button.imagify-link-like {
 .imagify-settings-main-content {
 	padding-bottom: 20px;
 }
-.imagify-settings-main-content p {
+.imagify-settings-main-content p,
+.imagify-settings-main-content .imagify-setting-line {
 	font-size: 14px;
+	line-height: 1.5;
+}
+
+.imagify-settings-main-content .code {
+	max-height: 10em;
+	padding: 3px 5px 2px 5px;
+	overflow: auto;
+	background: #EAEAEA;
+	background: rgba(0,0,0,.07);
 }
 
 .imagify-settings-main-content + .imagify-settings-main-content {
@@ -1219,6 +1229,10 @@ ul.imagify-datas-details.imagify-datas-details {
 	width: auto;
 	float: none;
 }
+.media-sidebar .compat-field-imagify .imagify-datas-actions-links br,
+.submitbox .misc-pub-imagify .imagify-datas-actions-links br {
+	display: none;
+}
 .imagify-datas-actions-links a:only-child {
 	float: none;
 	width: auto;

diff --git a/assets/css/admin.min.css b/assets/css/admin.min.css
diff --git a/assets/css/bulk.css b/assets/css/bulk.css
@@ -613,10 +613,10 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 }
 
 /* Custom Level Optimization Select */
-.imagify-level-selector {
+.imagify-selector {
 	position: relative;
 }
-.imagify-level-selector-list {
+.imagify-selector-list {
 	background: #FFF;
 	border: 1px solid #F4F7F9;
 	box-shadow: 0 6px 12px rgba(0, 0, 0, .1);
@@ -625,79 +625,79 @@ body[class*="_imagify-ngg-bulk-optimization"] .media-item .progress .bar {
 	text-transform: uppercase;
 	letter-spacing: .02em;
 }
-.imagify-level-selector-list li:first-child label {
+.imagify-selector-list li:first-child label {
 	border-radius: 3px 3px 0 0;
 }
-.imagify-level-selector-list li:last-child label {
+.imagify-selector-list li:last-child label {
 	border-radius: 0 0 3px 3px;
 }
-.imagify-level-selector-list li {
+.imagify-selector-list li {
 	margin: 0;
 }
-.imagify-level-selector-list li + li {
+.imagify-selector-list li + li {
 	border-top: 1px solid #F4F7F9;
 }
-.imagify-level-selector-list svg {
+.imagify-selector-list svg {
 	margin-right: 5px;
 }
-.imagify-level-selector-list input:checked + label,
-.imagify-level-selector-list .imagify-current-level label {
+.imagify-selector-list input:checked + label,
+.imagify-selector-list .imagify-selector-current-value label {
 	background: #343A49;
 	color: #FFF;
 }
-.imagify-level-selector-list input:checked + label:hover,
-.imagify-level-selector-list .imagify-current-level label:hover,
-.imagify-level-selector-list label:hover,
-.imagify-level-selector-list input:focus + label,
-.imagify-level-selector-list .imagify-current-level input:focus + label {
+.imagify-selector-list input:checked + label:hover,
+.imagify-selector-list .imagify-selector-current-value label:hover,
+.imagify-selector-list label:hover,
+.imagify-selector-list input:focus + label,
+.imagify-selector-list .imagify-selector-current-value input:focus + label {
 	background: #40B1D0;
 	color: #F4F7F9;
 }
-.imagify-level-selector-list input:checked + label:hover polygon,
-.imagify-level-selector-list .imagify-current-level label:hover polygon,
-.imagify-level-selector-list label:hover polygon,
-.imagify-level-selector-list input:focus + label polygon,
-.imagify-level-selector-list .imagify-current-level input:focus + label polygon {
+.imagify-selector-list input:checked + label:hover polygon,
+.imagify-selector-list .imagify-selector-current-value label:hover polygon,
+.imagify-selector-list label:hover polygon,
+.imagify-selector-list input:focus + label polygon,
+.imagify-selector-list .imagify-selector-current-value input:focus + label polygon {
 	fill: #FFF;
 }
-.imagify-level-selector-list input:checked + label:hover polygon[fill="#CCD1D6"],
-.imagify-level-selector-list .imagify-current-level label:hover polygon[fill="#CCD1D6"],
-.imagify-level-selector-list label:hover polygon[fill="#CCD1D6"],
-.imagify-level-selector-list input:focus + label polygon[fill="#CCD1D6"],
-.imagify-level-selector-list .imagify-current-level input:focus + label polygon[fill="#CCD1D6"] {
+.imagify-selector-list input:checked + label:hover polygon[fill="#CCD1D6"],
+.imagify-selector-list .imagify-selector-current-value label:hover polygon[fill="#CCD1D6"],
+.imagify-selector-list label:hover polygon[fill="#CCD1D6"],
+.imagify-selector-list input:focus + label polygon[fill="#CCD1D6"],
+.imagify-selector-list .imagify-selector-current-value input:focus + label polygon[fill="#CCD1D6"] {
 	fill: #3694AE;
 }
-.imagify-level-selector-list li label {
+.imagify-selector-list li label {
 	display: block;
 	padding: 10px;
 	transition: all .275s;
 }
-.imagify-level-selector-list polygon {
+.imagify-selector-list polygon {
 	transition: all .275s;
 }
-.imagify-level-selector-list {
+.imagify-selector-list {
 	position: absolute;
 	top: 0;
 	left: 0;
 	right: 0;
 	transition: all .275s;
 	transform: translateY(-50%);
 }
-.imagify-level-selector-list[aria-hidden="true"] {
+.imagify-selector-list[aria-hidden="true"] {
 	opacity: 0;
 	visibility: hidden;
 	transform: translateY(-50%) scale(0);
 }
-.imagify-level-selector-list[aria-hidden="false"] {
+.imagify-selector-list[aria-hidden="false"] {
 	opacity: 1;
 	visibility: visible;
 	transform: translateY(-50%) scale(1);
 }
-.button .imagify-current-level-info {
+.button .imagify-selector-current-value-info {
 	position: relative;
 	padding-right: 20px;
 }
-.button .imagify-current-level-info:after {
+.button .imagify-selector-current-value-info:after {
 	content: '';
 	position: absolute;
 	right: 0;
@@ -866,29 +866,29 @@ td.imagify-cell-title {
 	padding-left: 0;
 }
 .imagify-cell-title label,
-.imagify-cell-original .imagify-cell-label {
+.imagify-cell-original-size .imagify-cell-label {
 	color: #1F2332;
 }
-.imagify-cell-optimized,
-.imagify-cell-original {
+.imagify-cell-optimized-size,
+.imagify-cell-original-size {
 	font-weight: 500;
 	color: #7A8996;
 	font-size: 12px;
 }
-.imagify-cell-optimized .imagify-cell-label {
+.imagify-cell-optimized-size .imagify-cell-label {
 	color: #338EA6;
 }
-.imagify-cell-images-optimized {
+.imagify-cell-count-optimized {
 	font-size: 14px;
 	font-weight: bold;
 	color: #338EA6;
 }
-.imagify-cell-errors {
+.imagify-cell-count-errors {
 	color: #C51162;
 	font-weight: bold;
 	font-size: 14px;
 }
-.imagify-cell-errors a {
+.imagify-cell-count-errors a {
 	margin-left: 5px;
 	color: #7A8996;
 	font-weight: normal;
@@ -929,12 +929,12 @@ td.imagify-cell-filename {
 .imagify-cell-level {
 	width: 145px;
 }
-.imagify-level-selector-button.imagify-level-selector-button {
+.imagify-selector-button.imagify-selector-button {
 	border: 1px solid #FFF;
 	padding: 2px 10px;
 }
-.imagify-level-selector-button.imagify-level-selector-button:hover,
-.imagify-level-selector-button.imagify-level-selector-button:focus {
+.imagify-selector-button.imagify-selector-button:hover,
+.imagify-selector-button.imagify-selector-button:focus {
 	border-color: #EEE;
 	box-shadow: 0 4px 8px rgba(0,0,0,.1);
 }
@@ -1074,13 +1074,13 @@ td.imagify-cell-filename {
 		width: calc(100% - 96px);
 	}
 	.imagify-cell-title:after,
-	.imagify-cell-images-optimized:before {
+	.imagify-cell-count-optimized:before {
 		content: '';
 		display: table;
 		clear: both;
 		width: 100%;
 	}
-	.imagify-cell-images-optimized {
+	.imagify-cell-count-optimized {
 		clear: both;
 	}
 

diff --git a/assets/css/bulk.min.css b/assets/css/bulk.min.css
diff --git a/assets/css/options.css b/assets/css/options.css
@@ -114,6 +114,7 @@ p.imagify-api-key-invite-title {
 .imagify-setting-line {
 	border-top: 1px solid #D2D3D6;
 	padding: 25px 0 13px;
+	margin: 1em 0;
 }
 .imagify-options-subtitle + .imagify-setting-line {
 	border-top: 0;
@@ -241,7 +242,7 @@ label + .imagify-info,
 	margin-left: 38px;
 	padding-right: 25px;
 }
-label + .imagify-options-line {
+label ~ .imagify-options-line {
 	display: block;
 	margin: 8px 0 20px 40px;
 	font-size: 14px;
@@ -254,18 +255,21 @@ label + .imagify-options-line {
 label + .imagify-info {
 	margin-top: 10px;
 }
+.imagify-options-line + .imagify-info + .imagify-options-line {
+	margin-top: 20px;
+}
 .imagify-visual-label {
 	vertical-align: -5px;
 }
 label[for="imagify_sizes_full"] + .imagify-info {
 	vertical-align: middle;
 }
 
-.imagify-settings.imagify-settings [type="checkbox"]:not(:checked) + label + .imagify-options-line,
+.imagify-settings.imagify-settings [type="checkbox"]:not(:checked) + label ~ .imagify-options-line,
 .imagify-settings.imagify-settings [type="checkbox"]:not(:checked) + label .imagify-visual-label {
 	opacity: .5;
 }
-.imagify-settings.imagify-settings [type="checkbox"]:checked + label + .imagify-options-line,
+.imagify-settings.imagify-settings [type="checkbox"]:checked + label ~ .imagify-options-line,
 .imagify-settings.imagify-settings [type="checkbox"]:checked + label .imagify-visual-label {
 	opacity: 1;
 }
@@ -500,14 +504,14 @@ label[for="imagify_partner_links"] {
 	justify-content: space-between;
 	font-weight: bold;
 }
-.imagify-kindof-title .imagify-button-primary {
+.imagify-settings .imagify-button-mini {
 	padding: 4px 13px 4px 10px;
 }
-.imagify-kindof-title .imagify-button-primary .dashicons {
+.imagify-settings .imagify-button-mini .dashicons-plus {
 	vertical-align: -7.5px;
 }
-.imagify-kindof-title .imagify-button-primary:hover,
-.imagify-kindof-title .imagify-button-primary:focus {
+.imagify-settings .imagify-button-mini.imagify-button-primary:hover,
+.imagify-settings .imagify-button-mini.imagify-button-primary:focus {
 	color: #FFF;
 }
 
@@ -568,6 +572,56 @@ p.imagify-custom-folder-line {
 	opacity: 1;
 }
 
+/* Progress bar */
+.imagify-settings .progress {
+	height: 8px;
+	margin-top: 1em;
+	background: #343A49;
+}
+.imagify-settings .bar {
+	position: relative;
+	width: 1px;
+	height: 8px;
+	background: #46B1CE;
+	-webkit-transition: width .5s;
+	transition: width .5s;
+}
+.imagify-settings .percent {
+	position: absolute;
+	top: 6px;
+	right: 0;
+	padding: 0 5px;
+	line-height: 1.85;
+	font-size: 14px;
+	font-weight: bold;
+	color: #40B1D0;
+}
+
+/* Icon rotation */
+.dashicons.rotate {
+	-webkit-animation: icon-rotate 2.6s infinite linear;
+	animation: icon-rotate 2.6s infinite linear;
+}
+
+@-webkit-keyframes icon-rotate {
+	from {
+		-webkit-transform: rotate(0deg);
+		transform: rotate(0deg);
+	}
+	to {
+		-webkit-transform: rotate(360deg);
+		transform: rotate(360deg);
+	}
+}
+@keyframes icon-rotate {
+	from {
+		transform: rotate(0deg);
+	}
+	to {
+		transform: rotate(360deg);
+	}
+}
+
 /* Files tree Part */
 .imagify-add-custom-folder + .imagify-loader {
 	display: none;