Bug 1638327 - Rename urlbar-autocomplete.inc.css to urlbarView.inc.css. r=mak
authorDão Gottwald <dao@mozilla.com>
Fri, 15 May 2020 16:00:38 +0000
changeset 530305 01c756c477776786a14d919bb86a83e73cf008f1
parent 530304 940a99ae6cfe6e9723ffefe52fefade0b7c1d5dc
child 530306 4a5f6ce93e71bb17688c84e9482e290f9f1d4604
push id37420
push usernerli@mozilla.com
push dateFri, 15 May 2020 21:52:36 +0000
treeherdermozilla-central@f340bbb582d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmak
bugs1638327
milestone78.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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
browser/themes/osx/browser.css
browser/themes/shared/urlbar-autocomplete.inc.css
browser/themes/shared/urlbarView.inc.css
browser/themes/windows/browser.css
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -165,32 +165,49 @@ menuitem.bookmark-item {
   background-color: #d70022;
   stroke: white;
 }
 
 #close-button:hover:active {
   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
 
 notification[value="translation"] {
   min-height: 40px;
 }
 
@@ -262,34 +279,16 @@ notification[value="translation"] menuli
 /* AutoComplete */
 
 %include ../shared/autocomplete.inc.css
 
 #PopupAutoComplete > richlistbox > richlistitem[originaltype~="datalist-first"] {
   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
 
 /* Content area */
 
 %include ../shared/sidebar.inc.css
 
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -232,63 +232,67 @@
 /* ----- FULLSCREEN WINDOW CONTROLS ----- */
 
 #minimize-button,
 #close-button,
 #fullscreen-button ~ #window-controls > #restore-button {
   display: none;
 }
 
-/* ::::: nav-bar-inner ::::: */
+/* Address bar */
 
 %include ../shared/urlbar-searchbar.inc.css
 
 #urlbar,
 #searchbar {
   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 {
   line-height: 1.745em;
 }
 
 %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 ----- */
-
-%include ../shared/autocomplete.inc.css
+/* Address bar results view */
 
-#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%);
   --urlbar-popup-action-color: hsl(178, 100%, 28%);
 }
 
 .urlbarView:not(:-moz-lwtheme),
 #PopupSearchAutoComplete:not(:-moz-lwtheme) {
   /* Set custom disabled text color since native graytext is too faint on macOS 10.14+. */
   --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"],
 #BMB_bookmarksPopup[side="bottom"] {
   margin-inline: -26px;
 }
 
 #BMB_bookmarksPopup[side="left"],
@@ -575,18 +579,16 @@
 
 /* Bookmark drag and drop styles */
 
 .bookmark-item[dragover-into="true"] {
   background: Highlight !important;
   color: HighlightText !important;
 }
 
-%include ../shared/notification-icons.inc.css
-
 /* Translation */
 
 %include ../shared/translation/infobar.inc.css
 
 notification[value="translation"] {
   color: #484848;
   background-color: #EFEFEF;
   background-image: none;
@@ -686,18 +688,16 @@ menulist.translate-infobar-element[open=
                                     rgba(255,255,255,0.6));
 }
 
 menulist.translate-infobar-element::part(dropmarker) {
   display: -moz-box;
   list-style-image: url("chrome://global/skin/icons/arrow-dropdown-12.svg");
 }
 
-%include ../shared/addon-notification.inc.css
-
 /* Status panel */
 
 #statuspanel-label {
   margin: 0;
   padding: 2px 4px;
   background-color: #f9f9fa;
   border: 1px none #ddd;
   border-top-style: solid;
rename from browser/themes/shared/urlbar-autocomplete.inc.css
rename to browser/themes/shared/urlbarView.inc.css
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -500,50 +500,50 @@ menuitem.bookmark-item {
 
   #minimize-button:-moz-locale-dir(rtl),
   #restore-button:-moz-locale-dir(rtl),
   #close-button:-moz-locale-dir(rtl) {
     transform: scaleX(-1);
   }
 }
 
-/* Location bar */
+/* Address bar */
 
 %include ../shared/urlbar-searchbar.inc.css
 
 #urlbar,
 #searchbar {
   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) {
     border-color: ThreeDShadow;
   }
 }
 
 #pageAction-urlbar-shareURL,
 #pageAction-panel-shareURL {
   list-style-image: url("chrome://browser/skin/share.svg");
 }
 
-/* identity box */
-
 %include ../shared/identity-block/identity-block.inc.css
-
-/* autocomplete */
+%include ../shared/notification-icons.inc.css
+%include ../shared/addon-notification.inc.css
 
-%include ../shared/autocomplete.inc.css
+/* Address bar results view */
 
-#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%);
   --urlbar-popup-action-color: hsl(178, 100%, 28%);
 }
 
 @media (-moz-windows-default-theme: 0) {
   :root:not(:-moz-lwtheme) {
@@ -557,20 +557,22 @@ menuitem.bookmark-item {
     --urlbarView-button-border: threedshadow;
     --urlbarView-primary-button-text: highlighttext;
     --urlbarView-primary-button-background: highlight;
     --urlbarView-primary-button-background-hover: highlight;
     --urlbarView-primary-button-background-active: highlight;
   }
 }
 
-@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 */
 
 %include ../shared/places/editBookmarkPanel.inc.css
 
 /* Content area */
 
@@ -624,19 +626,16 @@ menuitem.bookmark-item {
 }
 
 toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   -moz-appearance: none;
   background: Highlight !important;
   color: HighlightText !important;
 }
 
-%include ../shared/notification-icons.inc.css
-%include ../shared/addon-notification.inc.css
-
 /* Translation infobar */
 
 %include ../shared/translation/infobar.inc.css
 
 notification[value="translation"] {
   min-height: 40px;
 }