Merge pull request #380 from mailjet/DE-1341-update-mailjet-word-pres…

…s-plugin-to-match-mailjet-current-branding

Branding update

README.md

@@ -4,7 +4,7 @@
 - Tags: email, marketing, signup, newsletter, widget, smtp, woocommerce, contact form 7
 - Requires at least: 4.4
 - Tested up to: 6.6.2
-- Stable tag: 6.1.2
+- Stable tag: 6.1.3
 - Requires PHP: 7.4
 - License: GPLv2 or later
 - License URI: http://www.gnu.org/licenses/gpl-2.0.html

readme.txt

@@ -4,7 +4,7 @@
 - Tags: email, marketing, signup, newsletter, widget, smtp, woocommerce, contact form 7
 - Requires at least: 4.4
 - Tested up to: 6.6.2
-- Stable tag: 6.1.2
+- Stable tag: 6.1.3
 - Requires PHP: 7.4
 - License: GPLv2 or later
 - License URI: http://www.gnu.org/licenses/gpl-2.0.html

src/admin/css/mailjet-admin.css

@@ -23,19 +23,20 @@
 }
 
 .mj-pluginPage a {
-    text-decoration: none;
-    color: #19BC9C;
+    color:#195A6A;
+    text-decoration: underline;
 }
 
 .mj-pluginPage a:hover,
 .mj-pluginPage a:focus {
+    color:#377386;
     text-decoration: underline;
-    color: #33D6B6;
 }
 
 .mj-pluginPage a:focus {
-    outline: 0;
-    box-shadow: none;
+    color:#377386;
+    text-decoration: underline;
+    box-shadow: rgb(151, 192, 204) 0px 0px 1px 2px;
 }
 
 .mj-pluginPage a:visited {
@@ -66,7 +67,6 @@
 }
 
 .mj-pluginPage input[type="text"] {
-    /*width: 100%;*/
     max-width: 98%;
     height: 36px;
     margin-bottom: 16px;
@@ -86,7 +86,7 @@
 }
 
 .mj-pluginPage input[type="text"]:focus {
-    border-color: #19BC9C;
+    border-color:#195A6A;
 }
 
 ::-webkit-input-placeholder {
@@ -217,7 +217,7 @@
 }
 
 .mj-select-wrapper.mj-select-focus:before {
-    border-color: #19BC9C;
+    border-color:#195A6A;
 }
 
 .mj-select-wrapper select {
@@ -264,32 +264,31 @@
 .mj-pluginPage .btnPrimary:hover,
 .mj-pluginPage .button.btnPrimary,
 .mj-pluginPage .button.btnPrimary:hover {
-    border-color: transparent;
-    color: white;
-    background-color: #FEAD0D;
+    background-color:#195A6A;
+    color: #fff;
 }
 
 .mj-pluginPage .btnPrimary:hover,
 .mj-pluginPage .button.btnPrimary:hover {
-    background-color: #FFBA1A;
+    background-color:#2F6779;
 }
 
 .mj-pluginPage .btnPrimary:focus,
 .mj-pluginPage .btnPrimary:active,
 .mj-pluginPage .button.btnPrimary:focus,
 .mj-pluginPage .button.btnPrimary:active {
-    background-color: #F1A000;
+    background-color:#2F6779;
+    box-shadow: rgb(151, 192, 204) 0px 0px 1px 2px;
 }
 
 .mj-pluginPage .btnSecondary,
 .mj-pluginPage .button.btnSecondary {
-    color: #FEAD0D;
-    border-color: currentColor;
+    color: #195A6A;
 }
 
 .mj-pluginPage .btnSecondary:hover, .btnSecondary:active, .btnSecondary:focus,
 .mj-pluginPage .button.btnSecondary:hover, .button.btnSecondary:active, .button.btnSecondary:focus {
-    background-color: rgba(254, 173, 13, 0.1);
+    background-color:rgba(0,0,0,0.05);
 }
 
 .mj-pluginPage .btnCancel,
@@ -473,16 +472,14 @@
 }
 
 .mailjet_row input[type="checkbox"]:focus {
-    border: 1px solid #19BC9C;
+    border: 1px solid #195A6A;
     background: #FFFFFF;
     outline: none;
 }
 
 .mailjet_row input[type="checkbox"]:checked {
-    border: 1px solid #19BC9C;
-    background: #33D6B6;
-    text-align: center;
-    font-weight: bold;
+    background:#195A6A;
+    border: 1px solid #195A6A;
 }
 
 /*#wpbody-content {
@@ -665,7 +662,8 @@
     padding: 0;
     margin: 0;
     border: none;
-    color: #19BC9C;
+    color:#195A6A;
+    text-decoration: underline;
     background: transparent;
     outline: 0;
     cursor: pointer;
@@ -739,18 +737,19 @@
 
 .bottom_links a:hover,
 .bottom_links a:focus {
-    color: #33D6B6;
+    color:#377386;
+    text-decoration: underline;
 }
 
 .settingsMenuLink a {
     display: flex;
     align-items: center;
     height: 40px;
     line-height: 24px;
-    /*padding: 8px;*/
     font-size: 16px;
     font-weight: 500;
     color: #555;
+    padding-left:8px;
 }
 
 .settingsMenuLink a svg {
@@ -762,8 +761,9 @@
 .settingsMenuLink a:active,
 .settingsMenuLink a:focus {
     text-decoration: none;
-    color: #555;
     outline: 0;
+    border-radius:3px;
+    color: #555555;
 }
 
 .settingsMenuLink a:not(.active):hover,
@@ -780,7 +780,7 @@
 }
 
 .settingsMenuLink a.active {
-    color: #19BC9C;
+    color:#2F6779;
 }
 
 #mailjet_subscription_options_settings {
@@ -835,7 +835,7 @@
     align-items: center;
     line-height: 20px;
     text-decoration: none;
-    color: #19BC9C;
+    color: #377386;
     cursor: pointer;
 }
 
@@ -861,7 +861,7 @@
 }
 
 .greenLink {
-    color: #19BC9C;
+    color: #377386;
     text-decoration: none;
 }
 
@@ -994,13 +994,13 @@
     height: 36px;
     border: 1px solid #c1c1c1;
     border-radius: 3px;
-    color: #FFF;
     font-size: 14px;
     font-weight: 500;
     line-height: 20px;
     text-align: center;
     margin-left: 10px;
-    color: #FCB340;
+    text-decoration: none;
+    color:#555555;
 }
 
 .activate_mailjet_sync_field {
@@ -1217,11 +1217,7 @@
 }
 
 input:checked + .mj-slider {
-    background-color: #19BC9C;
-}
-
-input:focus + .mj-slider {
-    box-shadow: 0 0 1px #19BC9C;
+    background-color:#195A6A;
 }
 
 input:checked + .mj-slider:before {
@@ -1359,12 +1355,15 @@ input:checked + .mj-slider:before {
 
 #mj-settings_top_bar {
     margin-right: 35px;
-    color: #19BC9C;
+    color: #195A6A;
     cursor: pointer;
     display: flex;
     align-items: center;
     margin-left: auto;
 }
+#mj-settings_top_bar:hover {
+    color:#377386;
+}
 
 #mj-settings_top_bar i {
     display: flex;

src/templates/admin/settingTemplates/SubscriptionSettingsPartials/leftMenu.php

@@ -10,23 +10,17 @@
             <?php
             echo '<a data-img_id="settingsMenuLinkImg1" class="' . esc_attr(($currentPage === 'mailjet_connect_account_page' ? 'active' : '')) . '" href="admin.php?page=mailjet_connect_account_page">';
             ?>
-            <svg class="settingsMenuLinkImg1" width="16" viewBox="0 0 16 16">
+            <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <g clip-path="url(#clip0_2_114)">
+                    <path d="M13 0H3C1.34315 0 0 1.34315 0 3V13C0 14.6569 1.34315 16 3 16H13C14.6569 16 16 14.6569 16 13V3C16 1.34315 14.6569 0 13 0Z" fill="#D8D8D8"/>
+                    <path d="M13 0H3C1.34315 0 0 1.34315 0 3V13C0 14.6569 1.34315 16 3 16H13C14.6569 16 16 14.6569 16 13V3C16 1.34315 14.6569 0 13 0Z" fill="#9585F4"/>
+                    <path fill-rule="evenodd" clip-rule="evenodd" d="M2 7.12457L6.01364 8.94384L6.82012 8.14205L4.76641 7.20897L11.1338 4.77078L8.68627 11.1101L7.75789 9.07513L6.94672 9.88161L6.98892 9.97538L8.76598 13.8718L13 2.914L2 7.12457Z" fill="white"/>
+                </g>
                 <defs>
-                    <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="b">
-                        <stop stop-color="#FFBC48" offset="0%"/>
-                        <stop stop-color="#FFA414" offset="100%"/>
-                    </linearGradient>
-                    <rect id="a" width="16" height="16" rx="3"/>
+                    <clipPath id="clip0_2_114">
+                        <rect width="16" height="16" fill="white"/>
+                    </clipPath>
                 </defs>
-                <g fill-rule="nonzero" fill="none">
-                    <g>
-                        <use fill="#D8D8D8" xlink:href="#a"/>
-                        <use fill="url(#b)" xlink:href="#a"/>
-                    </g>
-                    <path class="settingsMenuLinkImg1"
-                          d="M6.518 7.887l-.183 1.271-1.322 1.911.437-.244 7.208-3.965L14 6.118l-7.482 1.77zm-.051-.335l5.652-1.281-.366-.051-1.484-.203-3.152-.438L3 5l1.515 1.108 1.9 1.393.052.05z"
-                          fill="#FFFFFF"/>
-                </g>
             </svg>
             <span><?php
                 echo esc_textarea(__('Connect your Mailjet account', 'mailjet-for-wordpress'));

wp-mailjet.php

@@ -14,7 +14,7 @@
  * Plugin Name:       Mailjet for WordPress
  * Plugin URI:        https://www.mailjet.com/partners/wordpress/
  * Description:       The Best WordPress Plugin For Email Newsletters.
- * Version:           6.1.2
+ * Version:           6.1.3
  * Tested up to:      6.6.2
  * Author:            Mailjet SAS
  * Author URI:        http://mailjet.com
@@ -56,7 +56,7 @@
 /**
  * Mailjet plugin version.
  */
-define('MAILJET_VERSION', '6.1.2');
+define('MAILJET_VERSION', '6.1.3');
 
 /**
  * Mailjet Plugid dir.