Bug 1589961 - Improve UI alignment in Request Blocking pane, align with XHR Breakpoints style; r=Honza

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

--HG--
extra : moz-landing-system : lando

devtools/client/netmonitor/src/assets/styles/RequestBlockingPanel.css

@@ -8,11 +8,40 @@
   height: 100%;
 }
 
+/* Override the devtools-checkbox style to improve hit area and alignment */
+.request-blocking-panel .devtools-checkbox-label {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  margin: 0;
+  padding: 2px 4px;
+  /* checkbox can be 13px, 14px or 16px depending on the platform */
+  line-height: 16px;
+  user-select: none;
+  cursor: default;
+}
+
+.request-blocking-panel .devtools-checkbox-label > input {
+  flex: none;
+  margin: 0;
+}
+
+.request-blocking-panel .request-blocking-label {
+  flex: 1 1 auto;
+  display: block;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
 /* The "Enable Blocking Requests" bar */
 .network-monitor .request-blocking-enable-bar {
   background: var(--theme-tab-toolbar-background);
-  padding: 2px 10px;
+  height: calc(var(--theme-toolbar-height) + 1px);
+  padding-block: 2px;
+  padding-inline: 16px 4px;
   display: flex;
+  align-items: center;
   overflow: hidden;
   white-space: nowrap;
   border-bottom: 1px solid var(--theme-splitter-color);
@@ -27,94 +56,87 @@
   flex-grow: 1;
 }
 
-.network-monitor .request-blocking-enable-form label {
-  display: inline-block;
-}
-
-.network-monitor .request-blocking-enable-bar .request-blocking-label {
-  user-select: none;
-}
-
 .network-monitor .request-blocking-enable-bar button::before {
   background-image: url("chrome://devtools/skin/images/add.svg");
 }
 
-.network-monitor .request-blocking-label {
-  cursor: default;
-}
-
 .request-blocking-contents {
   position: absolute;
   bottom: 0;
-  top: 26px;
+  top: calc(var(--theme-toolbar-height) + 1px);
   left: 0;
   right: 0;
   overflow-y: auto;
 }
 
-
 /* Blocked request list */
 .network-monitor .request-blocking-list {
   margin: 0;
-  padding: 0;
+  padding: 4px 0;
-  border-bottom: 1px solid var(--theme-splitter-color);
   width: 100%;
 }
 
 .network-monitor .request-blocking-list li {
-  padding: 2px 10px;
   display: flex;
-  overflow: hidden;
+  align-items: center;
-  white-space: nowrap;
+  min-height: 20px;
+  padding-inline: 16px 8px;
 }
 
 .network-monitor .request-blocking-list li.request-blocking-edit-item {
-  padding: 1px 0;
+  padding: 0;
+  /* Text input is 24px but we want it to occupy the same space as our 20px rows */
+  margin-block: -2px;
 }
 
-.network-monitor .request-blocking-list label {
+.request-blocking-list .devtools-checkbox-label {
-  width: calc(100% - 26px);
+  flex: 1 1 auto;
-  overflow: hidden;
+  /* Can't seem to make the flex-shrink reduce the element's width when the
-  text-overflow: ellipsis;
+     content is a long URL, even if the URL container has text-overflow: ellipsis.
+     DevTools shows that "the item was clamped to its minimum size" and the shrink
+     part is thus ignored. So we're reserving 20px for the delete button. */
+  max-width: calc(100% - 20px);
   font-family: var(--monospace-font-family);
 }
 
-.network-monitor .request-blocking-enable-form label,
+.request-blocking-remove-button {
-.network-monitor .request-blocking-list label {
+  /* Visually hide but stay focusable in keyboard navigation */
-  margin-top: 2px;
+  opacity: 0;
+  flex: none;
+  width: 20px;
+  height: 20px;
+  margin: 0;
+  padding: 2px;
+  border: none;
+  outline: none;
+  background-color: transparent;
 }
 
-.network-monitor .request-blocking-list button {
+.request-blocking-remove-button::-moz-focus-inner {
-  visibility: hidden;
+  border: none;
+}
+
+.request-blocking-list li:hover .request-blocking-remove-button,
+.request-blocking-list li:focus-within .request-blocking-remove-button {
+  opacity: 1;
+}
+
+.request-blocking-remove-button::before {
+  content: "";
+  display: block;
   width: 16px;
   height: 16px;
   border-radius: 2px;
-  padding: 1px;
+  background: url("chrome://devtools/skin/images/close.svg") no-repeat center;
-  margin-top: 3px;
+  background-size: 12px;
+  -moz-context-properties: fill;
+  fill: var(--theme-icon-color);
 }
 
-.network-monitor .request-blocking-list .devtools-button:empty::before {
+.request-blocking-remove-button:hover::before,
-  width: 12px;
+.request-blocking-remove-button:focus::before {
-  height: 12px;
+  fill: var(--theme-selection-color);
-  margin: 0;
+  background-color: var(--theme-selection-background);
-  background-image: url("chrome://devtools/skin/images/close.svg");
-  background-size: 12px 12px;
-  background-position: 0 -1px;
-}
-
-.network-monitor .request-blocking-list .devtools-button:empty:hover,
-.network-monitor .request-blocking-list .devtools-button:empty:focus {
-  background-color: var(--theme-selection-background) !important;
-}
-
-.network-monitor .request-blocking-list button:hover::before,
-.network-monitor .request-blocking-list button:focus::before {
-  fill: #fff;
-}
-
-.network-monitor .request-blocking-list li:hover button,
-.network-monitor .request-blocking-list li:focus-within button {
-  visibility: visible;
 }
 
 /* Addition form */
@@ -122,11 +144,20 @@
   width: 100%;
 }
 
+.request-blocking-add-form {
+  border-top: 1px solid var(--theme-splitter-color);
+  border-bottom: 1px solid var(--theme-splitter-color);
+}
+
+.request-blocking-add-form:first-child {
+  border-top: none;
+}
+
 .request-blocking-add-form input,
 .request-blocking-edit-item input {
   width: calc(100% - 1px);
-  padding-top: 4px;
+  height: 24px;
-  padding-bottom: 4px;
+  padding-block: 4px;
-  background-image: none;
+  padding-inline: 20px 8px;
-  padding-inline-start: 29px;
+  background: none;
 }

devtools/client/netmonitor/src/assets/styles/Toolbar.css

@@ -70,23 +70,23 @@
   margin-inline-start: 10px;
 }
 
-.devtools-checkbox {
+.devtools-toolbar .devtools-checkbox {
   position: relative;
   vertical-align: middle;
   bottom: 1px;
 }
 
-.devtools-checkbox-label {
+.devtools-toolbar .devtools-checkbox-label {
   margin-inline-start: 2px;
   margin-inline-end: 2px;
   white-space: nowrap;
 }
 
-.devtools-checkbox-label.devtools-persistlog-checkbox {
+.devtools-toolbar .devtools-checkbox-label.devtools-persistlog-checkbox {
   margin-inline-start: 4px;
 }
 
-.devtools-checkbox-label.devtools-cache-checkbox {
+.devtools-toolbar .devtools-checkbox-label.devtools-cache-checkbox {
   margin-inline-end: 7px;
 }
 

devtools/client/netmonitor/src/components/request-blocking/RequestBlockingPanel.js

@@ -120,8 +120,9 @@ class RequestBlockingPanel extends Component {
         )
       ),
       button({
-        className: "devtools-button",
+        className: "request-blocking-remove-button",
         title: REMOVE_URL_TOOLTIP,
+        "aria-label": REMOVE_URL_TOOLTIP,
         onClick: () => removeBlockedUrl(url),
       })
     );