diff --git a/assets/js/components/logo.js b/assets/js/components/logo.js
index 1e4b1858732..4f0c8ebac14 100644
--- 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 (
{
width="32"
/>
{ __( '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
index ca45cd72f4b..39e39cb0cde 100644
--- 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
deleted file mode 100644
index c20d598db79..00000000000
--- a/assets/svg/logo-g-beta.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
\ No newline at end of file
diff --git a/assets/svg/logo-sitekit-beta.svg b/assets/svg/logo-sitekit-beta.svg
deleted file mode 100644
index 0076dcad0be..00000000000
--- a/assets/svg/logo-sitekit-beta.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
\ No newline at end of file
diff --git a/includes/Context.php b/includes/Context.php
index 5066da0e73d..b20788f1a2e 100644
--- a/includes/Context.php
+++ b/includes/Context.php
@@ -220,15 +220,6 @@ public function get_reference_canonical() {
return false;
}
- /**
- * Gets the current version is beta released.
- *
- * @return bool True if the version is in beta mode, false otherwise.
- */
- public function is_beta() {
- return false !== strpos( GOOGLESITEKIT_VERSION, 'beta' );
- }
-
/**
* Checks whether AMP content is being served.
*
diff --git a/includes/Core/Admin/Dashboard.php b/includes/Core/Admin/Dashboard.php
index 592323c8aab..233335752d5 100644
--- a/includes/Core/Admin/Dashboard.php
+++ b/includes/Core/Admin/Dashboard.php
@@ -96,7 +96,6 @@ private function add_widgets() {
if ( ! current_user_can( Permissions::VIEW_DASHBOARD ) ) {
return;
}
- $is_beta = $this->context->is_beta();
$logo = $this->assets->svg_sprite(
'logo-g',
@@ -107,10 +106,10 @@ private function add_widgets() {
); // phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped.
$logo_text = $this->assets->svg_sprite(
- 'logo-sitekit' . ( $is_beta ? '-beta' : '' ),
+ 'logo-sitekit',
[
'height' => '17',
- 'width' => ( $is_beta ? '102' : '78' ),
+ 'width' => '78',
]
); // phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped.
diff --git a/includes/Core/Util/Activation.php b/includes/Core/Util/Activation.php
index d31f8c0fa36..f1b0e757e84 100644
--- a/includes/Core/Util/Activation.php
+++ b/includes/Core/Util/Activation.php
@@ -249,10 +249,10 @@ private function get_activation_notice() {
); // phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped
echo $this->assets->svg_sprite(
- 'logo-sitekit-beta',
+ 'logo-sitekit',
array(
- 'height' => '28',
- 'width' => '206',
+ 'height' => '26',
+ 'width' => '99',
)
); // phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped
?>
diff --git a/includes/Core/Util/Tracking.php b/includes/Core/Util/Tracking.php
index 96fb93a56e1..db5eb7fa2c0 100644
--- a/includes/Core/Util/Tracking.php
+++ b/includes/Core/Util/Tracking.php
@@ -111,8 +111,6 @@ function () {
/**
* Is tracking active for this plugin install?
*
- * During the beta, this defaults to true.
- *
* @since 1.0.0
*
* @return bool True if tracking enabled, and False if not.
diff --git a/package.json b/package.json
index 124bb1c5e03..1855b147c25 100644
--- a/package.json
+++ b/package.json
@@ -6,12 +6,11 @@
"scripts": {
"build": "npm run remove-dist && npm run build:production && npm run build:svg && npm run build:images && gulp copy-vendor",
"build:production": "npm run lint:js && webpack -p --mode=production",
- "build:beta": "npm run lint:js && webpack -p --mode=production --env.beta",
"build:dev": "npm run build:svg && npm run build:images && webpack --mode=development --debug --devtool cheap-source-map --output-pathinfo",
"build:svg": "gulp svg",
"build:images": "gulp imagemin",
"dev": "gulp copy-vendor && npm run build:dev && npm run build:svg && npm run build:images",
- "watch": "npm run remove-dist && npm run build:svg && npm run build:images && gulp copy-vendor && webpack --watch --mode=development --env.beta --debug --devtool cheap-module-eval-source-map --output-pathinfo",
+ "watch": "npm run remove-dist && npm run build:svg && npm run build:images && gulp copy-vendor && webpack --watch --mode=development --debug --devtool cheap-module-eval-source-map --output-pathinfo",
"release-zip": "npm run build && gulp release && gulp copy && gulp pre-zip && gulp zip && rm -rf release",
"release-zip-wp50": "npm run build && gulp release && gulp copy && gulp pre-zip-wp50 && gulp zip-wp50 && rm -rf release",
"release": "rm -rf release && git worktree prune && git worktree add -B stable release origin/stable && npm run build && gulp release && gulp copy",
diff --git a/tests/backstop/reference/google-site-kit_Global_Plugin_Header_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Global_Plugin_Header_0_document_0_small.png
index cc036160ff9..1183f7fa727 100644
Binary files a/tests/backstop/reference/google-site-kit_Global_Plugin_Header_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Global_Plugin_Header_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Global_Plugin_Header_0_document_1_medium.png b/tests/backstop/reference/google-site-kit_Global_Plugin_Header_0_document_1_medium.png
index 4bea551f7ec..cf0c9cb2423 100644
Binary files a/tests/backstop/reference/google-site-kit_Global_Plugin_Header_0_document_1_medium.png and b/tests/backstop/reference/google-site-kit_Global_Plugin_Header_0_document_1_medium.png differ
diff --git a/tests/backstop/reference/google-site-kit_Global_Plugin_Header_0_document_2_large.png b/tests/backstop/reference/google-site-kit_Global_Plugin_Header_0_document_2_large.png
index dc7cd11cc5a..f3d34c34f49 100644
Binary files a/tests/backstop/reference/google-site-kit_Global_Plugin_Header_0_document_2_large.png and b/tests/backstop/reference/google-site-kit_Global_Plugin_Header_0_document_2_large.png differ
diff --git a/tests/backstop/reference/google-site-kit_Setup_Step_One_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Setup_Step_One_0_document_0_small.png
index 49bfcff5a35..9d4e256008c 100644
Binary files a/tests/backstop/reference/google-site-kit_Setup_Step_One_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Setup_Step_One_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Setup_Step_One_0_document_1_medium.png b/tests/backstop/reference/google-site-kit_Setup_Step_One_0_document_1_medium.png
index e9dd7d9c8d9..98aef0f4cbc 100644
Binary files a/tests/backstop/reference/google-site-kit_Setup_Step_One_0_document_1_medium.png and b/tests/backstop/reference/google-site-kit_Setup_Step_One_0_document_1_medium.png differ
diff --git a/tests/backstop/reference/google-site-kit_Setup_Step_One_0_document_2_large.png b/tests/backstop/reference/google-site-kit_Setup_Step_One_0_document_2_large.png
index c66ea1f3ba2..06cd2576adb 100644
Binary files a/tests/backstop/reference/google-site-kit_Setup_Step_One_0_document_2_large.png and b/tests/backstop/reference/google-site-kit_Setup_Step_One_0_document_2_large.png differ
diff --git a/tests/backstop/reference/google-site-kit_Splash_Splash_Page_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Splash_Splash_Page_0_document_0_small.png
index c039c3ca3d5..c4d65123cbc 100644
Binary files a/tests/backstop/reference/google-site-kit_Splash_Splash_Page_0_document_0_small.png and b/tests/backstop/reference/google-site-kit_Splash_Splash_Page_0_document_0_small.png differ
diff --git a/tests/backstop/reference/google-site-kit_Splash_Splash_Page_0_document_1_medium.png b/tests/backstop/reference/google-site-kit_Splash_Splash_Page_0_document_1_medium.png
index 3cf27fa2df5..cbe13e87588 100644
Binary files a/tests/backstop/reference/google-site-kit_Splash_Splash_Page_0_document_1_medium.png and b/tests/backstop/reference/google-site-kit_Splash_Splash_Page_0_document_1_medium.png differ
diff --git a/tests/backstop/reference/google-site-kit_Splash_Splash_Page_0_document_2_large.png b/tests/backstop/reference/google-site-kit_Splash_Splash_Page_0_document_2_large.png
index f80d994e200..5d8d665dba8 100644
Binary files a/tests/backstop/reference/google-site-kit_Splash_Splash_Page_0_document_2_large.png and b/tests/backstop/reference/google-site-kit_Splash_Splash_Page_0_document_2_large.png differ
diff --git a/tests/phpunit/integration/ContextTest.php b/tests/phpunit/integration/ContextTest.php
index 4a87dcf706b..22eb040af80 100644
--- a/tests/phpunit/integration/ContextTest.php
+++ b/tests/phpunit/integration/ContextTest.php
@@ -154,12 +154,6 @@ public function test_get_reference_permalink() {
$this->assertEquals( 'https://test.com/hello-world/', $context->get_reference_permalink( $post_id ) );
}
- public function test_is_beta() {
- $context = new Context( GOOGLESITEKIT_PLUGIN_MAIN_FILE );
-
- $this->assertEquals( false !== strpos( GOOGLESITEKIT_VERSION, 'beta' ), $context->is_beta() );
- }
-
/**
* @group ms-excluded
*/
diff --git a/webpack.config.js b/webpack.config.js
index 8a721807c27..421652be9ea 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -26,7 +26,6 @@ const WebpackBar = require( 'webpackbar' );
* WordPress dependencies
*/
const LibraryExportDefaultPlugin = require( '@wordpress/library-export-default-webpack-plugin' );
-const webpack = require( 'webpack' );
/**
* Given a string, returns a new string with dash separators converted to
@@ -159,11 +158,6 @@ module.exports = ( env, argv ) => {
name: 'Module Entry Points',
color: '#fbbc05',
} ),
- new webpack.DefinePlugin( {
- 'process.env': {
- beta: env && env.beta,
- },
- } ),
],
optimization: {
splitChunks: {