From 9ed4cf5a9f02f665f4bb3689023bb7e67cacdda0 Mon Sep 17 00:00:00 2001
From: Yura Zenevich <yura.zenevich@gmail.com>
Date: Mon, 27 Apr 2020 14:42:56 +0000
Subject: [PATCH] Bug 1551574 - remove beta label for the accessibility checks
 toolbar. r=mtigley

Differential Revision: https://phabricator.services.mozilla.com/D36441
---
 .../client/accessibility/accessibility.css    |  1 +
 .../accessibility/components/Toolbar.js       | 21 ++-----------------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/devtools/client/accessibility/accessibility.css b/devtools/client/accessibility/accessibility.css
index b13edda0c89b..2de74a9cdf17 100644
--- a/devtools/client/accessibility/accessibility.css
+++ b/devtools/client/accessibility/accessibility.css
@@ -146,6 +146,7 @@ body {
 
 .devtools-toolbar .accessibility-tree-filters,
 .devtools-toolbar .accessibility-simulation {
+  margin-inline-start: 4px;
   display: flex;
   flex-wrap: nowrap;
   flex-direction: row;
diff --git a/devtools/client/accessibility/components/Toolbar.js b/devtools/client/accessibility/components/Toolbar.js
index 24f2fb3f4e15..5a638c354256 100644
--- a/devtools/client/accessibility/components/Toolbar.js
+++ b/devtools/client/accessibility/components/Toolbar.js
@@ -8,10 +8,7 @@ const {
   createFactory,
   Component,
 } = require("devtools/client/shared/vendor/react");
-const {
-  div,
-  span,
-} = require("devtools/client/shared/vendor/react-dom-factories");
+const { div } = require("devtools/client/shared/vendor/react-dom-factories");
 const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
 const { L10N } = require("devtools/client/accessibility/utils/l10n");
 const Button = createFactory(
@@ -70,7 +67,6 @@ class Toolbar extends Component {
     const disableButtonStr = disabling
       ? "accessibility.disabling"
       : "accessibility.disable";
-    const betaID = "beta";
     let title;
     let isDisabled = false;
 
@@ -113,20 +109,7 @@ class Toolbar extends Component {
           role: "separator",
           className: "devtools-separator",
         }),
-      // @remove after release 68 (See Bug 1551574)
-      span(
-        {
-          className: "beta",
-          role: "presentation",
-          id: betaID,
-        },
-        L10N.getStr("accessibility.beta")
-      ),
-      AccessibilityTreeFilter({
-        audit,
-        describedby: betaID,
-        toolboxDoc,
-      }),
+      AccessibilityTreeFilter({ audit, toolboxDoc }),
       // Simulation section is shown if webrender is enabled
       ...optionalSimulationSection,
       AccessibilityPrefs({ toolboxDoc })