Merge pull request #164 from alleyinteractive/feature/LEDE-2671/twitt…

…er-x-logo LEDE-2671 & LEDE-2686 New Twitter/X logo & post blocks clean up
alleyinteractive · Jun 30, 2024 · 811d9f3 · 811d9f3
2 parents 7073934 + 2159284
commit 811d9f3
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Contributors: alleyinteractive
 
 Tags: alleyinteractive, wp-newsletter-builder
 
-Stable tag: 0.3.34
+Stable tag: 0.3.35
 
 Requires at least: 6.2
 

diff --git a/blocks/footer/style.scss b/blocks/footer/style.scss
@@ -42,8 +42,8 @@
   }
 
   .twitter-icon {
-    background-color: #3CA1F2;
-    color: #3CA1F2;
+    background-color: #000;
+    color: #000;
   }
 
   .instagram-icon {

diff --git a/blocks/post/style.scss b/blocks/post/style.scss
@@ -12,10 +12,6 @@
  */
 
 .wp-block-wp-newsletter-builder-post {
-  > * {
-    margin: 15px 0;
-  }
-
   .post__image-link {
     display: block;
   }
@@ -36,9 +32,10 @@
     }
   }
 
+  .post__byline.wp-block-wp-newsletter-builder-post-byline,
   .post__byline {
     font-size: 16px;
-    margin-bottom: 8px;
+    margin: 0 auto 8px;
     text-align: center;
   }
 

diff --git a/blocks/two-up-post/style.scss b/blocks/two-up-post/style.scss
@@ -12,11 +12,13 @@
  */
 
 .wp-block-wp-newsletter-builder-two-up-post {
+  margin-bottom: 32px;
   max-width: 600px;
   width: 100%;
 
   td {
     vertical-align: top;
+    width: 50%;
   }
 
   div.wp-block-wp-newsletter-builder-post {
@@ -28,12 +30,33 @@
       max-width: 300px;
       width: 100%;
     }
+
+    h2.wp-block-wp-newsletter-builder-post-title {
+      font-size: 20px !important; // Needed to override editor styles
+    }
+
+    p.post__byline {
+      font-size: 14px;
+      margin-bottom: 8px;
+      text-align: center;
+    }
+
+    div.wp-block-wp-newsletter-builder-post-excerpt {
+      // stylelint-disable-next-line selector-max-compound-selectors
+      p {
+        font-size: 14px;
+      }
+    }
+  }
+
+  .wp-block-wp-newsletter-builder-post-read-more {
+    display: none;
   }
 
   @media screen and (max-width: 480px) {
     td {
       display: block;
-      width: 100%;
+      width: 100% !important;
     }
   }
 }
diff --git a/images/twitter.png b/images/twitter.png
diff --git a/plugin.php b/plugin.php
@@ -3,7 +3,7 @@
  * Plugin Name: Newsletter Builder
  * Plugin URI: https://github.com/alleyinteractive/wp-newsletter-builder
  * Description: Interface to manage email newsletters
- * Version: 0.3.34
+ * Version: 0.3.35
  * Author: Alley Interactive
  * Author URI: https://github.com/alleyinteractive/wp-newsletter-builder
  * Requires at least: 6.2

diff --git a/scss/core-blocks/latest-posts.scss b/scss/core-blocks/latest-posts.scss
@@ -10,6 +10,7 @@
     display: block;
     font-weight: bold;
     margin-bottom: 8px;
+    margin-top: 16px;
     text-decoration: none;
   }
 
@@ -19,16 +20,13 @@
     clear: both;
     display: table-row;
     width: 100%;
-
-    > * {
-      margin-bottom: 16px;
-      margin-top: 16px;
-    }
   }
 
   img {
-    max-width: 250px;
-    width: 250px;
+    display: block;
+    margin-bottom: 16px;
+    max-width: 150px;
+    width: 150px;
   }
 
   .wp-block-latest-posts__post-title {
@@ -41,6 +39,11 @@
 
   .wp-block-latest-posts__featured-image {
     display: table-cell;
+    margin-top: 16px;
+
+    > a {
+      margin-top: 0;
+    }
 
     &.aligncenter {
       display: block;
@@ -60,12 +63,16 @@
 
     &.alignleft {
       float: left;
+      margin-bottom: 8px;
       margin-right: 16px;
+      padding-bottom: 32px;
     }
 
     &.alignright {
       float: right;
+      margin-bottom: 8px;
       margin-left: 16px;
+      padding-bottom: 32px;
     }
   }
 
@@ -77,8 +84,8 @@
 
   .wp-block-latest-posts__post-excerpt {
     font-size: 14px;
-    margin-bottom: 8px;
-    margin-top: 8px;
+    margin-bottom: 16px;
+    margin-top: 16px;
 
     > a {
       display: none;