wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1018796 - Update menulist arrow in inContent Prefs. r=jaws

Browse Source
This commit is contained in:
Tim Nguyen 2014-11-11 14:06:00 -05:00
parent a10aeb2bae
commit 28add4f9ba
9 changed files with 36 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
toolkit/themes/linux/global/jar.mn
View File

@ -58,10 +58,7 @@ toolkit.jar:
* skin/classic/global/in-content/common.css (in-content/common.css)
skin/classic/global/in-content/check.png (../../shared/in-content/check.png)
skin/classic/global/in-content/check@2x.png (../../shared/in-content/check@2x.png)
skin/classic/global/in-content/dropdown.png (../../shared/in-content/dropdown.png)
skin/classic/global/in-content/dropdown@2x.png (../../shared/in-content/dropdown@2x.png)
skin/classic/global/in-content/dropdown-disabled.png (../../shared/in-content/dropdown-disabled.png)
skin/classic/global/in-content/dropdown-disabled@2x.png (../../shared/in-content/dropdown-disabled@2x.png)
skin/classic/global/in-content/dropdown.svg (../../shared/in-content/dropdown.svg)
skin/classic/global/in-content/help-glyph.svg (../../shared/in-content/help-glyph.svg)
skin/classic/global/in-content/sorter.png (../../shared/in-content/sorter.png)
skin/classic/global/in-content/sorter@2x.png (../../shared/in-content/sorter@2x.png)

5
toolkit/themes/osx/global/jar.mn
View File

@ -188,10 +188,7 @@ toolkit.jar:
* skin/classic/global/in-content/common.css (in-content/common.css)
skin/classic/global/in-content/check.png (../../shared/in-content/check.png)
skin/classic/global/in-content/check@2x.png (../../shared/in-content/check@2x.png)
skin/classic/global/in-content/dropdown.png (../../shared/in-content/dropdown.png)
skin/classic/global/in-content/dropdown@2x.png (../../shared/in-content/dropdown@2x.png)
skin/classic/global/in-content/dropdown-disabled.png (../../shared/in-content/dropdown-disabled.png)
skin/classic/global/in-content/dropdown-disabled@2x.png (../../shared/in-content/dropdown-disabled@2x.png)
skin/classic/global/in-content/dropdown.svg (../../shared/in-content/dropdown.svg)
skin/classic/global/in-content/help-glyph.svg (../../shared/in-content/help-glyph.svg)
skin/classic/global/in-content/sorter.png (../../shared/in-content/sorter.png)
skin/classic/global/in-content/sorter@2x.png (../../shared/in-content/sorter@2x.png)

38
toolkit/themes/shared/in-content/common.inc.css
View File

@ -133,7 +133,6 @@ xul|menulist {
height: 30px;
color: #333;
line-height: 20px;
text-shadow: 0 1px 1px #fefffe;
border: 1px solid #c1c1c1;
-moz-border-top-colors: none !important;
-moz-border-right-colors: none !important;
@ -185,7 +184,7 @@ xul|button[type="menu"] > xul|*.button-box > xul|*.button-menu-dropmarker {
height: 16px;
border: none;
background-color: transparent;
list-style-image: url("chrome://global/skin/in-content/dropdown.png");
list-style-image: url("chrome://global/skin/in-content/dropdown.svg#dropdown");
}
xul|*.help-button {
@ -262,32 +261,20 @@ xul|*.spinbuttons-down[disabled="true"] > xul|*.button-box > xul|*.button-icon {
xul|menulist:not([editable="true"]) > xul|*.menulist-dropmarker {
-moz-appearance: none;
-moz-margin-end: 10px;
-moz-margin-end: 4px;
padding: 0;
border: none;
background-color: transparent;
list-style-image: url("chrome://global/skin/in-content/dropdown.png");
list-style-image: url("chrome://global/skin/in-content/dropdown.svg#dropdown");
}
xul|menulist:not([editable="true"]) > xul|*.menulist-dropmarker > xul|*.dropmarker-icon {
width: 18px;
height: 18px;
}
xul|menulist[disabled="true"]:not([editable="true"]) > xul|*.menulist-dropmarker {
list-style-image: url("chrome://global/skin/in-content/dropdown-disabled.png")
}
@media (min-resolution: 2dppx) {
xul|menulist:not([editable="true"]) > xul|*.menulist-dropmarker,
xul|button[type="menu"] > xul|*.button-box > xul|*.button-menu-dropmarker {
list-style-image: url("chrome://global/skin/in-content/dropdown@2x.png");
}
xul|menulist[disabled="true"]:not([editable="true"]) > xul|*.menulist-dropmarker {
list-style-image: url("chrome://global/skin/in-content/dropdown-disabled@2x.png")
}
xul|menulist:not([editable="true"]) > xul|*.menulist-dropmarker > xul|*.dropmarker-icon,
xul|button[type="menu"] > xul|*.button-box > xul|*.button-menu-dropmarker > xul|*.dropmarker-icon {
width: 10px;
height: 16px;
}
list-style-image: url("chrome://global/skin/in-content/dropdown.svg#dropdown-disabled")
}
xul|menulist > xul|menupopup,
@ -305,7 +292,7 @@ xul|button[type="menu"] > xul|menupopup xul|menuitem {
-moz-appearance: none;
font-size: 1.25rem;
line-height: 22px;
height: 40px;
height: 30px;
color: #333;
-moz-padding-start: 10px;
-moz-padding-end: 30px;
@ -316,8 +303,7 @@ xul|menulist > xul|menupopup > xul|menuitem[_moz-menuactive="true"],
xul|button[type="menu"] > xul|menupopup > xul|menu[_moz-menuactive="true"],
xul|button[type="menu"] > xul|menupopup > xul|menuitem[_moz-menuactive="true"] {
color: #333;
background-color: transparent;
background-image: linear-gradient(rgba(76,177,255,0.25), rgba(23,146,229,0.25));
background-color: rgba(0,149,221,0.25);
}
xul|menulist > xul|menupopup > xul|menu[selected="true"],
@ -325,7 +311,7 @@ xul|menulist > xul|menupopup > xul|menuitem[selected="true"],
xul|button[type="menu"] > xul|menupopup > xul|menu[selected="true"],
xul|button[type="menu"] > xul|menupopup > xul|menuitem[selected="true"] {
color: #fff;
background-image: linear-gradient(#4cb1ff, #1792e5);
background-color: #0095DD;
}
xul|menulist > xul|menupopup xul|menuseparator,

BIN
toolkit/themes/shared/in-content/dropdown-disabled.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 412 B

BIN
toolkit/themes/shared/in-content/dropdown-disabled@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 865 B

BIN
toolkit/themes/shared/in-content/dropdown.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 421 B

20
toolkit/themes/shared/in-content/dropdown.svg Normal file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
<style>
use:not(:target) {
display: none;
}
use {
fill: -moz-DialogText;
}
use[id$="-disabled"] {
fill: GrayText;
}
</style>
<defs style="display: none;">
<path id="dropdown-shape" fill-rule="evenodd" clip-rule="evenodd" d="M12,6l-4.016,4L4,6H12z"/>
</defs>
<use id="dropdown" xlink:href="#dropdown-shape"/>
<use id="dropdown-disabled" xlink:href="#dropdown-shape"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 669 B

BIN
toolkit/themes/shared/in-content/dropdown@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 885 B

10
toolkit/themes/windows/global/jar.mn
View File

@ -173,10 +173,7 @@ toolkit.jar:
* skin/classic/global/in-content/common.css (in-content/common.css)
skin/classic/global/in-content/check.png (../../shared/in-content/check.png)
skin/classic/global/in-content/check@2x.png (../../shared/in-content/check@2x.png)
skin/classic/global/in-content/dropdown.png (../../shared/in-content/dropdown.png)
skin/classic/global/in-content/dropdown@2x.png (../../shared/in-content/dropdown@2x.png)
skin/classic/global/in-content/dropdown-disabled.png (../../shared/in-content/dropdown-disabled.png)
skin/classic/global/in-content/dropdown-disabled@2x.png (../../shared/in-content/dropdown-disabled@2x.png)
skin/classic/global/in-content/dropdown.svg (../../shared/in-content/dropdown.svg)
skin/classic/global/in-content/help-glyph.svg (../../shared/in-content/help-glyph.svg)
skin/classic/global/in-content/sorter.png (../../shared/in-content/sorter.png)
skin/classic/global/in-content/sorter@2x.png (../../shared/in-content/sorter@2x.png)
@ -368,10 +365,7 @@ toolkit.jar:
* skin/classic/aero/global/in-content/common.css (in-content/common.css)
skin/classic/aero/global/in-content/check.png (../../shared/in-content/check.png)
skin/classic/aero/global/in-content/check@2x.png (../../shared/in-content/check@2x.png)
skin/classic/aero/global/in-content/dropdown.png (../../shared/in-content/dropdown.png)
skin/classic/aero/global/in-content/dropdown@2x.png (../../shared/in-content/dropdown@2x.png)
skin/classic/aero/global/in-content/dropdown-disabled.png (../../shared/in-content/dropdown-disabled.png)
skin/classic/aero/global/in-content/dropdown-disabled@2x.png (../../shared/in-content/dropdown-disabled@2x.png)
skin/classic/aero/global/in-content/dropdown.svg (../../shared/in-content/dropdown.svg)
skin/classic/aero/global/in-content/help-glyph.svg (../../shared/in-content/help-glyph.svg)
skin/classic/aero/global/in-content/sorter.png (../../shared/in-content/sorter.png)
skin/classic/aero/global/in-content/sorter@2x.png (../../shared/in-content/sorter@2x.png)