1 files changed, 50 insertions, 67 deletions

diff --git a/arc-firefox-theme/chrome/global/autocomplete.css b/arc-firefox-theme/chrome/global/autocomplete.css
index fffa2b1..9d1616b 100644
--- a/arc-firefox-theme/chrome/global/autocomplete.css
+++ b/arc-firefox-theme/chrome/global/autocomplete.css
@@ -54,7 +54,9 @@ panel[type="autocomplete-richlistbox"],
   -moz-border-bottom-colors: ThreeDDarkShadow;
   -moz-border-left-colors: ThreeDDarkShadow;
   padding: 0;
+  color: -moz-FieldText;
   background-color: -moz-Field;
+  -moz-appearance: none;
 }
 
 .autocomplete-history-popup {
@@ -67,7 +69,6 @@ panel[type="autocomplete-richlistbox"],
   -moz-appearance: none !important;
   border: none !important;
   background-color: transparent !important;
-  color: MenuText;
 }
 
 .autocomplete-treecol {
@@ -107,96 +108,78 @@ treechildren.autocomplete-treebody::-moz-tree-cell-text(selected) {
   background-color: transparent;
 }
 
-.autocomplete-richlistitem[selected="true"] {
-  background-color: Highlight;
+.autocomplete-richlistitem[selected] {
   color: HighlightText;
 }
 
-.autocomplete-richlistitem {
-  padding: 6px 2px;
-  color: MenuText;
-}
-
-.ac-url-box {
-  /* When setting a vertical margin here, half of that needs to be added
-     .ac-title-box's translateY for when .ac-url-box is hidden (see below). */
-  margin-top: 1px;
-}
-
-.autocomplete-richlistitem[actiontype="keyword"] .ac-url-box,
-.autocomplete-richlistitem[actiontype="searchengine"] .ac-url-box,
-.autocomplete-richlistitem[actiontype="visiturl"] .ac-url-box,
-.autocomplete-richlistitem[type~="autofill"] .ac-url-box {
-  visibility: hidden;
-}
-
-.autocomplete-richlistitem[actiontype="keyword"] .ac-title-box,
-.autocomplete-richlistitem[actiontype="searchengine"] .ac-title-box,
-.autocomplete-richlistitem[actiontype="visiturl"] .ac-title-box,
-.autocomplete-richlistitem[type~="autofill"] .ac-title-box {
-  /* Center the title by moving it down by half of .ac-url-box's height,
-     including vertical margins (if any). */
-  transform: translateY(.5em);
-}
-
-.ac-site-icon {
-  width: 16px; 
+.ac-type-icon {
+  width: 16px;
   height: 16px;
-  margin-bottom: -2px;
-  -moz-margin-start: 3px;
+  max-width: 16px;
+  max-height: 16px;
+  -moz-margin-start: 13px;
   -moz-margin-end: 6px;
 }
 
-.ac-type-icon {
-  width: 16px; 
+.ac-site-icon {
+  width: 16px;
   height: 16px;
-  -moz-margin-start: 6px;
-  -moz-margin-end: 4px;
+  max-width: 16px;
+  max-height: 16px;
+  -moz-margin-start: 0;
+  -moz-margin-end: 11px;
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
 
-.ac-extra > .ac-result-type-tag {
-  margin: 0 4px;
+.ac-site-icon[selected] {
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon-inverted.png");
 }
 
-.ac-extra > .ac-comment {
-  padding-right: 4px;
+@media (min-resolution: 1.1dppx) {
+  .ac-site-icon {
+    list-style-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png");
+  }
+  .ac-site-icon[selected] {
+    list-style-image: url("chrome://mozapps/skin/places/defaultFavicon-inverted@2x.png");
+  }
 }
 
-.ac-ellipsis-after {
-  margin: 0 !important;
-  padding: 0; 
-  min-width: 1em;
+.ac-title {
+  -moz-margin-start: 0;
+  -moz-margin-end: 6px;
 }
 
-.ac-normal-text {
-  margin: 0 !important;
-  padding: 0;
+html|span.ac-tag {
+  -moz-margin-start: 0;
+  -moz-margin-end: 2px;
 }
 
-.ac-normal-text > html|span {
-  margin: 0 !important;
-  padding: 0;
-}
-
-html|span.ac-emphasize-text {
-  box-shadow: inset 0 0 1px 1px rgba(0,0,0,0.1);
-  background-color: rgba(0,0,0,0.05);
-  border-radius: 2px;
-  text-shadow: 0 0 currentColor; /*faux bold effect*/
+.ac-tags {
+  -moz-margin-start: 0;
+  -moz-margin-end: 4px;
 }
 
-.ac-url-text > html|span.ac-emphasize-text,
-.ac-action-text > html|span.ac-emphasize-text {
-  box-shadow: none;
+.ac-separator {
+  -moz-margin-start: 0;
+  -moz-margin-end: 6px;
 }
 
-.ac-normal-text[selected="true"] > html|span.ac-emphasize-text {
-  box-shadow: inset 0 0 1px 1px rgba(255,255,255,0.3);
-  background-color: rgba(255,255,255,0.2);
+/* Better align the URL/action with the title. */
+.ac-tags,
+.ac-separator,
+.ac-url,
+.ac-action {
+  margin-bottom: -2px;
 }
 
-.ac-title, .ac-url {
-  overflow: hidden;
+.ac-title-text,
+.ac-tags-text,
+.ac-separator-text,
+.ac-url-text,
+.ac-action-text,
+.ac-text-overflow-container {
+  padding: 0 !important;
+  margin: 0 !important;
 }
 
 /* ::::: textboxes inside toolbarpaletteitems ::::: */