color cleanup

parts/header.html

@@ -1,5 +1,5 @@
 <!-- wp:group {"style":{"spacing":{"padding":{"top":"20px","bottom":"20px"}}},"className":"has-contrast-light-color has-secondary-dark-background-color has-background","layout":{"type":"constrained"}} -->
-<div class="wp-block-group has-contrast-light-color has-secondary-dark-background-color has-background" style="padding-top:20px;padding-bottom:20px">
+<div class="wp-block-group has-white-color has-primary-background-color has-background" style="padding-top:20px;padding-bottom:20px">
 	<!-- wp:group {"align":"wide","layout":{"type":"flex","flexWrap":"wrap","justifyContent":"space-between"}} -->
 	<div class="wp-block-group alignwide">
 		<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|50"},"layout":{"selfStretch":"fit","flexSize":null}},"layout":{"type":"flex"}} -->
@@ -9,11 +9,11 @@
 		<!-- /wp:group -->
 		<!-- wp:group {"layout":{"type":"flex","orientation":"vertical"}} -->
 			<div class="wp-block-group">
-				<!-- wp:paragraph {"fontSize":"small"} -->
-				<p class="has-small-font-size">305 W Alexander Ave #A | Greenwood, SC 29646</p>
+				<!-- wp:paragraph {"style":{"typography":{"lineHeight":"1.3"}},"fontSize":"medium"} -->
+				<p class="has-medium-font-size" style="line-height:1.3">305 W Alexander Ave #A <br>Greenwood, SC 29646</p>
 				<!-- /wp:paragraph -->
 				<!-- wp:paragraph {"style":{"typography":{"fontSize":"1.5rem"}}} -->
-				<p style="font-size:1.5rem">864-223-0505</p>
+				<p style="font-size:1.5rem;line-height:0">864-223-0505</p>
 				<!-- /wp:paragraph -->
 			</div>
 	<!-- /wp:group -->
@@ -23,6 +23,6 @@
 <!-- /wp:group -->
 <!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"20px","bottom":"20px"}}},"className":"has-contrast-light-color has-contrast-background-color has-background","layout":{"type":"constrained","justifyContent":"center"}} -->
 	<div class="wp-block-group alignwide has-contrast-light-color has-contrast-background-color has-background" style="padding-top:20px;padding-bottom:20px">
-		<!-- wp:navigation {"ref":5,"layout":{"type":"flex","justifyContent":"left","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"},"blockGap":"var:preset|spacing|50"},"layout":{"selfStretch":"fit","flexSize":null}}} /-->
+		<!-- wp:navigation {"ref":5,"icon":"menu","overlayBackgroundColor":"contrast","overlayTextColor":"white","style":{"spacing":{"margin":{"top":"0"},"blockGap":"var:preset|spacing|50"},"layout":{"selfStretch":"fit","flexSize":null}},"layout":{"type":"flex","justifyContent":"left","orientation":"horizontal","flexWrap":"wrap"}} /-->
 	</div>
 <!-- /wp:group -->

patterns/footer.php

@@ -8,8 +8,8 @@
  */
 ?>
 
-<!-- wp:group {"align":"full","textColor":"base","backgroundColor":"secondary-dark","layout":{"type":"constrained"}} -->
-<div class="wp-block-group alignfull has-text-color-base has-contrast-light-color has-secondary-dark-background-color has-text-color has-background">
+<!-- wp:group {"align":"full","textColor":"base","backgroundColor":"primary","layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull has-text-color-base has-contrast-light-color has-primary-background-color has-text-color has-background">
 
 	<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"var:preset|spacing|70","bottom":"var:preset|spacing|50"}}}} -->
 	<div class="wp-block-group alignwide container" style="padding-top:var(--wp--preset--spacing--70);padding-bottom:var(--wp--preset--spacing--50)">
@@ -140,8 +140,8 @@
 </div>
 <!-- /wp:group -->
 
-<!-- wp:group {"align":"full","textColor":"base","backgroundColor":"secondary-dark","layout":{"type":"constrained"}} -->
-<div class="wp-block-group alignfull has-text-color-base has-contrast-light-color has-secondary-dark-background-color has-text-color has-background">
+<!-- wp:group {"align":"full","textColor":"base","backgroundColor":"primary","layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull has-text-color-base has-contrast-light-color has-primary-background-color has-text-color has-background">
 
 	<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"var:preset|spacing|70","bottom":"var:preset|spacing|50"}}}} -->
 	<div class="wp-block-group alignwide container" style="padding-top:var(--wp--preset--spacing--70);padding-bottom:var(--wp--preset--spacing--50)">

theme.json

@@ -18,12 +18,12 @@
 				{
 					"slug": "white",
 					"color": "#FFFFFF",
-					"name": "Base"
+					"name": "White"
 				},
         {
 					"slug": "black",
 					"color": "#000000",
-					"name": "White"
+					"name": "Black"
 				},
 				{
 					"slug": "contrast",
@@ -37,24 +37,9 @@
 				},
 				{
 					"slug": "primary",
-					"color": "#19448c",
+					"color": "#19458c",
 					"name": "Primary"
 				},
-				{
-					"slug": "primary-light",
-					"color": "#e5f6f7",
-					"name": "Primary Light"
-				},
-				{
-					"slug": "secondary",
-					"color": "#19448c",
-					"name": "Secondary"
-				},
-				{
-					"slug": "secondary-dark",
-					"color": "#19448c",
-					"name": "Secondary Dark"
-				},
 				{
 					"slug": "transparent",
 					"color": "transparent",
@@ -65,9 +50,9 @@
 			"defaultGradients": false,
 			"gradients": [
         {
-					"slug": "primary-secondary",
-					"gradient": "linear-gradient(to right, #009C9F 0%, #19458C 100%)",
-					"name": "Primary Secondary"
+					"slug": "primary-light",
+					"gradient": "linear-gradient(to right, #19458C 0%, #FFFFFF 100%)",
+					"name": "Primary Light"
 				}
 			],
 			"customDuotone": false,
@@ -75,23 +60,13 @@
 			"duotone": [
 				{
 					"colors": [ "#19458C", "#FFFFFF"],
-					"slug": "secondary-light",
-					"name": "Secondary"
-				},
-				{
-					"colors": ["#009C9F", "#FFFFFF"],
 					"slug": "primary-light",
 					"name": "Primary Light"
 				},
 				{
-					"colors": ["#009C9F", "#19458C"],
-					"slug": "primary-secondary",
-					"name": "Primary Secondary"
-				},
-				{
-					"colors": ["#e5f6f7", "#FFFFFF"],
-					"slug": "primary-light-light",
-					"name": "Primary Light Light"
+					"colors": ["#19458C", "#001A40"],
+					"slug": "primary-dark",
+					"name": "Primary Dark"
 				}
 			]
 		},