Merge pull request #156 from alleyinteractive/feature/LEDE-2676/styli…

…ng-clean-up LEDE-2676 Styling clean up & small fixes
alleyinteractive · Jun 24, 2024 · d72ce47 · d72ce47
2 parents ad5b06e + 4d3a32c
commit d72ce47
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Contributors: alleyinteractive
 
 Tags: alleyinteractive, wp-newsletter-builder
 
-Stable tag: 0.3.26
+Stable tag: 0.3.27
 
 Requires at least: 6.2
 

diff --git a/blocks/footer/edit.tsx b/blocks/footer/edit.tsx
@@ -120,6 +120,7 @@ export default function Edit() {
             {address
               ? (
                 <div className="wp-block-wp-newsletter-builder-footer__address">
+                  <span>{__('Our mailing address is:', 'wp-newsletter-builder')}</span>
                   {address}
                 </div>
               )

diff --git a/blocks/footer/render.php b/blocks/footer/render.php
@@ -83,6 +83,7 @@
 
 	<?php if ( ! empty( $nb_address ) ) : ?>
 		<div class="wp-block-wp-newsletter-builder-footer__address">
+			<span><?php esc_html_e( 'Our mailing address is:', 'wp-newsletter-builder' ); ?></span>
 			<?php echo esc_html( $nb_address ); ?>
 		</div>
 	<?php endif; ?>

diff --git a/blocks/footer/style.scss b/blocks/footer/style.scss
@@ -52,8 +52,8 @@
   }
 
   .youtube-icon {
-    background-color: #FF0000;
-    color: #FF0000;
+    background-color: #F00;
+    color: #F00;
   }
 }
 
@@ -65,6 +65,12 @@
 
 .wp-block-wp-newsletter-builder-footer__address {
   margin-top: 20px;
+
+  span {
+    display: block;
+    font-weight: 700;
+    text-align: center;
+  }
 }
 
 .wp-block-wp-newsletter-builder-footer__links {

diff --git a/blocks/header/index.scss b/blocks/header/index.scss
@@ -7,6 +7,6 @@
  *
  * Replace them with your own styles or remove the file completely.
  */
-
-// .wp-block-wp-newsletter-builder-header {
-// }
+.wp-block-wp-newsletter-builder-header {
+  text-align: center;
+}
diff --git a/blocks/header/style.scss b/blocks/header/style.scss
@@ -12,7 +12,7 @@
  */
 
 .wp-block-wp-newsletter-builder-header {
-  // @TODO: style alt text.
+  text-align: center;
 
   &__placeholder {
     align-items: center;

diff --git a/blocks/post-byline/style.scss b/blocks/post-byline/style.scss
@@ -12,8 +12,7 @@
  */
 
 .post__byline {
-  font-family: var(--template-font-family);
-  font-size: 15px;
-  font-weight: bold;
+  font-size: 16px;
+  margin-bottom: 8px;
   text-align: center;
 }
diff --git a/blocks/post/style.scss b/blocks/post/style.scss
@@ -37,9 +37,8 @@
   }
 
   .post__byline {
-    font-family: var(--template-font-family);
-    font-size: 15px;
-    font-weight: bold;
+    font-size: 16px;
+    margin-bottom: 8px;
     text-align: center;
   }
 

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.26
+ * Version: 0.3.27
  * Author: Alley Interactive
  * Author URI: https://github.com/alleyinteractive/wp-newsletter-builder
  * Requires at least: 6.2

diff --git a/scss/core-blocks/heading.scss b/scss/core-blocks/heading.scss
@@ -1,3 +1,4 @@
+h1,
 h2,
 h3,
 h4,
@@ -13,6 +14,10 @@ h6 {
   }
 }
 
+h1 {
+  font-size: 28px;
+}
+
 h2 {
   font-size: 22px;
 }

diff --git a/src/assets.php b/src/assets.php
@@ -291,10 +291,13 @@ function set_template_values(): void {
 	if ( ( 'post' !== $current_screen->base ) || ( 'nb_newsletter' !== $current_screen->post_type ) ) {
 		return;
 	}
-	$template_id = get_post_meta( get_the_ID(), 'nb_newsletter_template', true );
-	$bg_color    = get_post_meta( $template_id, 'nb_template_bg_color', true );
-	$font        = get_post_meta( $template_id, 'nb_template_font', true );
-	$link_color  = get_post_meta( $template_id, 'nb_template_link_color', true );
+	$template_id     = get_post_meta( get_the_ID(), 'nb_newsletter_template', true );
+	$bg_color_meta   = get_post_meta( $template_id, 'nb_template_bg_color', true );
+	$font_meta       = get_post_meta( $template_id, 'nb_template_font', true );
+	$link_color_meta = get_post_meta( $template_id, 'nb_template_link_color', true );
+	$bg_color        = ! empty( $bg_color_meta ) ? $bg_color_meta : '#fefefe';
+	$font            = ! empty( $font_meta ) ? $font_meta : 'Arial, sans-serif';
+	$link_color      = ! empty( $link_color_meta ) ? $link_color_meta : '#0073aa';
 	printf(
 		'<style>:root {--template-font-family: %s; --template-bg-color: %s; --template-link-color: %s;}</style>',
 		$font, // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    h1,
     h2,
     h3,
     h4,
@@ Expand All / @@ -13,6 +14,10 @@ h6 { @@
       }
     }
+    h1 {
+      font-size: 28px;
+    }
     h2 {
       font-size: 22px;
     }
@@ Expand Down @@