From f9711d89b4ce75bcfc4e863908e0fe5b355f66ca Mon Sep 17 00:00:00 2001
From: Matthew Reishus <mreishus@users.noreply.github.com>
Date: Wed, 18 Sep 2024 22:41:56 +0000
Subject: [PATCH 1/2] remove temporary CSS

---
 src/index.js   |  1 -
 src/index.scss | 59 --------------------------------------------------
 2 files changed, 60 deletions(-)
 delete mode 100644 src/index.scss

diff --git a/src/index.js b/src/index.js
index cdffba76..382bdae0 100644
--- a/src/index.js
+++ b/src/index.js
@@ -25,7 +25,6 @@ import {
 	ProgressHeaderFill,
 	ProgressTitleFill,
 } from './homescreen-progress-header';
-import './index.scss';
 import { CalypsoBridgeHomescreenBanner } from './homescreen-banner';
 import { AppearanceFill, GetPaidWithSquareFill, GetPaidWithStripeFill, GetPaidWithPayPalFill } from './task-fills';
 import './task-headers';
diff --git a/src/index.scss b/src/index.scss
deleted file mode 100644
index 1566bcca..00000000
--- a/src/index.scss
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-* <-------- Start Temporary Code -------->
-*
-* A change to Gutenberg base Navigation component in https://github.com/WordPress/gutenberg/pull/34885/
-* requires these overrides. The solution exists in WooCommerce Admin 2.8.0 and WooCommerce 5.9, but is not due
-* to reach merchants until November 9, 2021 so these styles will need to exist until then.
-*
-* Criteria for removal
-* 1. WooCommerce 5.9 has been released.
-* 2. WooCommerce 5.9 includes WooCommerce Admin 2.8.0 or later.
-*/
-.woocommerce-navigation .woocommerce-navigation__wrapper {
-	.components-navigation__item {
-		.components-button {
-			opacity: 1;
-		}
-
-		&:not( :hover ) {
-			.components-button {
-				color: #949494;
-			}
-		}
-		&:hover {
-			.components-button {
-				color: #ddd;
-			}
-		}
-		&.is-active {
-			.components-button {
-				color: #fff;
-			}
-		}
-	}
-
-	.components-navigation__menu-title,
-	.components-navigation__group-title {
-		color: #f0f0f0;
-		opacity: 1;
-	}
-
-	.components-navigation__back-button {
-		color: #949494;
-		opacity: 1;
-
-		&,
-		span {
-			font-size: 13px;
-			line-height: normal;
-		}
-
-		&:hover,
-		&:hover:not( :disabled ) {
-			color: #ddd;
-		}
-	}
-}
-/*
-* <-------- End Temporary Code -------->
-*/

From 1d86a3b1b721f961e1935c0009e67a41e8ce6a27 Mon Sep 17 00:00:00 2001
From: Ilyas Foo <foo.ilyas@gmail.com>
Date: Wed, 25 Sep 2024 09:11:40 +0800
Subject: [PATCH 2/2] Revert "Fix LYS badge override (#1517)" (#1520)

This reverts commit ec38584f030bfe33150aab245f769214ddbf2845.
---
 assets/css/nav-unification.css | 10 ----------
 readme.txt                     |  1 -
 2 files changed, 11 deletions(-)

diff --git a/assets/css/nav-unification.css b/assets/css/nav-unification.css
index 1fe9f48b..dd5a29b5 100644
--- a/assets/css/nav-unification.css
+++ b/assets/css/nav-unification.css
@@ -40,13 +40,3 @@
 		width: calc( 100% - 36px );
 	}
 }
-
-/* Monkey patch for fresh theme color overriding LYS badge on admin bar. */
-.admin-color-fresh #wpadminbar:not(.mobile) .ab-top-menu>li#wp-admin-bar-woocommerce-site-visibility-badge:hover>.ab-item {
-	background-color: #DCDCDE !important;
-}
-
-.admin-color-fresh #wpadminbar:not(.mobile) .ab-top-menu>li#wp-admin-bar-woocommerce-site-visibility-badge.woocommerce-site-status-badge-live:hover>.ab-item {
-	background-color: #B8E6BF !important;
-}
-/* End monkey patch */
diff --git a/readme.txt b/readme.txt
index 0752bcb6..58a1affb 100644
--- a/readme.txt
+++ b/readme.txt
@@ -24,7 +24,6 @@ This section describes how to install the plugin and get it working.
 
 = Unreleased =
 * Re-enable Site visibility settings tab for free trial plans #1512
-* Fix LYS badge override #1517
 
 = 2.6.0 =
 * Hide WPCOM's coming soon page when the launch-your-store feature flag is enabled #1500