From c74da0b85d23659056299e0d91f3221d2414629d Mon Sep 17 00:00:00 2001
From: Horst3180
Date: Mon, 1 Aug 2016 16:39:25 +0200
Subject: update to 48.0rc2

---
 .../chrome/browser/syncedtabs/sidebar.css          | 41 ++++++++++++++++++++--
 1 file changed, 38 insertions(+), 3 deletions(-)

(limited to 'arc-firefox-theme/chrome/browser/syncedtabs')

diff --git a/arc-firefox-theme/chrome/browser/syncedtabs/sidebar.css b/arc-firefox-theme/chrome/browser/syncedtabs/sidebar.css
index 2311d6f..63d5b64 100644
--- a/arc-firefox-theme/chrome/browser/syncedtabs/sidebar.css
+++ b/arc-firefox-theme/chrome/browser/syncedtabs/sidebar.css
@@ -5,16 +5,36 @@
 
 /* These styles are intended to mimic XUL trees and the XUL search box. */
 
-:root, body {
-  overflow-x: hidden;
+html {
+  height: 100%;
 }
 
 body {
+  height: 100%;
   margin: 0;
   font: message-box;
   color: #333333;
   -moz-user-select: none;
-  overflow: hidden;
+}
+
+/* The content-container holds the non-scrollable header and the scrollable
+   content area.
+*/
+.content-container {
+  display: flex;
+  flex-flow: column;
+  height: 100%;
+}
+
+/* The content header is not scrollable */
+.content-header {
+  flex: 0 1 auto;
+}
+
+/* The main content area is scrollable and fills the rest of the area */
+.content-scrollable {
+  flex: 1 1 auto;
+  overflow: auto;
 }
 
 .emptyListInfo {
@@ -65,10 +85,21 @@ body {
 .client .item.tab > .item-title-container {
   padding-inline-start: 35px;
 }
+
 .item.tab > .item-title-container {
   padding-inline-start: 20px;
 }
 
+.item.tab > .item-title-container > .item-icon-container {
+  background-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+}
+
+@media (min-resolution: 1.1dppx) {
+.item.tab > .item-title-container > .item-icon-container {
+    background-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png");
+  }
+}
+
 .item-icon-container {
   min-width: 16px;
   max-width: 16px;
@@ -169,6 +200,10 @@ body {
   opacity: 100;
 }
 
+.sidebar-search-container.tabs-container:not(.selected) {
+  display: none;
+}
+
 .textbox-search-clear:not([disabled]) {
   cursor: default;
 }
-- 
cgit v1.2.3