Bug 1638327 - Rename urlbar-autocomplete.inc.css to urlbarView.inc.css. r=mak

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

browser/themes/linux/browser.css

@@ -170,22 +170,39 @@ menuitem.bookmark-item {
   background-color: #ff0039;
 }
 
-/* Location bar */
+/* Address bar */
 
 %include ../shared/urlbar-searchbar.inc.css
 
+#urlbar,
+#searchbar {
+  font-size: 1.05em;
+}
+
+@supports -moz-bool-pref("browser.urlbar.update2.expandTextOnFocus") {
+  #urlbar[breakout-extend] {
+    font-size: 1.14em;
+  }
+}
+
 #urlbar:not(:-moz-lwtheme):not([focused="true"]) > #urlbar-background,
 #searchbar:not(:-moz-lwtheme):not(:focus-within) {
   border-color: ThreeDShadow;
 }
 
-/* Identity box */
-
 %include ../shared/identity-block/identity-block.inc.css
-
 %include ../shared/notification-icons.inc.css
 %include ../shared/addon-notification.inc.css
 
+/* Address bar results view */
+
+%include ../shared/urlbarView.inc.css
+
+:root {
+  --urlbar-popup-url-color: -moz-nativehyperlinktext;
+  --urlbar-popup-action-color: -moz-nativehyperlinktext;
+}
+
 /* Translation infobar */
 
 %include ../shared/translation/infobar.inc.css
@@ -267,24 +284,6 @@ notification[value="translation"] menulist::part(dropmarker) {
   border-top: 1px solid ThreeDShadow;
 }
 
-%include ../shared/urlbar-autocomplete.inc.css
-
-:root {
-  --urlbar-popup-url-color: -moz-nativehyperlinktext;
-  --urlbar-popup-action-color: -moz-nativehyperlinktext;
-}
-
-#urlbar,
-#searchbar {
-  font-size: 1.05em;
-}
-
-@supports -moz-bool-pref("browser.urlbar.update2.expandTextOnFocus") {
-  #urlbar[breakout-extend] {
-    font-size: 1.14em;
-  }
-}
-
 /* Bookmarking panel */
 
 %include ../shared/places/editBookmarkPanel.inc.css

browser/themes/osx/browser.css

@@ -237,7 +237,7 @@
   display: none;
 }
 
-/* ::::: nav-bar-inner ::::: */
+/* Address bar */
 
 %include ../shared/urlbar-searchbar.inc.css
 
@@ -246,6 +246,12 @@
   font-size: 1.25em;
 }
 
+@supports -moz-bool-pref("browser.urlbar.update2.expandTextOnFocus") {
+  #urlbar[breakout-extend] {
+    font-size: 1.36em;
+  }
+}
+
 /* Ensure diacritics and other edge-of-font-box glyphs do not get clipped,
  * even in non-Latin scripts. */
 #urlbar-input {
@@ -253,21 +259,17 @@
 }
 
 %include ../shared/identity-block/identity-block.inc.css
+%include ../shared/notification-icons.inc.css
+%include ../shared/addon-notification.inc.css
 
 #pageAction-urlbar-shareURL,
 #pageAction-panel-shareURL {
   list-style-image: url("chrome://browser/skin/share.svg");
 }
 
-/* ----- AUTOCOMPLETE ----- */
+/* Address bar results view */
 
-%include ../shared/autocomplete.inc.css
-
-#PopupAutoComplete > richlistbox > richlistitem[originaltype~="datalist-first"] {
-  border-top: 1px solid #C7C7C7;
-}
-
-%include ../shared/urlbar-autocomplete.inc.css
+%include ../shared/urlbarView.inc.css
 
 :root {
   --urlbar-popup-url-color: hsl(210, 77%, 47%);
@@ -280,10 +282,12 @@
   --panel-disabled-color: #737373;
 }
 
-@supports -moz-bool-pref("browser.urlbar.update2.expandTextOnFocus") {
-  #urlbar[breakout-extend] {
-    font-size: 1.36em;
-  }
+/* ----- AUTOCOMPLETE ----- */
+
+%include ../shared/autocomplete.inc.css
+
+#PopupAutoComplete > richlistbox > richlistitem[originaltype~="datalist-first"] {
+  border-top: 1px solid #C7C7C7;
 }
 
 #BMB_bookmarksPopup[side="top"],
@@ -580,8 +584,6 @@
   color: HighlightText !important;
 }
 
-%include ../shared/notification-icons.inc.css
-
 /* Translation */
 
 %include ../shared/translation/infobar.inc.css
@@ -691,8 +693,6 @@ menulist.translate-infobar-element::part(dropmarker) {
   list-style-image: url("chrome://global/skin/icons/arrow-dropdown-12.svg");
 }
 
-%include ../shared/addon-notification.inc.css
-
 /* Status panel */
 
 #statuspanel-label {

browser/themes/windows/browser.css

@@ -505,7 +505,7 @@ menuitem.bookmark-item {
   }
 }
 
-/* Location bar */
+/* Address bar */
 
 %include ../shared/urlbar-searchbar.inc.css
 
@@ -514,6 +514,12 @@ menuitem.bookmark-item {
   font-size: 1.15em;
 }
 
+@supports -moz-bool-pref("browser.urlbar.update2.expandTextOnFocus") {
+  #urlbar[breakout-extend] {
+    font-size: 1.25em;
+  }
+}
+
 @media (-moz-windows-default-theme: 0) {
   #urlbar:not(:-moz-lwtheme):not([focused="true"]) > #urlbar-background,
   #searchbar:not(:-moz-lwtheme):not(:focus-within) {
@@ -526,19 +532,13 @@ menuitem.bookmark-item {
   list-style-image: url("chrome://browser/skin/share.svg");
 }
 
-/* identity box */
-
 %include ../shared/identity-block/identity-block.inc.css
+%include ../shared/notification-icons.inc.css
+%include ../shared/addon-notification.inc.css
 
-/* autocomplete */
+/* Address bar results view */
 
-%include ../shared/autocomplete.inc.css
-
-#PopupAutoComplete > richlistbox > richlistitem[originaltype~="datalist-first"] {
-  border-top: 1px solid ThreeDShadow;
-}
-
-%include ../shared/urlbar-autocomplete.inc.css
+%include ../shared/urlbarView.inc.css
 
 :root {
   --urlbar-popup-url-color: hsl(210, 77%, 47%);
@@ -562,10 +562,12 @@ menuitem.bookmark-item {
   }
 }
 
-@supports -moz-bool-pref("browser.urlbar.update2.expandTextOnFocus") {
-  #urlbar[breakout-extend] {
-    font-size: 1.25em;
-  }
+/* Autocomplete */
+
+%include ../shared/autocomplete.inc.css
+
+#PopupAutoComplete > richlistbox > richlistitem[originaltype~="datalist-first"] {
+  border-top: 1px solid ThreeDShadow;
 }
 
 /* Bookmarking panel */
@@ -629,9 +631,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   color: HighlightText !important;
 }
 
-%include ../shared/notification-icons.inc.css
-%include ../shared/addon-notification.inc.css
-
 /* Translation infobar */
 
 %include ../shared/translation/infobar.inc.css