Merge pull request #711 from google/feature/587-remove-developer-beta

Remove developer beta
google · Oct 29, 2019 · 58658e9 · 58658e9
2 parents c28fa93 + 919e06c
commit 58658e9
Show file tree

Hide file tree

Showing 20 changed files with 10 additions and 94 deletions.
diff --git a/assets/js/components/logo.js b/assets/js/components/logo.js
@@ -22,9 +22,7 @@
 import SvgIcon from 'GoogleUtil/svg-icon';
 const { __ } = wp.i18n;
 
-const Logo = ( props ) => {
-	const { beta = true } = props;
-
+const Logo = () => {
 	return (
 		<div className="googlesitekit-logo" aria-hidden="true">
 			<SvgIcon
@@ -34,13 +32,12 @@ const Logo = ( props ) => {
 				width="32"
 			/>
 			<SvgIcon
-				id={ beta ? 'logo-sitekit-beta' : 'logo-sitekit' }
+				id="logo-sitekit"
 				className={ `
 				 googlesitekit-logo__logo-sitekit
-				 ${ beta ? 'googlesitekit-logo__logo-sitekit--beta' : '' }
 				` }
-				height={ beta ? '28' : '26' }
-				width={ beta ? '206' : '99' }
+				height="26"
+				width="99"
 			/>
 			<span className="screen-reader-text">
 				{ __( 'Site Kit by Google Logo', 'google-site-kit' ) }

diff --git a/assets/sass/components/global/_googlesitekit-logo.scss b/assets/sass/components/global/_googlesitekit-logo.scss
@@ -47,22 +47,6 @@
 		}
 	}
 
-	.googlesitekit-logo__logo-sitekit--beta,
-	.googlesitekit-svg-logo-sitekit-beta {
-		fill: currentColor;
-		height: 18px;
-		margin-left: $grid-gap-phone / 2;
-		margin-top: 2px;
-		vertical-align: middle;
-		width: 132px;
-
-		@media (min-width: $bp-tablet) {
-			height: 28px;
-			margin-left: $grid-gap-phone;
-			width: 206px;
-		}
-	}
-
 	&--mini {
 
 		.googlesitekit-logo__logo-g,
@@ -77,12 +61,5 @@
 			margin-left: $grid-gap-phone / 4;
 			width: 78px;
 		}
-
-		.googlesitekit-logo__logo-sitekit--beta,
-		.googlesitekit-svg-logo-sitekit-beta {
-			height: 17px;
-			margin-left: $grid-gap-phone / 2;
-			width: 102px;
-		}
 	}
 }
diff --git a/assets/svg/logo-g-beta.svg b/assets/svg/logo-g-beta.svg