Merge branch 'master' into fix/remove-badge-from-wpcom

Automattic · Sep 25, 2024 · 64f34a2 · 64f34a2
2 parents fa23399 + 1d86a3b
commit 64f34a2
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 70 deletions.
diff --git 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/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