Bug 1191230 - Add Windows 10 twisties. r=Gijs a=sylvestre
authorRichard Marti <richard.marti@gmail.com>
Wed, 09 Dec 2015 18:20:25 +0100
changeset 310485 cefffada2592ff0f8f43912ca8bfc44dace3bb79
parent 310484 88d3b4cf0b291113dc4186184ebd3520f0e4da40
child 310486 9d71fae90c12db027bddb46c415d7c61ec550feb
push id5513
push userraliiev@mozilla.com
push dateMon, 25 Jan 2016 13:55:34 +0000
treeherdermozilla-beta@5ee97dd05b5c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersGijs, sylvestre
bugs1191230
milestone45.0a2
Bug 1191230 - Add Windows 10 twisties. r=Gijs a=sylvestre
browser/themes/windows/pageInfo.css
toolkit/themes/linux/global/jar.mn
toolkit/themes/linux/global/tree/twisty-clsd.png
toolkit/themes/linux/global/tree/twisty-open.png
toolkit/themes/shared/non-mac.jar.inc.mn
toolkit/themes/windows/global/button.css
toolkit/themes/windows/global/jar.mn
toolkit/themes/windows/global/tree.css
toolkit/themes/windows/global/tree/twisty-Vista78.svg
toolkit/themes/windows/global/tree/twisty-XP.svg
toolkit/themes/windows/global/tree/twisty-clsd-XP.png
toolkit/themes/windows/global/tree/twisty-clsd-hover-rtl.png
toolkit/themes/windows/global/tree/twisty-clsd-hover.png
toolkit/themes/windows/global/tree/twisty-clsd-rtl.png
toolkit/themes/windows/global/tree/twisty-clsd.png
toolkit/themes/windows/global/tree/twisty-open-XP.png
toolkit/themes/windows/global/tree/twisty-open-hover-rtl.png
toolkit/themes/windows/global/tree/twisty-open-hover.png
toolkit/themes/windows/global/tree/twisty-open-rtl.png
toolkit/themes/windows/global/tree/twisty-open.png
toolkit/themes/windows/global/tree/twisty.svg
--- a/browser/themes/windows/pageInfo.css
+++ b/browser/themes/windows/pageInfo.css
@@ -118,27 +118,27 @@ textbox[disabled] {
 /* General Tab */
 groupbox.collapsable caption .caption-icon {
   width: 9px;
   height: 9px;
   background-repeat: no-repeat;
   background-position: center;
   -moz-margin-start: 2px;
   -moz-margin-end: 2px;
-  background-image: url("chrome://global/skin/tree/twisty-open.png");
+  background-image: url("chrome://global/skin/tree/twisty.svg#open");
 }
 
 groupbox.collapsable[closed="true"] {
   border: none;
   margin-bottom: 9px;
   -moz-appearance: none;
 }
 
 groupbox.collapsable[closed="true"] caption .caption-icon {
-  background-image: url("chrome://global/skin/tree/twisty-clsd.png");
+  background-image: url("chrome://global/skin/tree/twisty.svg#clsd");
 }
 
 groupbox tree {
   margin: 0 3px;
   border: none;
 }
 
 #securityBox description {
--- a/toolkit/themes/linux/global/jar.mn
+++ b/toolkit/themes/linux/global/jar.mn
@@ -52,8 +52,10 @@ toolkit.jar:
    skin/classic/global/icons/resizer.png                       (icons/resizer.png)
    skin/classic/global/icons/sslWarning.png                    (icons/sslWarning.png)
    skin/classic/global/icons/webapps-16.png                    (icons/webapps-16.png)
    skin/classic/global/icons/webapps-64.png                    (icons/webapps-64.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)
rename from toolkit/themes/windows/global/tree/twisty-clsd.png
rename to toolkit/themes/linux/global/tree/twisty-clsd.png
rename from toolkit/themes/windows/global/tree/twisty-open.png
rename to toolkit/themes/linux/global/tree/twisty-open.png
--- a/toolkit/themes/shared/non-mac.jar.inc.mn
+++ b/toolkit/themes/shared/non-mac.jar.inc.mn
@@ -126,24 +126,16 @@
   skin/classic/global/splitter/grip-right.gif              (../../windows/global/splitter/grip-right.gif)
   skin/classic/global/toolbar/chevron.gif                  (../../windows/global/toolbar/chevron.gif)
   skin/classic/global/toolbar/chevron-inverted.png         (../../windows/global/toolbar/chevron-inverted.png)
   skin/classic/global/tree/columnpicker.gif                (../../windows/global/tree/columnpicker.gif)
   skin/classic/global/tree/sort-asc.png                    (../../windows/global/tree/sort-asc.png)
   skin/classic/global/tree/sort-dsc.png                    (../../windows/global/tree/sort-dsc.png)
   skin/classic/global/tree/sort-asc-classic.png            (../../windows/global/tree/sort-asc-classic.png)
   skin/classic/global/tree/sort-dsc-classic.png            (../../windows/global/tree/sort-dsc-classic.png)
-  skin/classic/global/tree/twisty-clsd.png                 (../../windows/global/tree/twisty-clsd.png)
-  skin/classic/global/tree/twisty-clsd-rtl.png             (../../windows/global/tree/twisty-clsd-rtl.png)
-  skin/classic/global/tree/twisty-clsd-hover.png           (../../windows/global/tree/twisty-clsd-hover.png)
-  skin/classic/global/tree/twisty-clsd-hover-rtl.png       (../../windows/global/tree/twisty-clsd-hover-rtl.png)
-  skin/classic/global/tree/twisty-open.png                 (../../windows/global/tree/twisty-open.png)
-  skin/classic/global/tree/twisty-open-rtl.png             (../../windows/global/tree/twisty-open-rtl.png)
-  skin/classic/global/tree/twisty-open-hover.png           (../../windows/global/tree/twisty-open-hover.png)
-  skin/classic/global/tree/twisty-open-hover-rtl.png       (../../windows/global/tree/twisty-open-hover-rtl.png)
 
   skin/classic/help/Toolbar.png                            (../../windows/help/Toolbar.png)
   skin/classic/help/Toolbar-rtl.png                        (../../windows/help/Toolbar-rtl.png)
   skin/classic/help/helpFileLayout.css                     (../../windows/help/helpFileLayout.css)
   skin/classic/help/Weblink.png                            (../../windows/help/Weblink.png)
   skin/classic/help/Weblink-rtl.png                        (../../windows/help/Weblink-rtl.png)
 
   skin/classic/mozapps/downloads/downloadButtons.png         (../../windows/mozapps/downloads/downloadButtons.png)
--- a/toolkit/themes/windows/global/button.css
+++ b/toolkit/themes/windows/global/button.css
@@ -133,16 +133,16 @@ button.plain {
   padding: 0px !important;
 }
 
 button[type="disclosure"] {
   border: 0px !important;
   margin: 0px !important;
   padding: 0px !important;
   -moz-appearance: none;
-  list-style-image: url("chrome://global/skin/tree/twisty-clsd.png");
+  list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd");
   min-width: 0px !important;
   background-color: transparent;
 }
 
 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.svg#open");
 }
--- a/toolkit/themes/windows/global/jar.mn
+++ b/toolkit/themes/windows/global/jar.mn
@@ -88,18 +88,19 @@ toolkit.jar:
   skin/classic/global/icons/windowControls-XP.png                (icons/windowControls-XP.png)
   skin/classic/global/printpreview/arrow-left-XP.png             (printpreview/arrow-left-XP.png)
   skin/classic/global/printpreview/arrow-left-end-XP.png         (printpreview/arrow-left-end-XP.png)
   skin/classic/global/printpreview/arrow-right-XP.png            (printpreview/arrow-right-XP.png)
   skin/classic/global/printpreview/arrow-right-end-XP.png        (printpreview/arrow-right-end-XP.png)
   skin/classic/global/toolbar/spring-XP.png                      (toolbar/spring-XP.png)
   skin/classic/global/tree/sort-asc-XP.png                       (tree/sort-asc-XP.png)
   skin/classic/global/tree/sort-dsc-XP.png                       (tree/sort-dsc-XP.png)
-  skin/classic/global/tree/twisty-clsd-XP.png                    (tree/twisty-clsd-XP.png)
-  skin/classic/global/tree/twisty-open-XP.png                    (tree/twisty-open-XP.png)
+  skin/classic/global/tree/twisty.svg                            (tree/twisty.svg)
+  skin/classic/global/tree/twisty-XP.svg                         (tree/twisty-XP.svg)
+  skin/classic/global/tree/twisty-Vista78.svg                    (tree/twisty-Vista78.svg)
 
 #if MOZ_BUILD_APP == browser
 [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES
 [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 #endif
 % override chrome://global/skin/console/console-toolbar.png       chrome://global/skin/console/console-toolbar-XP.png      osversion<6
 % override chrome://global/skin/dirListing/folder.png             chrome://global/skin/dirListing/folder-XP.png            osversion<6
@@ -132,15 +133,25 @@ toolkit.jar:
 % override chrome://global/skin/icons/windowControls.png          chrome://global/skin/icons/windowControls-XP.png         osversion<6
 % override chrome://global/skin/printpreview/arrow-left.png       chrome://global/skin/printpreview/arrow-left-XP.png      osversion<6
 % override chrome://global/skin/printpreview/arrow-left-end.png   chrome://global/skin/printpreview/arrow-left-end-XP.png  osversion<6
 % override chrome://global/skin/printpreview/arrow-right.png      chrome://global/skin/printpreview/arrow-right-XP.png     osversion<6
 % override chrome://global/skin/printpreview/arrow-right-end.png  chrome://global/skin/printpreview/arrow-right-end-XP.png osversion<6
 % override chrome://global/skin/toolbar/spring.png                chrome://global/skin/toolbar/spring-XP.png               osversion<6
 % override chrome://global/skin/tree/sort-asc.png                 chrome://global/skin/tree/sort-asc-XP.png                osversion<6
 % override chrome://global/skin/tree/sort-dsc.png                 chrome://global/skin/tree/sort-dsc-XP.png                osversion<6
-% override chrome://global/skin/tree/twisty-clsd.png              chrome://global/skin/tree/twisty-clsd-XP.png             osversion<6
-% override chrome://global/skin/tree/twisty-open.png              chrome://global/skin/tree/twisty-open-XP.png             osversion<6
 
 % override chrome://global/skin/icons/close.png                   chrome://global/skin/icons/close-XPVista7.png            osversion<=6.1
 % override chrome://global/skin/icons/close@2x.png                chrome://global/skin/icons/close-XPVista7@2x.png         osversion<=6.1
 % override chrome://global/skin/icons/close-inverted.png          chrome://global/skin/icons/close-inverted-XPVista7.png   osversion<=6.1
 % override chrome://global/skin/icons/close-inverted@2x.png       chrome://global/skin/icons/close-inverted-XPVista7@2x.png osversion<=6.1
+
+% override chrome://global/skin/tree/twisty.svg#clsd              chrome://global/skin/tree/twisty-Vista78.svg#clsd           osversion<=6.3
+% override chrome://global/skin/tree/twisty.svg#clsd-rtl          chrome://global/skin/tree/twisty-Vista78.svg#clsd-rtl       osversion<=6.3
+% override chrome://global/skin/tree/twisty.svg#clsd-hover        chrome://global/skin/tree/twisty-Vista78.svg#clsd-hover     osversion<=6.3
+% override chrome://global/skin/tree/twisty.svg#clsd-hover-rtl    chrome://global/skin/tree/twisty-Vista78.svg#clsd-hover-rtl osversion<=6.3
+% override chrome://global/skin/tree/twisty.svg#open              chrome://global/skin/tree/twisty-Vista78.svg#open           osversion<=6.3
+% override chrome://global/skin/tree/twisty.svg#open-rtl          chrome://global/skin/tree/twisty-Vista78.svg#open-rtl       osversion<=6.3
+% override chrome://global/skin/tree/twisty.svg#open-hover        chrome://global/skin/tree/twisty-Vista78.svg#open-hover     osversion<=6.3
+% override chrome://global/skin/tree/twisty.svg#open-hover-rtl    chrome://global/skin/tree/twisty-Vista78.svg#open-hover-rtl osversion<=6.3
+# to be sure osversion<6 has always higher precedence than osversion<=6.3 we override twisty-Vista78.svg instead of twisty.svg
+% override chrome://global/skin/tree/twisty-Vista78.svg#clsd      chrome://global/skin/tree/twisty-XP.svg#clsd                osversion<6
+% override chrome://global/skin/tree/twisty-Vista78.svg#open      chrome://global/skin/tree/twisty-XP.svg#open                osversion<6
--- a/toolkit/themes/windows/global/tree.css
+++ b/toolkit/themes/windows/global/tree.css
@@ -312,22 +312,21 @@ treecol:not([hideheader="true"]) > .tree
 }
 
 /* ::::: twisty :::::  */
 
 treechildren::-moz-tree-twisty {
   -moz-padding-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.svg#clsd");
 }
 
 treechildren::-moz-tree-twisty(open) {
-  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.svg#open");
 }
 
 treechildren::-moz-tree-indentation {
   width: 18px;
 }
 
 /* ::::: gridline style ::::: */
 
@@ -368,41 +367,40 @@ treechildren::-moz-tree-cell-text(select
   /* ::::: twisty :::::  */
 
   treechildren::-moz-tree-indentation {
     width: 12px;
   }
 
   treechildren::-moz-tree-twisty {
     -moz-padding-end: 1px;
-    width: 9px;
   }
 
   treechildren::-moz-tree-twisty(hover) {
-    list-style-image: url("chrome://global/skin/tree/twisty-clsd-hover.png");
+    list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-hover");
   }
 
   treechildren::-moz-tree-twisty(hover, open) {
-    list-style-image: url("chrome://global/skin/tree/twisty-open-hover.png");
+    list-style-image: url("chrome://global/skin/tree/twisty.svg#open-hover");
   }
 
   treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty {
-    list-style-image: url("chrome://global/skin/tree/twisty-clsd-rtl.png");
+    list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-rtl");
   }
 
   treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(open) {
-    list-style-image: url("chrome://global/skin/tree/twisty-open-rtl.png");
+    list-style-image: url("chrome://global/skin/tree/twisty.svg#open-rtl");
   }
 
   treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(hover) {
-    list-style-image: url("chrome://global/skin/tree/twisty-clsd-hover-rtl.png");
+    list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-hover-rtl");
   }
 
   treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(hover, open) {
-    list-style-image: url("chrome://global/skin/tree/twisty-open-hover-rtl.png");
+    list-style-image: url("chrome://global/skin/tree/twisty.svg#open-hover-rtl");
   }
 
   @media (-moz-windows-default-theme) {
     treechildren {
       --treechildren-outline: none;
       --treechildren-2ndBorderColor: rgba(255,255,255,.4);
       --treechildren-selectedColor: rgb(217,217,217);
       --treechildren-focusColor: rgb(123,195,255);
new file mode 100644
--- /dev/null
+++ b/toolkit/themes/windows/global/tree/twisty-Vista78.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<!-- 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="9" height="9">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      stroke: #74747b;
+      stroke-opacity: 0.85;
+      fill: none;
+    }
+    use[id^="open"] {
+      stroke: #636363;
+      stroke-opacity: 1;
+    }
+    use[id*="-hover"] {
+      stroke: #1cc4f7;
+      stroke-opacity: 1;
+      fill: #c0e8f9;
+    }
+  </style>
+  <defs>
+    <path id="clsd-shape" d="m 2.5,0.5 4,4 -4,4 z"/>
+    <path id="open-shape" d="M 7.5,3 7.5,7.5 3,7.5 3,6.5 6.5,3 Z"/>
+    <path id="clsd-rtl-shape" d="m 6.5,0.5 -4,4 4,4 z"/>
+    <path id="open-rtl-shape" d="m 1.5,3 0,4.5 4.5,0 0,-1 L 2.5,3 Z"/>
+  </defs>
+  <use id="clsd" xlink:href="#clsd-shape"/>
+  <use id="clsd-hover" xlink:href="#clsd-shape"/>
+  <use id="open" xlink:href="#open-shape"/>
+  <use id="open-hover" xlink:href="#open-shape"/>
+  <use id="clsd-rtl" xlink:href="#clsd-rtl-shape"/>
+  <use id="clsd-hover-rtl" xlink:href="#clsd-rtl-shape"/>
+  <use id="open-rtl" xlink:href="#open-rtl-shape"/>
+  <use id="open-hover-rtl" xlink:href="#open-rtl-shape"/>
+</svg>
new file mode 100644
--- /dev/null
+++ b/toolkit/themes/windows/global/tree/twisty-XP.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!-- 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="9" height="9">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      stroke: #000000;
+      stroke-width: 1;
+    }
+  </style>
+  <defs>
+    <linearGradient id="linearGradient1">
+      <stop style="stop-color: #ffffff;" offset="0"/>
+      <stop style="stop-color: #e0e0e0;" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient2">
+      <stop style="stop-color: #c9c9c9;" offset="0"/>
+      <stop style="stop-color: #f8f8f8;" offset="1"/>
+    </linearGradient>
+    <linearGradient id="gradient1" xlink:href="#linearGradient1" gradientUnits="userSpaceOnUse" x1="4.5" y1="2" x2="4.5" y2="7"/>
+    <linearGradient id="gradient2" xlink:href="#linearGradient2" gradientUnits="userSpaceOnUse" x1="4.5" y1="6" x2="4.5" y2="3"/>
+    <path id="clsd-shape" d="m 2,4.5 5,0 M 4.5,2 l 0,5"/>
+    <path id="open-shape" d="m 2,4.5 5,0"/>
+  </defs>
+  <rect style="fill: url(#gradient1); stroke: #5d5cc2; stroke-linejoin: round; stroke-opacity: 0.8" width="8" height="8" x="0.5" y="0.5"/>
+  <rect style="fill: url(#gradient2);" width="5" height="5" x="2" y="2"/>
+  <use id="clsd" xlink:href="#clsd-shape"/>
+  <use id="open" xlink:href="#open-shape"/>
+</svg>
deleted file mode 100644
index 7fe7fb542f47344bf71b319f326f617b43fc56b0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 1b651975884eca0dfecfa1a2fca628c77411233c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 763c1da1c187d7cc1e1e0c83d0402a0731826882..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 02f4e32c375e3013aee9859859c67cd140ce847c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index df66d771c347df2fa658659e0c0882ba2fe0d39d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index a0157cc3a929bdf282be0644e421b79dc0d7eadb..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 31c9478a4dafcb7359a34be516c74c728a89ac78..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 4e606d22ed9f2ccbdc5315cec8d39c0c568e0765..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
--- /dev/null
+++ b/toolkit/themes/windows/global/tree/twisty.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!-- 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 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="9" height="9">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      stroke: #b6b6b6;
+      stroke-width: 1.6;
+      fill: none;
+    }
+    use[id^="open"] {
+      stroke: #636363;
+    }
+    use[id*="-hover"] {
+      stroke: #4ed0f9;
+    }
+  </style>
+  <defs>
+    <path id="clsd-shape" d="m 2.5,0.5 4,4 -4,4"/>
+    <path id="open-shape" d="m 8.5,2.5 -4,4 -4,-4"/>
+    <path id="clsd-rtl-shape" d="m 6.5,0.5 -4,4 4,4"/>
+  </defs>
+  <use id="clsd" xlink:href="#clsd-shape"/>
+  <use id="clsd-hover" xlink:href="#clsd-shape"/>
+  <use id="open" xlink:href="#open-shape"/>
+  <use id="open-hover" xlink:href="#open-shape"/>
+  <use id="clsd-rtl" xlink:href="#clsd-rtl-shape"/>
+  <use id="clsd-hover-rtl" xlink:href="#clsd-rtl-shape"/>
+  <use id="open-rtl" xlink:href="#open-shape"/>
+  <use id="open-hover-rtl" xlink:href="#open-shape"/>
+</svg>