Merge branch 'master' into releaseRC_20230707RB_20230711

3 files changed, 0 insertions, 35 deletions

diff --git a/toolkit/themes/windows/mozapps/extensions/experimentGeneric.png b/toolkit/themes/windows/mozapps/extensions/experimentGeneric.png
deleted file mode 100644
index a9d00545ef..0000000000
--- a/toolkit/themes/windows/mozapps/extensions/experimentGeneric.png
+++ /dev/null
diff --git a/toolkit/themes/windows/mozapps/extensions/extensions.css b/toolkit/themes/windows/mozapps/extensions/extensions.css
index f350f7ca64..51d95af86b 100644
--- a/toolkit/themes/windows/mozapps/extensions/extensions.css
+++ b/toolkit/themes/windows/mozapps/extensions/extensions.css
@@ -276,9 +276,6 @@
 #category-dictionary > .category-icon {
   list-style-image: url("chrome://mozapps/skin/extensions/category-dictionaries.png");
 }
-#category-experiment > .category-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/category-experiments.png");
-}
 #category-availableUpdates > .category-icon {
   list-style-image: url("chrome://mozapps/skin/extensions/category-available.png");
 }
@@ -499,10 +496,6 @@
   list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png");
 }
 
-.addon-view[type="experiment"] .icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/experimentGeneric.png");
-}
-
 .name-container {
   font-size: 150%;
   font-weight: bold;
@@ -1205,30 +1198,3 @@ button.button-link:not([disabled="true"]):active:hover {
 .header-button > .toolbarbutton-text {
   display: none;
 }
-
-/*** telemetry experiments ***/
-
-#detail-experiment-container {
-  font-size: 80%;
-  margin-bottom: 1em;
-}
-
-#detail-experiment-bullet-container,
-#detail-experiment-state,
-#detail-experiment-time,
-.experiment-bullet-container,
-.experiment-state,
-.experiment-time {
-  vertical-align: middle;
-  display: inline-block;
-}
-
-.addon .experiment-bullet,
-#detail-experiment-bullet {
-  fill: rgb(158, 158, 158);
-}
-
-.addon[active="true"] .experiment-bullet,
-#detail-view[active="true"] #detail-experiment-bullet {
-  fill: rgb(106, 201, 20);
-}
diff --git a/toolkit/themes/windows/mozapps/jar.mn b/toolkit/themes/windows/mozapps/jar.mn
index 9f7562995f..b45fcb5a71 100644
--- a/toolkit/themes/windows/mozapps/jar.mn
+++ b/toolkit/themes/windows/mozapps/jar.mn
@@ -30,7 +30,6 @@ toolkit.jar:
   skin/classic/mozapps/extensions/themeGeneric-16.png        (extensions/themeGeneric-16.png)
   skin/classic/mozapps/extensions/dictionaryGeneric.png      (extensions/dictionaryGeneric.png)
   skin/classic/mozapps/extensions/dictionaryGeneric-16.png   (extensions/dictionaryGeneric-16.png)
-  skin/classic/mozapps/extensions/experimentGeneric.png      (extensions/experimentGeneric.png)
   skin/classic/mozapps/extensions/localeGeneric.png          (extensions/localeGeneric.png)
   skin/classic/mozapps/extensions/rating-won.png             (extensions/rating-won.png)
   skin/classic/mozapps/extensions/rating-not-won.png         (extensions/rating-not-won.png)