Backed out changeset 3fc5a790f110 (bug 1191230) for Windows and b2g emulator build bustage CLOSED TREE

This commit is contained in:
Wes Kocher 2015-12-14 10:19:11 -08:00
parent ca1e70f7b0
commit 582fd23fc0
19 changed files with 26 additions and 136 deletions

View File

@ -123,7 +123,7 @@ groupbox.collapsable caption .caption-icon {
background-position: center;
-moz-margin-start: 2px;
-moz-margin-end: 2px;
background-image: url("chrome://global/skin/tree/twisty.svg#open");
background-image: url("chrome://global/skin/tree/twisty-open.png");
}
groupbox.collapsable[closed="true"] {
@ -133,7 +133,7 @@ groupbox.collapsable[closed="true"] {
}
groupbox.collapsable[closed="true"] caption .caption-icon {
background-image: url("chrome://global/skin/tree/twisty.svg#clsd");
background-image: url("chrome://global/skin/tree/twisty-clsd.png");
}
groupbox tree {

View File

@ -57,5 +57,3 @@ toolkit.jar:
* 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)

View File

@ -131,6 +131,14 @@
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)

View File

@ -138,11 +138,11 @@ button[type="disclosure"] {
margin: 0px !important;
padding: 0px !important;
-moz-appearance: none;
list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd");
list-style-image: url("chrome://global/skin/tree/twisty-clsd.png");
min-width: 0px !important;
background-color: transparent;
}
button[type="disclosure"][open="true"] {
list-style-image: url("chrome://global/skin/tree/twisty.svg#open");
list-style-image: url("chrome://global/skin/tree/twisty-open.png");
}

View File

@ -93,9 +93,8 @@ toolkit.jar:
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.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)
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)
#if MOZ_BUILD_APP == browser
[browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
@ -138,20 +137,10 @@ toolkit.jar:
% 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

View File

@ -317,11 +317,12 @@ 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.svg#clsd");
list-style-image: url("chrome://global/skin/tree/twisty-clsd.png");
}
treechildren::-moz-tree-twisty(open) {
list-style-image: url("chrome://global/skin/tree/twisty.svg#open");
width: 9px; /* The image's width is 9 pixels */
list-style-image: url("chrome://global/skin/tree/twisty-open.png");
}
treechildren::-moz-tree-indentation {
@ -372,30 +373,31 @@ treechildren::-moz-tree-cell-text(selected, editing) {
treechildren::-moz-tree-twisty {
-moz-padding-end: 1px;
width: 9px;
}
treechildren::-moz-tree-twisty(hover) {
list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-hover");
list-style-image: url("chrome://global/skin/tree/twisty-clsd-hover.png");
}
treechildren::-moz-tree-twisty(hover, open) {
list-style-image: url("chrome://global/skin/tree/twisty.svg#open-hover");
list-style-image: url("chrome://global/skin/tree/twisty-open-hover.png");
}
treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty {
list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-rtl");
list-style-image: url("chrome://global/skin/tree/twisty-clsd-rtl.png");
}
treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(open) {
list-style-image: url("chrome://global/skin/tree/twisty.svg#open-rtl");
list-style-image: url("chrome://global/skin/tree/twisty-open-rtl.png");
}
treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(hover) {
list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-hover-rtl");
list-style-image: url("chrome://global/skin/tree/twisty-clsd-hover-rtl.png");
}
treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(hover, open) {
list-style-image: url("chrome://global/skin/tree/twisty.svg#open-hover-rtl");
list-style-image: url("chrome://global/skin/tree/twisty-open-hover-rtl.png");
}
@media (-moz-windows-default-theme) {

View File

@ -1,39 +0,0 @@
<?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>

Before

Width:  |  Height:  |  Size: 1.3 KiB

View File

@ -1,33 +0,0 @@
<?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>

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 235 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 181 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 179 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 227 B

View File

Before

Width:  |  Height:  |  Size: 221 B

After

Width:  |  Height:  |  Size: 221 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 232 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 180 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 179 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 189 B

View File

Before

Width:  |  Height:  |  Size: 192 B

After

Width:  |  Height:  |  Size: 192 B

View File

@ -1,35 +0,0 @@
<?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>

Before

Width:  |  Height:  |  Size: 1.2 KiB