Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

8 files changed, 75 insertions, 183 deletions

diff --git a/application/palemoon/themes/osx/browser.css b/application/palemoon/themes/osx/browser.css
index 485ed9115..400ace3f8 100644
--- a/application/palemoon/themes/osx/browser.css
+++ b/application/palemoon/themes/osx/browser.css
@@ -27,6 +27,11 @@
     border-top: none;
 }
 
+#main-window {
+  -moz-appearance: none;
+  background-color: #eeeeee;
+}
+
 #navigator-toolbox::after {
     content: "";
     display: -moz-box;
@@ -79,7 +84,7 @@
 
 /* ::::: titlebar ::::: */
 
-#main-window[sizemode="normal"] > #titlebar {
+#main-window[sizemode="normal"]:not([privatebrowsingmode=temporary]) > #titlebar {
     -moz-appearance: -moz-window-titlebar;
 }
 
@@ -127,11 +132,16 @@
 }
 
 /* ensure extra titlebar doesn't appear on normal (e.g. non-privacy) windows */
-#titlebar-buttonbox-container,
-#main-window:not([drawintitlebar=true]) > #titlebar {
+#main-window:not([privatebrowsingmode=temporary]):not(:-moz-lwtheme) > #titlebar > #titlebar-content > #titlebar-buttonbox-container,
+#main-window:not([drawintitlebar=true]):not(:-moz-lwtheme) > #titlebar {
     display: none;
 }
 
+#titlebar-buttonbox-container {
+  margin-left: 7px;
+  margin-top: 3px;
+}
+
 /* ::::: bookmark toolbar ::::: */
 
 #personal-bookmarks {
@@ -1348,6 +1358,12 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
     -moz-padding-start: 0px;
 }
 
+.browserContainer > findbar {
+  background-color: -moz-dialog;
+  color: -moz-DialogText;
+  text-shadow: none;
+}
+
 /* ::::: throbber ::::: */
 
 #navigator-throbber {
@@ -1908,8 +1924,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
     list-style-image: url(chrome://global/skin/icons/question-64.png);
 }
 
-.popup-notification-icon[popupid="password-save"],
-.popup-notification-icon[popupid="password-change"] {
+.popup-notification-icon[popupid="password"] {
     list-style-image: url(chrome://mozapps/skin/passwordmgr/key-64.png);
 }
 
@@ -2400,19 +2415,56 @@ toolbar[brighttext] #addonbar-closebutton {
     right: auto;
 }
 
-#main-window[privatebrowsingmode=temporary] #toolbar-menubar {
-    background-image: url("chrome://browser/skin/privatebrowsing-dark.png");
-    background-position: top right;
-    background-repeat: no-repeat;
+#main-window[privatebrowsingmode=temporary] {
+  background-image: url("chrome://browser/skin/privatebrowsing-mask.png");
+  background-position: top right;
+  background-repeat: no-repeat;
+  background-color: moz-mac-chrome-active;
 }
 
-#main-window[privatebrowsingmode=temporary] #toolbar-menubar:-moz-locale-dir(rtl) {
-    background-position: top left;
+@media (min-resolution: 2dppx) {
+  #main-window[privatebrowsingmode=temporary] {
+    background-image: url("chrome://browser/skin/privatebrowsing-mask@2x.png");
+    background-size: 38px;
+  }
 }
 
-#main-window[privatebrowsingmode=temporary] #appmenu-button > .button-box > .box-inherit > .button-icon {
-    list-style-image: url("chrome://browser/skin/privatebrowsing-light.png");
-    width: 20px;
-    height: 16px;
+#main-window[privatebrowsingmode=temporary] {
+  background-position: top right 40px;
+}
+
+#main-window[privatebrowsingmode=temporary][inFullscreen] {
+  background-position: top right 10px;
+}
+
+#main-window[privatebrowsingmode=temporary]:-moz-locale-dir(rtl) {
+  background-position: top left 70px;
 }
 
+#main-window[privatebrowsingmode=temporary][inFullscreen]:-moz-locale-dir(rtl) {
+  background-position: top left 10px;
+}
+
+#main-window[privatebrowsingmode=temporary]:-moz-window-inactive {
+  background-color: -moz-mac-chrome-inactive;
+}
+
+#main-window[privatebrowsingmode=temporary][inFullscreen] #nav-bar[tabsontop=false] {
+  -moz-padding-end: 50px !important;
+}
+
+@media (-moz-mac-lion-theme) {
+  #main-window[privatebrowsingmode=temporary][inFullscreen] #TabsToolbar[tabsontop=true] {
+    -moz-padding-end: 50px;
+  }
+}
+
+@media not all and (-moz-mac-lion-theme) {
+  #main-window[privatebrowsingmode=temporary] {
+    background-position: top right 10px;
+  }
+
+  #main-window[privatebrowsingmode=temporary][inFullscreen][tabsontop=true] #window-controls {
+    -moz-padding-end: 50px;
+  }
+}
diff --git a/application/palemoon/themes/osx/jar.mn b/application/palemoon/themes/osx/jar.mn
index 28d779985..8f1ed0341 100644
--- a/application/palemoon/themes/osx/jar.mn
+++ b/application/palemoon/themes/osx/jar.mn
@@ -50,6 +50,8 @@ browser.jar:
         skin/classic/browser/Privacy-16.png
         skin/classic/browser/Privacy-32.png
         skin/classic/browser/Privacy-48.png
+  skin/classic/browser/privatebrowsing-mask.png
+  skin/classic/browser/privatebrowsing-mask@2x.png
         skin/classic/browser/privatebrowsing-light.png
         skin/classic/browser/privatebrowsing-dark.png
         skin/classic/browser/reload-stop-go.png
@@ -93,9 +95,10 @@ browser.jar:
         skin/classic/browser/feeds/videoFeedIcon16.png               (feeds/feedIcon16.png)
         skin/classic/browser/feeds/subscribe.css                     (feeds/subscribe.css)
         skin/classic/browser/feeds/subscribe-ui.css                  (feeds/subscribe-ui.css)
-        skin/classic/browser/newtab/newTab.css                       (newtab/newTab.css)
-        skin/classic/browser/newtab/controls.png                     (newtab/controls.png)
-        skin/classic/browser/newtab/noise.png                        (newtab/noise.png)
+*       skin/classic/browser/newtab/newTab.css                       (newtab/newTab.css)
+        skin/classic/browser/newtab/controls.png                     (../shared/newtab/controls.png)
+        skin/classic/browser/newtab/noise.png                        (../shared/newtab/noise.png)
+        skin/classic/browser/newtab/pinned.png                       (../shared/newtab/pinned.png)
         skin/classic/browser/places/places.css                       (places/places.css)
 *       skin/classic/browser/places/organizer.css                    (places/organizer.css)
         skin/classic/browser/places/editBookmark.png                 (places/editBookmark.png)
@@ -123,6 +126,7 @@ browser.jar:
         skin/classic/browser/places/livemark-item.png                (places/livemark-item.png)
         skin/classic/browser/places/expander-closed.png              (places/expander-closed.png)
         skin/classic/browser/places/expander-open.png                (places/expander-open.png)
+        skin/classic/browser/permissions/aboutPermissions.css        (permissions/aboutPermissions.css)
         skin/classic/browser/preferences/alwaysAsk.png               (preferences/alwaysAsk.png)
         skin/classic/browser/preferences/application.png             (preferences/application.png)
         skin/classic/browser/preferences/mail.png                    (preferences/mail.png)
@@ -133,7 +137,6 @@ browser.jar:
         skin/classic/browser/preferences/saveFile.png                (preferences/saveFile.png)
 *       skin/classic/browser/preferences/preferences.css             (preferences/preferences.css)
         skin/classic/browser/preferences/applications.css            (preferences/applications.css)
-        skin/classic/browser/preferences/aboutPermissions.css        (preferences/aboutPermissions.css)
 #ifdef MOZ_BROWSER_STATUSBAR
         skin/classic/browser/statusbar/dynamic.css                   (../shared/statusbar/dynamic.css)
 *       skin/classic/browser/statusbar/overlay.css                   (statusbar/overlay.css)
diff --git a/application/palemoon/themes/osx/newtab/controls.png b/application/palemoon/themes/osx/newtab/controls.png
deleted file mode 100644
index 14f382fbd..000000000
--- a/application/palemoon/themes/osx/newtab/controls.png
+++ /dev/null
diff --git a/application/palemoon/themes/osx/newtab/newTab.css b/application/palemoon/themes/osx/newtab/newTab.css
index d0403004a..b8b0fd699 100644
--- a/application/palemoon/themes/osx/newtab/newTab.css
+++ b/application/palemoon/themes/osx/newtab/newTab.css
@@ -2,33 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-:root {
-  -moz-appearance: none;
-  font-size: 75%;
-  background-color: transparent;
-}
-
-/* SCROLLBOX */
-#newtab-scrollbox:not([page-disabled]) {
-  background-color: rgb(229,229,229);
-  background-image: url(chrome://browser/skin/newtab/noise.png),
-                    linear-gradient(rgba(255,255,255,.5), rgba(255,255,255,.2));
-  background-attachment: fixed;
-}
-
-/* UNDO */
-#newtab-undo-container {
-  padding: 4px 3px;
-  border: 1px solid;
-  border-color: rgba(8,22,37,.12) rgba(8,22,37,.14) rgba(8,22,37,.16);
-  background-color: rgba(255,255,255,.4);
-  color: #525e69;
-}
-
-#newtab-undo-label {
-  margin-top: 0;
-  margin-bottom: 0;
-}
+%include ../../shared/newtab/newTab.css.inc
 
 .newtab-undo-button {
   -moz-appearance: none;
@@ -43,14 +17,6 @@
   min-width: 0;
 }
 
-.newtab-undo-button:hover {
-  text-decoration: underline;
-}
-
-.newtab-undo-button:-moz-focusring {
-  outline: 1px dotted;
-}
-
 .newtab-undo-button > .button-box {
   padding: 0;
 }
@@ -61,129 +27,3 @@
   border: none;
   -moz-user-focus: normal;
 }
-
-#newtab-undo-close-button > .toolbarbutton-text {
-  display: none;
-}
-
-#newtab-undo-close-button:-moz-focusring {
-  outline: 1px dotted;
-}
-
-/* TOGGLE */
-#newtab-toggle {
-  width: 16px;
-  height: 16px;
-  padding: 0;
-  border: none;
-  background: -216px 0 transparent url(chrome://browser/skin/newtab/controls.png);
-}
-
-#newtab-toggle[page-disabled] {
-  background-position: -232px 0;
-}
-
-/* ROWS */
-.newtab-row {
-  margin-bottom: 20px;
-}
-
-.newtab-row:last-child {
-  margin-bottom: 0;
-}
-
-/* CELLS */
-.newtab-cell {
-  -moz-margin-end: 20px;
-  background-color: rgba(255,255,255,.2);
-  border: 1px solid;
-  border-color: rgba(8,22,37,.12) rgba(8,22,37,.14) rgba(8,22,37,.16);
-  border-radius: 1px;
-  transition: border-color 100ms ease-out;
-}
-
-.newtab-cell:empty {
-  border: 1px dashed;
-  border-color: rgba(8,22,37,.15) rgba(8,22,37,.17) rgba(8,22,37,.19);
-}
-
-.newtab-cell:last-child {
-  -moz-margin-end: 0;
-}
-
-.newtab-cell:hover:not(:empty):not([dragged]) {
-  border-color: rgba(8,22,37,.25) rgba(8,22,37,.27) rgba(8,22,37,.3);
-}
-
-/* SITES */
-.newtab-site {
-  text-decoration: none;
-  transition-property: top, left, opacity, box-shadow, background-color;
-}
-
-.newtab-site:hover,
-.newtab-site[dragged] {
-  box-shadow: 0 0 10px rgba(8,22,37,.3);
-}
-
-.newtab-site[dragged] {
-  transition-property: box-shadow, background-color;
-  background-color: rgb(242,242,242);
-}
-
-/* THUMBNAILS */
-.newtab-thumbnail {
-  background-origin: padding-box;
-  background-clip: padding-box;
-  background-repeat: no-repeat;
-  background-size: cover;
-}
-
-/* TITLES */
-.newtab-title {
-  padding: 0 8px;
-  background-color: rgba(248,249,251,.95);
-  color: #1f364c;
-  line-height: 24px;
-}
-
-/* CONTROLS */
-.newtab-control {
-  width: 24px;
-  height: 24px;
-  padding: 1px 2px 3px;
-  border: none;
-  background: transparent url(chrome://browser/skin/newtab/controls.png);
-}
-
-.newtab-control-pin:hover {
-  background-position: -24px 0;
-}
-
-.newtab-control-pin:active {
-  background-position: -48px 0;
-}
-
-.newtab-control-pin[pinned] {
-  background-position: -72px 0;
-}
-
-.newtab-control-pin[pinned]:hover {
-  background-position: -96px 0;
-}
-
-.newtab-control-pin[pinned]:active {
-  background-position: -120px 0;
-}
-
-.newtab-control-block {
-  background-position: -144px 0;
-}
-
-.newtab-control-block:hover {
-  background-position: -168px 0;
-}
-
-.newtab-control-block:active {
-  background-position: -192px 0;
-}
diff --git a/application/palemoon/themes/osx/newtab/noise.png b/application/palemoon/themes/osx/newtab/noise.png
deleted file mode 100644
index 01d340aaa..000000000
--- a/application/palemoon/themes/osx/newtab/noise.png
+++ /dev/null
diff --git a/application/palemoon/themes/osx/preferences/aboutPermissions.css b/application/palemoon/themes/osx/permissions/aboutPermissions.css
index de636f5c4..406bb9204 100644
--- a/application/palemoon/themes/osx/preferences/aboutPermissions.css
+++ b/application/palemoon/themes/osx/permissions/aboutPermissions.css
@@ -101,9 +101,6 @@
 .pref-icon[type="geo"] {
   list-style-image: url(chrome://browser/skin/Geolocation-64.png);
 }
-.pref-icon[type="indexedDB"] {
-  list-style-image: url(chrome://global/skin/icons/question-64.png);
-}
 .pref-icon[type="plugins"] {
   list-style-image: url(chrome://mozapps/skin/plugins/pluginGeneric.png);
 }
diff --git a/application/palemoon/themes/osx/privatebrowsing-mask.png b/application/palemoon/themes/osx/privatebrowsing-mask.png
new file mode 100644
index 000000000..92f60e29f
--- /dev/null
+++ b/application/palemoon/themes/osx/privatebrowsing-mask.png
diff --git a/application/palemoon/themes/osx/privatebrowsing-mask@2x.png b/application/palemoon/themes/osx/privatebrowsing-mask@2x.png
new file mode 100644
index 000000000..ec1cf7452
--- /dev/null
+++ b/application/palemoon/themes/osx/privatebrowsing-mask@2x.png