From d08e2d743abf39166b7f76cdb8364fca84232ad2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Mon, 21 Jan 2019 11:56:21 +0000
Subject: [PATCH] Bug 1517480 - Stop using graytext for labels in the "report a
 problem" subpanel. r=johannh

Differential Revision: https://phabricator.services.mozilla.com/D16870

--HG--
extra : moz-landing-system : lando
---
 browser/base/content/browser-contentblocking.js           | 2 +-
 .../test/trackingUI/browser_trackingUI_report_breakage.js | 2 +-
 browser/components/controlcenter/content/panel.inc.xul    | 6 +++---
 browser/themes/shared/controlcenter/panel.inc.css         | 8 --------
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/browser/base/content/browser-contentblocking.js b/browser/base/content/browser-contentblocking.js
index d80347cd8c79..16aa21782aea 100644
--- a/browser/base/content/browser-contentblocking.js
+++ b/browser/base/content/browser-contentblocking.js
@@ -791,7 +791,7 @@ var ContentBlocking = {
     // they see in the report breakage dialog.
     this.reportURI = gBrowser.currentURI;
     let urlWithoutQuery = this.reportURI.asciiSpec.replace("?" + this.reportURI.query, "");
-    this.reportBreakageURL.textContent = urlWithoutQuery;
+    this.reportBreakageURL.value = urlWithoutQuery;
     this.identityPopupMultiView.showSubView("identity-popup-breakageReportView");
   },
 
diff --git a/browser/base/content/test/trackingUI/browser_trackingUI_report_breakage.js b/browser/base/content/test/trackingUI/browser_trackingUI_report_breakage.js
index 17d68c009992..d2f26079b3dc 100644
--- a/browser/base/content/test/trackingUI/browser_trackingUI_report_breakage.js
+++ b/browser/base/content/test/trackingUI/browser_trackingUI_report_breakage.js
@@ -158,7 +158,7 @@ add_task(async function testReportBreakage() {
     await viewShown;
 
     let submitButton = document.getElementById("identity-popup-breakageReportView-submit");
-    let reportURL = document.getElementById("identity-popup-breakageReportView-collection-url").textContent;
+    let reportURL = document.getElementById("identity-popup-breakageReportView-collection-url").value;
 
     is(reportURL, TRACKING_PAGE, "Shows the correct URL in the report UI.");
 
diff --git a/browser/components/controlcenter/content/panel.inc.xul b/browser/components/controlcenter/content/panel.inc.xul
index 158a6b3276df..fc435b4be9c6 100644
--- a/browser/components/controlcenter/content/panel.inc.xul
+++ b/browser/components/controlcenter/content/panel.inc.xul
@@ -280,11 +280,11 @@
         </vbox>
         <vbox id="identity-popup-breakageReportView-body" class="panel-view-body-unscrollable">
           <vbox class="identity-popup-breakageReportView-collection-section">
-            <label class="identity-popup-breakageReportView-collection-label">&contentBlocking.breakageReportView.collection.url.label;</label>
-            <label id="identity-popup-breakageReportView-collection-url"/>
+            <label>&contentBlocking.breakageReportView.collection.url.label;</label>
+            <textbox readonly="true" id="identity-popup-breakageReportView-collection-url"/>
           </vbox>
           <vbox class="identity-popup-breakageReportView-collection-section">
-            <label class="identity-popup-breakageReportView-collection-label">&contentBlocking.breakageReportView.collection.comments.label;</label>
+            <label>&contentBlocking.breakageReportView.collection.comments.label;</label>
             <textbox multiline="true" id="identity-popup-breakageReportView-collection-comments"/>
           </vbox>
         </vbox>
diff --git a/browser/themes/shared/controlcenter/panel.inc.css b/browser/themes/shared/controlcenter/panel.inc.css
index 78574b1d680d..00f502c7158c 100644
--- a/browser/themes/shared/controlcenter/panel.inc.css
+++ b/browser/themes/shared/controlcenter/panel.inc.css
@@ -345,14 +345,6 @@ description#identity-popup-content-verifier,
   font-size: 110%;
 }
 
-.identity-popup-breakageReportView-collection-label {
-  color: graytext;
-}
-
-#identity-popup-breakageReportView-collection-url {
-  word-wrap: break-word;
-}
-
 .identity-popup-breakageReportView-collection-section {
   margin-bottom: 16px;
 }