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

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

5 files changed, 90 insertions, 0 deletions

diff --git a/application/basilisk/themes/linux/customizableui/background-noise-toolbar.png b/application/basilisk/themes/linux/customizableui/background-noise-toolbar.png
new file mode 100644
index 000000000..d09ba9daf
--- /dev/null
+++ b/application/basilisk/themes/linux/customizableui/background-noise-toolbar.png
diff --git a/application/basilisk/themes/linux/customizableui/customizeMode-gridTexture.png b/application/basilisk/themes/linux/customizableui/customizeMode-gridTexture.png
new file mode 100644
index 000000000..a7c2775cf
--- /dev/null
+++ b/application/basilisk/themes/linux/customizableui/customizeMode-gridTexture.png
diff --git a/application/basilisk/themes/linux/customizableui/customizeMode-separatorHorizontal.png b/application/basilisk/themes/linux/customizableui/customizeMode-separatorHorizontal.png
new file mode 100644
index 000000000..5e17cb4db
--- /dev/null
+++ b/application/basilisk/themes/linux/customizableui/customizeMode-separatorHorizontal.png
diff --git a/application/basilisk/themes/linux/customizableui/customizeMode-separatorVertical.png b/application/basilisk/themes/linux/customizableui/customizeMode-separatorVertical.png
new file mode 100644
index 000000000..dc4caee81
--- /dev/null
+++ b/application/basilisk/themes/linux/customizableui/customizeMode-separatorVertical.png
diff --git a/application/basilisk/themes/linux/customizableui/panelUI.css b/application/basilisk/themes/linux/customizableui/panelUI.css
new file mode 100644
index 000000000..0037b5634
--- /dev/null
+++ b/application/basilisk/themes/linux/customizableui/panelUI.css
@@ -0,0 +1,90 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+
+%include ../../shared/customizableui/panelUI.inc.css
+
+.panel-subviews {
+  background-color: var(--arrowpanel-background);
+}
+
+#BMB_bookmarksPopup > menuitem[type="checkbox"] {
+  -moz-appearance: none !important; /* important, to override toolkit rule */
+}
+
+#BMB_bookmarksPopup menupopup {
+  -moz-appearance: none;
+  background: var(--arrowpanel-background);
+  color: var(--arrowpanel-color);
+  border: 1px solid var(--arrowpanel-border-color);
+  margin-top: -6px;
+  padding-top: 1px;
+}
+
+/* Add some space at the top because there are no headers: */
+#BMB_bookmarksPopup menupopup > hbox > .popup-internal-box > .arrowscrollbox-scrollbox > .scrollbox-innerbox  {
+  padding-top: 4px;
+}
+
+.subviewbutton > .toolbarbutton-text {
+  padding-top: 3px;
+  padding-bottom: 3px;
+}
+
+.widget-overflow-list .toolbarbutton-1 > .toolbarbutton-menubutton-button {
+  -moz-appearance: none;
+  border: 0;
+  margin-inline-start: 3px;
+}
+
+.widget-overflow-list .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
+  margin-inline-start: 0;
+}
+
+.subviewbutton > .toolbarbutton-text {
+  padding-inline-start: 16px;
+}
+
+.subviewbutton:-moz-any([image],[targetURI],.cui-withicon, .restoreallitem, .bookmark-item) > .toolbarbutton-text {
+  padding-inline-start: 0;
+}
+
+.subviewbutton:-moz-any([image],[targetURI],.cui-withicon, .restoreallitem, .bookmark-item)[checked="true"] > .toolbarbutton-icon {
+  visibility: hidden;
+}
+
+menuitem.subviewbutton {
+  -moz-appearance: none !important;
+}
+
+menu.subviewbutton > .menu-right {
+  -moz-appearance: none;
+  list-style-image: url(chrome://browser/skin/places/bookmarks-menu-arrow.png);
+  -moz-image-region: rect(0, 16px, 16px, 0);
+  width: 16px;
+  height: 16px;
+}
+
+menu[disabled="true"].subviewbutton > .menu-right {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+menu.subviewbutton > .menu-right:-moz-locale-dir(rtl) {
+  transform: scaleX(-1);
+}
+
+.subviewbutton > .toolbarbutton-icon {
+  margin-inline-end: 5px !important;
+}
+
+.subviewbutton > .menu-right,
+.subviewbutton > .menu-iconic-left {
+  padding-top: 1px;
+  /* These need !important to override menu.css */
+  margin-top: 1px !important;
+  margin-bottom: 2px !important;
+}
+
+.subviewradio > .radio-label-box {
+  -moz-appearance: none;
+}