# HG changeset patch
# User Richard Marti <richard.marti@gmail.com>
# Date 1529846793 -7200
# Node ID 93972d67be617f39abd66ef8de1063047b7213ba
# Parent  c712a2cc8fa086e01dd4d8e9ce7680339c1b1fda
Bug 1400266 - Use SVG icons for the twisties on Linux. r=dao

diff --git a/browser/themes/linux/syncedtabs/sidebar.css b/browser/themes/linux/syncedtabs/sidebar.css
--- a/browser/themes/linux/syncedtabs/sidebar.css
+++ b/browser/themes/linux/syncedtabs/sidebar.css
@@ -45,17 +45,30 @@ html {
   vertical-align: middle;
 }
 
 .textbox-search-icon[searchbutton]:not([disabled]) ,
 .textbox-search-clear:not([disabled]) {
   cursor: pointer;
 }
 
+.item-twisty-container {
+  background-size: contain;
+  background-repeat: no-repeat;
+  background-position: center;
+  min-width: 9px; /* The image's width is 9 pixels */
+  height: 9px;
+  margin: auto;
+}
+
 .item.client .item-twisty-container {
-  -moz-appearance: treetwistyopen;
-  margin-top: 3px;
-  margin-left: 2px;
+  background-image: url("chrome://global/skin/tree/twisty-expanded.svg");
+  -moz-context-properties: fill;
+  fill: currentColor;
 }
 
 .item.client.closed .item-twisty-container {
-  -moz-appearance: treetwisty;
+  background-image: url("chrome://global/skin/tree/twisty-collapsed.svg");
 }
+
+.item.client.closed .item-twisty-container:dir(rtl) {
+  background-image: url("chrome://global/skin/tree/twisty-collapsed-rtl.svg");
+}
diff --git a/browser/themes/windows/syncedtabs/sidebar.css b/browser/themes/windows/syncedtabs/sidebar.css
--- a/browser/themes/windows/syncedtabs/sidebar.css
+++ b/browser/themes/windows/syncedtabs/sidebar.css
@@ -92,19 +92,18 @@
   background-position: center;
   min-width: 9px; /* The image's width is 9 pixels */
   height: 9px;
   margin: auto;
 }
 
 .item.client .item-twisty-container {
   background-image: url("chrome://global/skin/tree/twisty-expanded.svg");
-  -moz-context-properties: fill, fill-opacity;
+  -moz-context-properties: fill;
   fill: #636363;
-  fill-opacity: 1;
 }
 
 .item.client.closed .item-twisty-container {
   background-image: url("chrome://global/skin/tree/twisty-collapsed.svg");
   fill: #b6b6b6;
 }
 
 .item.client.closed .item-twisty-container:dir(rtl) {
diff --git a/toolkit/themes/linux/global/button.css b/toolkit/themes/linux/global/button.css
--- a/toolkit/themes/linux/global/button.css
+++ b/toolkit/themes/linux/global/button.css
@@ -67,15 +67,17 @@ button[type="menu-button"] {
 button.plain {
   margin: 0 !important;
   padding: 0 !important;
 }
 
 button[type="disclosure"] {
   margin: 0;
   -moz-appearance: none;
-  list-style-image: url("chrome://global/skin/tree/twisty-clsd.png");
+  list-style-image: url("chrome://global/skin/tree/twisty-collapsed.svg");
+  -moz-context-properties: fill;
+  fill: currentColor;
   min-width: 0;
 }
 
 button[type="disclosure"][open="true"] {
-  list-style-image: url("chrome://global/skin/tree/twisty-open.png"); 
+  list-style-image: url("chrome://global/skin/tree/twisty-expanded.svg");
 }
diff --git a/toolkit/themes/linux/global/jar.mn b/toolkit/themes/linux/global/jar.mn
--- a/toolkit/themes/linux/global/jar.mn
+++ b/toolkit/themes/linux/global/jar.mn
@@ -47,10 +47,11 @@ toolkit.jar:
    skin/classic/global/icons/Minimize.gif                      (icons/Minimize.gif)
    skin/classic/global/icons/resizer.png                       (icons/resizer.png)
    skin/classic/global/icons/Restore.gif                       (icons/Restore.gif)
    skin/classic/global/icons/sslWarning.png                    (icons/sslWarning.png)
 
 *  skin/classic/global/in-content/common.css                   (in-content/common.css)
 *  skin/classic/global/in-content/info-pages.css               (in-content/info-pages.css)
    skin/classic/global/toolbar/spring.png                      (toolbar/spring.png)
-   skin/classic/global/tree/twisty-clsd.png                    (tree/twisty-clsd.png)
-   skin/classic/global/tree/twisty-open.png                    (tree/twisty-open.png)
+   skin/classic/global/tree/twisty-collapsed.svg               (tree/twisty-collapsed.svg)
+   skin/classic/global/tree/twisty-collapsed-rtl.svg           (tree/twisty-collapsed-rtl.svg)
+   skin/classic/global/tree/twisty-expanded.svg                (tree/twisty-expanded.svg)
diff --git a/toolkit/themes/linux/global/tree.css b/toolkit/themes/linux/global/tree.css
--- a/toolkit/themes/linux/global/tree.css
+++ b/toolkit/themes/linux/global/tree.css
@@ -15,17 +15,17 @@ tree {
   background-color: -moz-Field;
   color: -moz-FieldText;
   -moz-appearance: listbox;
 }
 
 /* ::::: tree focusring ::::: */
 
 .focusring > .tree-stack > .tree-rows > .tree-bodybox {
-  border: 1px solid transparent;  
+  border: 1px solid transparent;
 }
 
 .focusring:focus > .tree-stack > .tree-rows > .tree-bodybox {
   border: 1px solid #000000;
 }
 
 
 /* ::::: tree rows ::::: */
@@ -240,27 +240,34 @@ treechildren::-moz-tree-column(insertaft
 
 .tree-columnpicker-icon {
   list-style-image: url("chrome://global/skin/tree/columnpicker.gif");
 }
 
 /* ::::: twisty :::::  */
 
 treechildren::-moz-tree-twisty {
-  -moz-appearance: treetwisty;
   padding-inline-end: 4px;
   padding-top: 1px;
   width: 9px; /* The image's width is 9 pixels */
-  list-style-image: url("chrome://global/skin/tree/twisty-clsd.png");
+  list-style-image: url("chrome://global/skin/tree/twisty-collapsed.svg");
+  -moz-context-properties: fill;
+  fill: currentColor;
+}
+
+treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(close) {
+  list-style-image: url("chrome://global/skin/tree/twisty-collapsed-rtl.svg");
 }
 
 treechildren::-moz-tree-twisty(open) {
-  -moz-appearance: treetwistyopen;
-  width: 9px; /* The image's width is 9 pixels */
-  list-style-image: url("chrome://global/skin/tree/twisty-open.png");
+  list-style-image: url("chrome://global/skin/tree/twisty-expanded.svg");
+}
+
+treechildren::-moz-tree-twisty(selected) {
+  fill: -moz-cellhighlighttext;
 }
 
 treechildren::-moz-tree-indentation {
   width: 18px;
 }
 
 /* ::::: editable tree ::::: */
 
diff --git a/toolkit/themes/linux/global/tree/twisty-clsd.png b/toolkit/themes/linux/global/tree/twisty-clsd.png
deleted file mode 100644
index f67f60cd003d2588189d6c8b17d0e473435b7e0a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

diff --git a/toolkit/themes/linux/global/tree/twisty-collapsed-rtl.svg b/toolkit/themes/linux/global/tree/twisty-collapsed-rtl.svg
new file mode 100644
--- /dev/null
+++ b/toolkit/themes/linux/global/tree/twisty-collapsed-rtl.svg
@@ -0,0 +1,6 @@
+<!-- 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/. -->
+<svg width="9" height="9" xmlns="http://www.w3.org/2000/svg" stroke="context-fill" stroke-width="1.6" fill="none">
+  <path d="m 6.5,0.5 -4,4 4,4"/>
+</svg>
diff --git a/toolkit/themes/linux/global/tree/twisty-collapsed.svg b/toolkit/themes/linux/global/tree/twisty-collapsed.svg
new file mode 100644
--- /dev/null
+++ b/toolkit/themes/linux/global/tree/twisty-collapsed.svg
@@ -0,0 +1,6 @@
+<!-- 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/. -->
+<svg width="9" height="9" xmlns="http://www.w3.org/2000/svg" stroke="context-fill" stroke-width="1.6" fill="none">
+  <path d="m 2.5,0.5 4,4 -4,4"/>
+</svg>
diff --git a/toolkit/themes/linux/global/tree/twisty-expanded.svg b/toolkit/themes/linux/global/tree/twisty-expanded.svg
new file mode 100644
--- /dev/null
+++ b/toolkit/themes/linux/global/tree/twisty-expanded.svg
@@ -0,0 +1,6 @@
+<!-- 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/. -->
+<svg width="9" height="9" xmlns="http://www.w3.org/2000/svg" stroke="context-fill" stroke-width="1.6" fill="none">
+  <path d="m 8.5,2.5 -4,4 -4,-4"/>
+</svg>
diff --git a/toolkit/themes/linux/global/tree/twisty-open.png b/toolkit/themes/linux/global/tree/twisty-open.png
deleted file mode 100644
index b8b7583bf80663dce1a3c960999d42248202804c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

diff --git a/toolkit/themes/windows/global/button.css b/toolkit/themes/windows/global/button.css
--- a/toolkit/themes/windows/global/button.css
+++ b/toolkit/themes/windows/global/button.css
@@ -104,17 +104,16 @@ button.plain {
   margin: 0 !important;
   padding: 0 !important;
 }
 
 button[type="disclosure"] {
   margin: 0;
   -moz-appearance: none;
   list-style-image: url("chrome://global/skin/tree/twisty-collapsed.svg");
-  -moz-context-properties: fill, fill-opacity;
+  -moz-context-properties: fill;
   fill: currentColor;
-  fill-opacity: 1;
   min-width: 0;
 }
 
 button[type="disclosure"][open="true"] {
   list-style-image: url("chrome://global/skin/tree/twisty-expanded.svg");
 }
diff --git a/toolkit/themes/windows/global/tree.css b/toolkit/themes/windows/global/tree.css
--- a/toolkit/themes/windows/global/tree.css
+++ b/toolkit/themes/windows/global/tree.css
@@ -274,19 +274,18 @@ treecol:not([hideheader="true"]) > .tree
 
 /* ::::: twisty :::::  */
 
 treechildren::-moz-tree-twisty {
   padding-inline-end: 1px;
   padding-top: 1px;
   width: 9px; /* The image's width is 9 pixels */
   list-style-image: url("chrome://global/skin/tree/twisty-collapsed.svg");
-  -moz-context-properties: fill, fill-opacity;
+  -moz-context-properties: fill;
   fill: #b6b6b6;
-  fill-opacity: 1;
 }
 
 treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(close) {
   list-style-image: url("chrome://global/skin/tree/twisty-collapsed-rtl.svg");
 }
 
 treechildren::-moz-tree-twisty(open) {
   list-style-image: url("chrome://global/skin/tree/twisty-expanded.svg");
diff --git a/toolkit/themes/windows/global/tree/twisty-collapsed-rtl.svg b/toolkit/themes/windows/global/tree/twisty-collapsed-rtl.svg
--- a/toolkit/themes/windows/global/tree/twisty-collapsed-rtl.svg
+++ b/toolkit/themes/windows/global/tree/twisty-collapsed-rtl.svg
@@ -1,6 +1,6 @@
 <!-- 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/. -->
-<svg width="9" height="9" xmlns="http://www.w3.org/2000/svg" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-width="1.6" fill="none">
-    <path d="m 6.5,0.5 -4,4 4,4"/>
+<svg width="9" height="9" xmlns="http://www.w3.org/2000/svg" stroke="context-fill" stroke-width="1.6" fill="none">
+  <path d="m 6.5,0.5 -4,4 4,4"/>
 </svg>
diff --git a/toolkit/themes/windows/global/tree/twisty-collapsed.svg b/toolkit/themes/windows/global/tree/twisty-collapsed.svg
--- a/toolkit/themes/windows/global/tree/twisty-collapsed.svg
+++ b/toolkit/themes/windows/global/tree/twisty-collapsed.svg
@@ -1,6 +1,6 @@
 <!-- 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/. -->
-<svg width="9" height="9" xmlns="http://www.w3.org/2000/svg" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-width="1.6" fill="none">
-    <path d="m 2.5,0.5 4,4 -4,4"/>
+<svg width="9" height="9" xmlns="http://www.w3.org/2000/svg" stroke="context-fill" stroke-width="1.6" fill="none">
+  <path d="m 2.5,0.5 4,4 -4,4"/>
 </svg>
diff --git a/toolkit/themes/windows/global/tree/twisty-expanded.svg b/toolkit/themes/windows/global/tree/twisty-expanded.svg
--- a/toolkit/themes/windows/global/tree/twisty-expanded.svg
+++ b/toolkit/themes/windows/global/tree/twisty-expanded.svg
@@ -1,6 +1,6 @@
 <!-- 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/. -->
-<svg width="9" height="9" xmlns="http://www.w3.org/2000/svg" stroke="context-fill" stroke-opacity="context-fill-opacity" stroke-width="1.6" fill="none">
-    <path d="m 8.5,2.5 -4,4 -4,-4"/>
+<svg width="9" height="9" xmlns="http://www.w3.org/2000/svg" stroke="context-fill" stroke-width="1.6" fill="none">
+  <path d="m 8.5,2.5 -4,4 -4,-4"/>
 </svg>