Backed out changeset 5885fd0c53a7 (bug 1378560) for various mochitest-plain failures a=backout

MozReview-Commit-ID: 6L4AF8RJ1SB

browser/base/content/browser.css

@@ -666,7 +666,6 @@ html|input.urlbar-input[textoverflow]:not([focused]) {
 
 #urlbar[pageproxystate="invalid"] > #page-action-buttons > .urlbar-icon,
 #urlbar[pageproxystate="invalid"] > #page-action-buttons > .urlbar-icon-wrapper > .urlbar-icon,
-#urlbar[pageproxystate="invalid"] > #page-action-buttons > #pageActionSeparator,
 .urlbar-go-button[pageproxystate="valid"],
 .urlbar-go-button:not([parentfocused="true"]),
 #urlbar[pageproxystate="invalid"] > #identity-box > #blocked-permissions-container,

browser/base/content/browser.xul

@@ -856,10 +856,6 @@
                 <label id="extension" class="urlbar-display urlbar-display-extension" value="&urlbar.extension.label;"/>
               </box>
               <hbox id="page-action-buttons">
-                <hbox id="userContext-icons" hidden="true">
-                  <label id="userContext-label"/>
-                  <image id="userContext-indicator"/>
-                </hbox>
                 <image id="page-report-button"
                        class="urlbar-icon"
                        hidden="true"
@@ -873,7 +869,6 @@
                        onclick="FullZoom.reset();"
                        tooltip="dynamic-shortcut-tooltip"
                        hidden="true"/>
-                <box id="pageActionSeparator"/>
                 <image id="pageActionButton"
                        class="urlbar-icon"
                        tooltiptext="&pageActionButton.tooltip;"
@@ -893,6 +888,10 @@
                   </hbox>
                 </hbox>
               </hbox>
+              <hbox id="userContext-icons" hidden="true">
+                <label id="userContext-label"/>
+                <image id="userContext-indicator"/>
+              </hbox>
             </textbox>
         </toolbaritem>
 

browser/components/contextualidentity/content/usercontext.css

@@ -92,7 +92,6 @@
 }
 
 #userContext-label {
-  margin-inline-start: 0;
   margin-inline-end: 3px;
   color: var(--identity-tab-color);
 }

browser/themes/shared/urlbar-searchbar.inc.css

@@ -133,41 +133,6 @@
   margin-inline-end: 3px;
 }
 
-#pageActionSeparator {
-  /* This draws the separator the same way that #urlbar-display-box draws its
-     left and right borders, which end up looking like separators.  It might not
-     be the best way in this case, but it makes sure that all these vertical
-     lines in the urlbar look the same: same height, vertical position, etc. */
-  border-inline-start: 1px solid var(--urlbar-separator-color);
-  border-image: linear-gradient(transparent 15%, var(--urlbar-separator-color) 15%, var(--urlbar-separator-color) 85%, transparent 85%);
-  border-image-slice: 1;
-  width: 1px;
-  min-height: 30px;
-  visibility: hidden;
-}
-
-:root[uidensity=compact] #pageActionSeparator {
-  min-height: 26px;
-}
-
-:root[uidensity=touch] #pageActionSeparator {
-  min-height: 32px;
-}
-
-:not(#pageActionSeparator):not([hidden]) ~ #pageActionSeparator {
-  /* Show the separator between the page actions and other elements when at
-     least of the latter is shown. */
-  visibility: visible;
-  margin-left: 6px;
-  margin-right: 6px;
-}
-
-#userContext-icons,
-#urlbar-zoom-button {
-  margin-left: 6px;
-  margin-right: 6px;
-}
-
 .urlbar-icon {
   padding: 0 6px;
   /* 16x16 icon with border-box sizing */
@@ -277,6 +242,7 @@
 /* Zoom button */
 
 #urlbar-zoom-button {
+  margin: 0 3px;
   font-size: .8em;
   padding: 0 8px;
   border-radius: 1em;