rebuild ponyfill after rebase

blockbase/assets/ponyfill.css

@@ -343,116 +343,8 @@ input[type=checkbox] + label {
   line-height: 1em;
 }
 
-<<<<<<< HEAD
 .wp-block-button:not(.is-style-outline) > a.has-background {
   border-style: none;
-=======
-/**
- * Button
- */
-/**
- * Block Options
- */
-.wp-block-button.wp-block-button__link,
-.wp-block-button .wp-block-button__link,
-.wp-block-button__link.wp-block-button__link,
-.wp-block-button__link .wp-block-button__link {
-  border-width: 0;
-  text-decoration: none;
-  font-weight: var(--wp--custom--button--typography--font-weight);
-}
-.wp-block-button.wp-block-button__link:not(.has-background):not(.has-text-color):hover, .wp-block-button.wp-block-button__link:not(.has-background):not(.has-text-color):focus, .wp-block-button.wp-block-button__link:not(.has-background):not(.has-text-color).has-focus,
-.wp-block-button .wp-block-button__link:not(.has-background):not(.has-text-color):hover,
-.wp-block-button .wp-block-button__link:not(.has-background):not(.has-text-color):focus,
-.wp-block-button .wp-block-button__link:not(.has-background):not(.has-text-color).has-focus,
-.wp-block-button__link.wp-block-button__link:not(.has-background):not(.has-text-color):hover,
-.wp-block-button__link.wp-block-button__link:not(.has-background):not(.has-text-color):focus,
-.wp-block-button__link.wp-block-button__link:not(.has-background):not(.has-text-color).has-focus,
-.wp-block-button__link .wp-block-button__link:not(.has-background):not(.has-text-color):hover,
-.wp-block-button__link .wp-block-button__link:not(.has-background):not(.has-text-color):focus,
-.wp-block-button__link .wp-block-button__link:not(.has-background):not(.has-text-color).has-focus {
-  --wp--custom--button--color--text: var(--wp--custom--button--hover--color--text);
-  --wp--custom--button--color--background: var(--wp--custom--button--hover--color--background);
-  --wp--custom--button--border--color: var(--wp--custom--button--hover--border--color);
-  opacity: 1;
-  color: var(--wp--custom--button--color--text);
-  background-color: var(--wp--custom--button--color--background);
-  border-color: currentcolor;
-  border-color: currentcolor;
-  border-color: var(--wp--custom--button--border--color);
-}
-.wp-block-button.wp-block-button__link:not(.has-background):not(.has-text-color):hover svg, .wp-block-button.wp-block-button__link:not(.has-background):not(.has-text-color):focus svg, .wp-block-button.wp-block-button__link:not(.has-background):not(.has-text-color).has-focus svg,
-.wp-block-button .wp-block-button__link:not(.has-background):not(.has-text-color):hover svg,
-.wp-block-button .wp-block-button__link:not(.has-background):not(.has-text-color):focus svg,
-.wp-block-button .wp-block-button__link:not(.has-background):not(.has-text-color).has-focus svg,
-.wp-block-button__link.wp-block-button__link:not(.has-background):not(.has-text-color):hover svg,
-.wp-block-button__link.wp-block-button__link:not(.has-background):not(.has-text-color):focus svg,
-.wp-block-button__link.wp-block-button__link:not(.has-background):not(.has-text-color).has-focus svg,
-.wp-block-button__link .wp-block-button__link:not(.has-background):not(.has-text-color):hover svg,
-.wp-block-button__link .wp-block-button__link:not(.has-background):not(.has-text-color):focus svg,
-.wp-block-button__link .wp-block-button__link:not(.has-background):not(.has-text-color).has-focus svg {
-  fill: var(--wp--custom--button--color--text);
-}
-.wp-block-button.is-style-outline.wp-block-button__link,
-.wp-block-button.is-style-outline .wp-block-button__link,
-.wp-block-button__link.is-style-outline.wp-block-button__link,
-.wp-block-button__link.is-style-outline .wp-block-button__link {
-  --wp--custom--button--color--text: var(--wp--custom--button--border--color);
-  --wp--custom--button--color--background: transparent;
-  border-style: var(--wp--custom--button--border--style);
-  border-width: var(--wp--custom--button--border--width);
-  padding-top: var(--wp--custom--button--spacing--padding--top);
-  padding-bottom: var(--wp--custom--button--spacing--padding--bottom);
-  padding-left: var(--wp--custom--button--spacing--padding--left);
-  padding-right: var(--wp--custom--button--spacing--padding--right);
-  opacity: 1;
-  color: var(--wp--custom--button--color--text);
-  background-color: var(--wp--custom--button--color--background);
-  border-color: currentcolor;
-  border-color: currentcolor;
-}
-.wp-block-button.is-style-outline.wp-block-button__link:not(.has-background):not(.has-text-color):hover, .wp-block-button.is-style-outline.wp-block-button__link:not(.has-background):not(.has-text-color):focus, .wp-block-button.is-style-outline.wp-block-button__link:not(.has-background):not(.has-text-color).has-focus,
-.wp-block-button.is-style-outline .wp-block-button__link:not(.has-background):not(.has-text-color):hover,
-.wp-block-button.is-style-outline .wp-block-button__link:not(.has-background):not(.has-text-color):focus,
-.wp-block-button.is-style-outline .wp-block-button__link:not(.has-background):not(.has-text-color).has-focus,
-.wp-block-button__link.is-style-outline.wp-block-button__link:not(.has-background):not(.has-text-color):hover,
-.wp-block-button__link.is-style-outline.wp-block-button__link:not(.has-background):not(.has-text-color):focus,
-.wp-block-button__link.is-style-outline.wp-block-button__link:not(.has-background):not(.has-text-color).has-focus,
-.wp-block-button__link.is-style-outline .wp-block-button__link:not(.has-background):not(.has-text-color):hover,
-.wp-block-button__link.is-style-outline .wp-block-button__link:not(.has-background):not(.has-text-color):focus,
-.wp-block-button__link.is-style-outline .wp-block-button__link:not(.has-background):not(.has-text-color).has-focus {
-  --wp--custom--button--color--text: var(--wp--custom--button--hover--color--text);
-  --wp--custom--button--color--background: var(--wp--custom--button--hover--color--background);
-  --wp--custom--button--border--color: var(--wp--custom--button--hover--border--color);
-  opacity: 1;
-  color: var(--wp--custom--button--color--text);
-  background-color: var(--wp--custom--button--color--background);
-  border-color: currentcolor;
-  border-color: currentcolor;
-  border-color: var(--wp--custom--button--border--color);
-}
-.wp-block-button.is-style-outline.wp-block-button__link:not(.has-background):not(.has-text-color):hover svg, .wp-block-button.is-style-outline.wp-block-button__link:not(.has-background):not(.has-text-color):focus svg, .wp-block-button.is-style-outline.wp-block-button__link:not(.has-background):not(.has-text-color).has-focus svg,
-.wp-block-button.is-style-outline .wp-block-button__link:not(.has-background):not(.has-text-color):hover svg,
-.wp-block-button.is-style-outline .wp-block-button__link:not(.has-background):not(.has-text-color):focus svg,
-.wp-block-button.is-style-outline .wp-block-button__link:not(.has-background):not(.has-text-color).has-focus svg,
-.wp-block-button__link.is-style-outline.wp-block-button__link:not(.has-background):not(.has-text-color):hover svg,
-.wp-block-button__link.is-style-outline.wp-block-button__link:not(.has-background):not(.has-text-color):focus svg,
-.wp-block-button__link.is-style-outline.wp-block-button__link:not(.has-background):not(.has-text-color).has-focus svg,
-.wp-block-button__link.is-style-outline .wp-block-button__link:not(.has-background):not(.has-text-color):hover svg,
-.wp-block-button__link.is-style-outline .wp-block-button__link:not(.has-background):not(.has-text-color):focus svg,
-.wp-block-button__link.is-style-outline .wp-block-button__link:not(.has-background):not(.has-text-color).has-focus svg {
-  fill: var(--wp--custom--button--color--text);
-}
-.wp-block-button.is-style-outline.wp-block-button__link svg,
-.wp-block-button.is-style-outline .wp-block-button__link svg,
-.wp-block-button__link.is-style-outline.wp-block-button__link svg,
-.wp-block-button__link.is-style-outline .wp-block-button__link svg {
-  fill: var(--wp--custom--button--color--text);
-}
-
-.wp-block-buttons .wp-block-button:last-child {
-  margin-bottom: 0;
->>>>>>> aff3e9952 (kept the mixins, but removed the includes)
 }
 
 .wp-block-calendar table caption {
@@ -761,7 +653,6 @@ div.wp-block-query-pagination .wp-block-query-pagination-numbers .current {
   color: var(--wp--custom--button--color--text);
   background-color: var(--wp--custom--button--color--background);
   border-color: currentcolor;
-  border-color: currentcolor;
   border-color: var(--wp--custom--button--border--color);
 }
 .wp-block-search.wp-block-search__button-inside .wp-block-search__inside-wrapper .wp-block-search__button:not(.has-background):not(.has-text-color):hover svg, .wp-block-search.wp-block-search__button-inside .wp-block-search__inside-wrapper .wp-block-search__button:not(.has-background):not(.has-text-color):focus svg, .wp-block-search.wp-block-search__button-inside .wp-block-search__inside-wrapper .wp-block-search__button:not(.has-background):not(.has-text-color).has-focus svg,
@@ -814,7 +705,6 @@ p.wp-block-site-tagline {
   color: var(--wp--custom--button--color--text);
   background-color: var(--wp--custom--button--color--background);
   border-color: currentcolor;
-  border-color: currentcolor;
   border-color: var(--wp--custom--button--border--color);
 }
 .wp-block-file .wp-block-file__button:not(.has-background):not(.has-text-color):hover svg, .wp-block-file .wp-block-file__button:not(.has-background):not(.has-text-color):focus svg, .wp-block-file .wp-block-file__button:not(.has-background):not(.has-text-color).has-focus svg {

blockbase/sass/blocks/_button-mixins.scss

@@ -1,6 +1,6 @@
 // NOTE: These remain for the styling of buttons that are NOT blocks and is used elsewhere.  This can be removed when those no longer exist.
 // See https://github.com/WordPress/gutenberg/issues/29167
-//We are keeping the mixin in case it's used by any child themes, but this isn't used by Blockbase any more
+// We are keeping the mixin in case it's used by any child themes, but this isn't used by Blockbase any more
 @mixin button-main-styles {
 
 	@include button-padding-styles;
@@ -14,7 +14,6 @@
 	color: var(--wp--custom--button--color--text);
 	background-color: var(--wp--custom--button--color--background);
 	border-color: currentcolor;
-	border-color: currentcolor;
 
 	svg {
 		fill: var(--wp--custom--button--color--text);

blockbase/sass/blocks/_button.scss

@@ -1,44 +1,3 @@
-@import "button-mixins";
-
-/**
- * Button
- */
-
-/**
- * Block Options
- */
-.wp-block-button,
-.wp-block-button__link {
-
-	&.wp-block-button__link,
-	.wp-block-button__link {
-
-		@include button-hover-styles;
-		border-width: 0;
-		text-decoration: none;
-		font-weight: var(--wp--custom--button--typography--font-weight);
-	}
-
-	&.is-style-outline {
-
-		&.wp-block-button__link,
-		.wp-block-button__link {
-			--wp--custom--button--color--text: var(--wp--custom--button--border--color);
-			--wp--custom--button--color--background: transparent;
-
-			@include button-border-styles;
-			@include button-hover-styles;
-			@include button-color-styles;
-		}
-	}
-}
-
-// TODO: I'm not sure what the end goal should be here, but since we are unable to use
-// a button block OUTSIDE of the context of the button collection block (grrrrrrrrr)
-// then there are undesired margins to be dealt with somehow.
-.wp-block-buttons {
-
-	.wp-block-button:last-child {
-		margin-bottom: 0;
-	}
+.wp-block-button:not(.is-style-outline) > a.has-background {
+	border-style: none;
 }