Merge pull request #4476 from Automattic/skatepark-separator

Skatepark: fix separator color

skatepark/assets/theme.css

@@ -43,19 +43,6 @@
 	color: var(--wp--preset--color--background);
 }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-p {
-	margin-top: calc( 0.5 * var(--wp--custom--margin--vertical));
-	margin-bottom: calc( 0.5 * var(--wp--custom--margin--vertical));
-=======
-.wp-block-column > p:first-child, .wp-block-column > h1:first-child, .wp-block-column > h2:first-child, .wp-block-column > h3:first-child, .wp-block-column > h4:first-child, .wp-block-column > h5:first-child, .wp-block-column > h6:first-child, .wp-block-group > p:first-child, .wp-block-group > h1:first-child, .wp-block-group > h2:first-child, .wp-block-group > h3:first-child, .wp-block-group > h4:first-child, .wp-block-group > h5:first-child, .wp-block-group > h6:first-child {
-	margin-top: 0;
->>>>>>> Refactor text styles and add padding to groups w border.
-}
-
-=======
->>>>>>> move group and column margin resets to blockbase
 .wp-block-post-author__content {
 	display: flex;
 	flex-direction: column;
@@ -302,7 +289,7 @@ p {
 }
 
 .wp-block-separator.is-style-wide {
-	border-bottom: 3px solid #000;
+	border-width: 0 0 3px 0;
 }
 
 .pre-footer h3 {

skatepark/sass/blocks/_separator.scss

@@ -1,6 +1,6 @@
 
 .wp-block-separator {
 	&.is-style-wide {
-		border-bottom: 3px solid #000;
+		border-width: 0 0 3px 0;
 	}
 }