Merge branch 'develop' into UAT

Author: Marco Pereirinha

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/cloudinary.php

@@ -3,7 +3,7 @@
  * Plugin Name: Cloudinary
  * Plugin URI: https://cloudinary.com/documentation/wordpress_integration
  * Description: With the Cloudinary plugin, you can upload and manage your media assets in the cloud, then deliver them to your users through a fast content delivery network, improving your website’s loading speed and overall user experience. Apply multiple transformations and take advantage of a full digital asset management solution without leaving WordPress.
- * Version: 2.1.1
+ * Version: 2.1.4
  * Author:  Cloudinary Ltd., XWP
  * Author URI: https://cloudinary.com/
  * License: GPLv2+

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/css/cloudinary.css

@@ -3,5 +3,5 @@ $color-green : #558b2f;
 $color-red : #dd2c00;
 $color-light-grey : #e5e5e5;
 $color-white : #ffffff;
-$color-blue : #0078ff;
+$color-blue : #0071ba;
 $color-orange : #fd9d2c;

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/css/cloudinary.svg

@@ -1,10 +1,10 @@
 @font-face {
 	font-family : 'cloudinary';
-	src         : url('fonts/cloudinary.eot?fj77m5');
-	src         : url('fonts/cloudinary.eot?fj77m5#iefix') format('embedded-opentype'),
-	url('fonts/cloudinary.ttf?fj77m5') format('truetype'),
-	url('fonts/cloudinary.woff?fj77m5') format('woff'),
-	url('fonts/cloudinary.svg?fj77m5#cloudinary') format('svg');
+	src         : url('fonts/cloudinary.eot?xr4567gh');
+	src         : url('fonts/cloudinary.eot?xr4567gh#iefix') format('embedded-opentype'),
+	url('fonts/cloudinary.ttf?xr4567gh') format('truetype'),
+	url('fonts/cloudinary.woff?xr4567gh') format('woff'),
+	url('fonts/cloudinary.svg?xr4567gh#cloudinary') format('svg');
 	font-weight : normal;
 	font-style  : normal;
 }
@@ -48,12 +48,20 @@
 			}
 		}
 
-		&.warning {
-			color : $color-orange;
+		&.info {
+			color : $color-blue;
 		}
 
-		&.warning {
-			color : $color-orange;
+		&.downloading {
+			&:before {
+				content: '\e903';
+			}
+		}
+
+		&.syncing {
+			&:before {
+				content: '\e904';
+			}
 		}
 	}
 }

cloudinary-image-management-and-manipulation-in-the-cloud-cdn/css/fonts/cloudinary.eot

@@ -208,3 +208,12 @@
 		}
 	}
 }
+
+.settings-warning {
+	display: inline-block;
+	padding: 5px 7px;
+	background-color: #e9faff;
+	border: 1px solid #ccd0d4;
+	border-left: 4px solid #00a0d2;
+	box-shadow: 0 1px 1px rgba(0,0,0,.04);
+}