Bug 1022582 - Make in-content checkboxes and radiobuttons visible on HC themes. r=jaws

This commit is contained in:
Richard Marti 2014-12-10 20:44:29 +01:00
parent c5cd2452ec
commit 1bdad5564c
10 changed files with 92 additions and 24 deletions

View File

@ -46,12 +46,30 @@ xul|checkbox {
-moz-box-align: center;
}
xul|*.checkbox-check {
background-image: none !important;
}
xul|*.checkbox-check[checked] {
list-style-image: url("chrome://global/skin/in-content/check.svg#check-native");
background-color: -moz-dialog;
}
xul|radio {
-moz-binding: url("chrome://global/content/bindings/radio.xml#radio");
-moz-box-align: center;
-moz-margin-start: 0;
}
xul|*.radio-check {
background-image: none;
}
xul|*.radio-check[selected] {
list-style-image: url("chrome://global/skin/in-content/radio.svg#radio-native");
background-color: -moz-dialog;
}
xul|*.radio-label-box {
-moz-appearance: none;
}

View File

@ -56,10 +56,10 @@ toolkit.jar:
+ skin/classic/global/icons/webapps-64.png (icons/webapps-64.png)
skin/classic/global/menu/shared-menu-check.png (../../shared/menu-check.png)
* 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/check.svg (../../shared/in-content/check.svg)
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/radio.svg (../../shared/in-content/radio.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)
+ skin/classic/global/toolbar/spring.png (toolbar/spring.png)

View File

@ -186,10 +186,10 @@ toolkit.jar:
skin/classic/global/menu/shared-menu-check.png (../../shared/menu-check.png)
skin/classic/global/menu/shared-menu-check@2x.png (../../shared/menu-check@2x.png)
* 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/check.svg (../../shared/in-content/check.svg)
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/radio.svg (../../shared/in-content/radio.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)
skin/classic/global/scale/scale-tray-horiz.gif (scale/scale-tray-horiz.gif)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 288 B

View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 21 21" enable-background="new 0 0 21 21" xml:space="preserve">
<style>
use:not(:target) {
display: none;
}
use {
fill: #2292d0;
}
use[id$="-native"] {
fill: -moz-dialogText;
}
</style>
<defs style="display: none;">
<path id="check-shape" d="M 9.39,16.5 16.28,6 14.77,4.5 9.37,12.7 6.28,9.2 4.7,10.7 z"/>
</defs>
<use id="check" xlink:href="#check-shape"/>
<use id="check-native" xlink:href="#check-shape"/>
</svg>

After

Width:  |  Height:  |  Size: 642 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 471 B

View File

@ -397,7 +397,8 @@ xul|*.checkbox-check {
border: 1px solid #c1c1c1;
-moz-margin-end: 10px;
background-color: #f1f1f1;
background-image: linear-gradient(#fff, rgba(255,255,255,0.8));
/* !important needed to override toolkit checked !important rule */
background-image: linear-gradient(#fff, rgba(255,255,255,0.8)) !important;
background-position: center center;
background-repeat: no-repeat;
box-shadow: 0 1px 1px 0 #fff, inset 0 2px 0 0 rgba(0,0,0,0.03);
@ -408,9 +409,7 @@ xul|checkbox:not([disabled="true"]):hover > xul|*.checkbox-check {
}
xul|*.checkbox-check[checked] {
background-image: url("chrome://global/skin/in-content/check.png"),
/* !important needed to override toolkit !important rule */
linear-gradient(#fff, rgba(255,255,255,0.8)) !important;
list-style-image: url("chrome://global/skin/in-content/check.svg#check");
}
xul|checkbox[disabled="true"] > xul|*.checkbox-check {
@ -422,14 +421,6 @@ xul|*.checkbox-label-box {
-moz-padding-start: 0;
}
@media (min-resolution: 2dppx) {
xul|*.checkbox-check[checked] {
background-size: 12px 12px, auto;
background-image: url("chrome://global/skin/in-content/check@2x.png"),
linear-gradient(#fff, rgba(255,255,255,0.8)) !important;
}
}
xul|richlistitem > xul|*.checkbox-check {
margin: 3px 6px;
}
@ -451,10 +442,7 @@ xul|radio:not([disabled="true"]):hover > xul|*.radio-check {
}
xul|*.radio-check[selected] {
background-image: radial-gradient(circle, rgb(23,146,229),
rgb(76,177,255) 5.5px, rgba(76,177,255,0.2) 6px,
transparent 6px),
linear-gradient(rgb(255,255,255), rgba(255,255,255,0.8));
list-style-image: url("chrome://global/skin/in-content/radio.svg#radio");
}
xul|radio[disabled="true"] > xul|*.radio-check {

View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 21 21" enable-background="new 0 0 21 21" xml:space="preserve">
<style>
use:not(:target) {
display: none;
}
use {
fill: #2292d0;
}
use[id$="-native"] {
fill: -moz-dialogText;
}
</style>
<defs style="display: none;">
<circle id="radio-shape" cx="10.5" cy="10.5" r="6"/>
</defs>
<use id="radio" xlink:href="#radio-shape"/>
<use id="radio-native" xlink:href="#radio-shape"/>
</svg>

After

Width:  |  Height:  |  Size: 606 B

View File

@ -23,12 +23,34 @@ xul|checkbox {
-moz-padding-start: 0;
}
@media not all and (-moz-windows-default-theme) {
xul|*.checkbox-check {
background-image: none !important;
}
xul|*.checkbox-check[checked] {
list-style-image: url("chrome://global/skin/in-content/check.svg#check-native");
background-color: -moz-dialog;
}
}
xul|radio {
-moz-binding: url("chrome://global/content/bindings/radio.xml#radio");
-moz-margin-start: 0;
-moz-padding-start: 0;
}
@media not all and (-moz-windows-default-theme) {
xul|*.radio-check {
background-image: none;
}
xul|*.radio-check[selected] {
list-style-image: url("chrome://global/skin/in-content/radio.svg#radio-native");
background-color: -moz-dialog;
}
}
xul|*.radio-icon,
xul|*.checkbox-icon {
-moz-margin-end: 0;

View File

@ -171,10 +171,10 @@ toolkit.jar:
skin/classic/global/media/videoClickToPlayButton.svg (media/videoClickToPlayButton.svg)
skin/classic/global/menu/shared-menu-check.png (../../shared/menu-check.png)
* 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/check.svg (../../shared/in-content/check.svg)
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/radio.svg (../../shared/in-content/radio.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)
skin/classic/global/printpreview/arrow-left.png (printpreview/arrow-left.png)
@ -363,10 +363,10 @@ toolkit.jar:
skin/classic/aero/global/media/videoClickToPlayButton.svg (media/videoClickToPlayButton.svg)
skin/classic/aero/global/menu/shared-menu-check.png (../../shared/menu-check.png)
* 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/check.svg (../../shared/in-content/check.svg)
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/radio.svg (../../shared/in-content/radio.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)
skin/classic/aero/global/printpreview/arrow-left.png (printpreview/arrow-left-aero.png)