From ded2e0a6111ac1e08e363b5b8de933db90561adb Mon Sep 17 00:00:00 2001
From: Horst3180
Date: Fri, 18 Dec 2015 21:44:55 +0100
Subject: update to 44.0b1

---
 .../browser/preferences/aboutPermissions.css       |  4 +--
 .../browser/preferences/in-content/preferences.css | 33 ++++++++--------------
 2 files changed, 14 insertions(+), 23 deletions(-)

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

diff --git a/arc-firefox-theme/chrome/browser/preferences/aboutPermissions.css b/arc-firefox-theme/chrome/browser/preferences/aboutPermissions.css
index 16d0aee..b308d91 100644
--- a/arc-firefox-theme/chrome/browser/preferences/aboutPermissions.css
+++ b/arc-firefox-theme/chrome/browser/preferences/aboutPermissions.css
@@ -94,8 +94,8 @@
 .pref-icon[type="geo"] {
   list-style-image: url(chrome://browser/skin/Geolocation-64.png);
 }
-.pref-icon[type="push"] {
-  list-style-image: url(chrome://browser/skin/Push-64.png);
+.pref-icon[type="desktop-notification"] {
+  list-style-image: url(chrome://browser/skin/web-notifications-icon.svg);
 }
 .pref-icon[type="indexedDB"] {
   list-style-image: url(chrome://global/skin/icons/question-64.png);
diff --git a/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css b/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css
index 30b860f..a7bf8c5 100644
--- a/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css
+++ b/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css
@@ -170,6 +170,10 @@ treecol {
   margin-right: 4px !important;
 }
 
+#notificationsPolicyLearnMore {
+  -moz-margin-start: 1.5em !important;
+}
+
 #defaultFontSizeLabel {
   /* !important needed to override common !important rule */
   -moz-margin-start: 4px !important;
@@ -270,7 +274,9 @@ description > html|a {
 }
 
 .indent {
-  -moz-margin-start: 33px;
+  /* !important needed to override -moz-margin-start:0 !important; rule
+     define in common.css for labels */
+  -moz-margin-start: 33px !important;
 }
 
 .text-link {
@@ -588,6 +594,7 @@ description > html|a {
 }
 
 .fxaAccountBoxButtons > button {
+  text-align: center;
   padding-left: 11px;
   padding-right: 11px;
   margin: 0;
@@ -616,8 +623,7 @@ description > html|a {
 }
 
 .fxaMobilePromo {
-  margin-top: 14px;
-  margin-bottom: 41px;
+  margin-bottom: 31px;
 }
 
 #fxaLoginRejectedWarning {
@@ -630,28 +636,16 @@ description > html|a {
   margin-bottom: 27.5px;
 }
 
-.androidLogo {
-  list-style-image: url(chrome://browser/skin/fxa/android.png);
-  max-width: 24px;
-  position: relative;
-  top: 8px;
-  margin: 0px;
-  margin-inline-end: 5px;
-}
-
-.androidLink {
+.androidLink,
+.iOSLink {
   margin: 0;
 }
 
 #tosPP-small {
+  margin-top: 20px;
   margin-bottom: 20px;
 }
 
-.androidAttribution {
-  font-size: 12px;
-  color: #D1D2D3;
-}
-
 @media (min-resolution: 1.1dppx) {
   .fxaSyncIllustration {
     list-style-image: url(chrome://browser/skin/fxa/sync-illustration@2x.png)
@@ -659,9 +653,6 @@ description > html|a {
   .fxaFirefoxLogo {
     list-style-image: url(chrome://browser/skin/fxa/logo@2x.png);
   }
-  .androidLogo {
-    list-style-image: url(chrome://browser/skin/fxa/android@2x.png);
-  }
   #fxaProfileImage {
     list-style-image: url(chrome://browser/skin/fxa/default-avatar@2x.png);
   }
-- 
cgit v1.2.3