Merge backout of bug 501957 (changeset 29fb65d31455)

This commit is contained in:
Markus Stange 2009-07-18 18:09:35 +02:00
Родитель d86cafb835 2dc47a84a1
Коммит 76d8dcbd58
7 изменённых файлов: 7 добавлений и 140 удалений

Просмотреть файл

@ -46,7 +46,7 @@
checkbox {
-moz-appearance: checkbox-container;
-moz-box-align: center;
margin: 2px 2px 4px;
margin: 2px 2px 4px 2px;
}
.checkbox-label-box {
@ -73,12 +73,9 @@ checkbox[disabled="true"] {
.checkbox-check {
-moz-appearance: checkbox;
margin: 0 1px;
/* vertical-align tells native theming where to snap to. However, this doesn't
* always work reliably because of bug 503833. */
vertical-align: top;
width: 1.3em;
height: 1.3em;
margin: 1px;
width: 16px;
height: 16px;
}

Просмотреть файл

@ -50,7 +50,7 @@ radiogroup {
radio {
-moz-appearance: radio-container;
-moz-box-align: center;
margin: 2px 2px 4px;
margin: 2px 2px 2px 2px;
-moz-user-focus: ignore;
}
@ -78,10 +78,6 @@ radio[disabled="true"] {
.radio-check, .radio-check-box1 {
-moz-appearance: radio;
margin: -1px 1px 1px;
/* vertical-align tells native theming where to snap to. However, this doesn't
* always work reliably because of bug 503833. */
vertical-align: bottom;
width: 1.3em;
height: 1.3em;
width: 16px;
height: 16px;
}

Просмотреть файл

@ -1,31 +0,0 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
<?xml-stylesheet href="data:text/css,
vbox { height: 50px; }
box {
-moz-appearance: checkbox;
margin-left: 2px;
}
" type="text/css"?>
<window title="Reference for mini, small and regular checkbox sizes"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<vbox>
<hbox><box width="11" height="11"/></hbox>
</vbox>
<vbox>
<hbox><box width="13" height="13"/></hbox>
</vbox>
<vbox>
<hbox><box width="16" height="16"/></hbox>
</vbox>
<vbox>
<hbox checked="true"><box width="11" height="11"/></hbox>
</vbox>
<vbox>
<hbox checked="true"><box width="13" height="13"/></hbox>
</vbox>
<vbox>
<hbox checked="true"><box width="16" height="16"/></hbox>
</vbox>
</window>

Просмотреть файл

@ -1,31 +0,0 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
<?xml-stylesheet href="data:text/css,
vbox { height: 50px; }
checkbox {
color: transparent;
margin: 0;
}
" type="text/css"?>
<window title="Checkboxes with mini, small and regular control font"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<vbox style="font-size: 9px">
<hbox><checkbox label="Mini"/></hbox>
</vbox>
<vbox style="font: message-box">
<hbox><checkbox label="Small"/></hbox>
</vbox>
<vbox style="font: -moz-dialog">
<hbox><checkbox label="Regular"/></hbox>
</vbox>
<vbox style="font-size: 9px">
<hbox><checkbox label="Mini" checked="true"/></hbox>
</vbox>
<vbox style="font: message-box">
<hbox><checkbox label="Small" checked="true"/></hbox>
</vbox>
<vbox style="font: -moz-dialog">
<hbox><checkbox label="Regular" checked="true"/></hbox>
</vbox>
</window>

Просмотреть файл

@ -1,31 +0,0 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
<?xml-stylesheet href="data:text/css,
vbox { height: 50px; }
box {
-moz-appearance: radio;
margin-left: 2px;
}
" type="text/css"?>
<window title="Reference for mini, small and regular radio button sizes"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<vbox>
<hbox><box width="11" height="11"/></hbox>
</vbox>
<vbox>
<hbox><box width="13" height="13"/></hbox>
</vbox>
<vbox>
<hbox><box width="16" height="16"/></hbox>
</vbox>
<vbox>
<hbox selected="true"><box width="11" height="11"/></hbox>
</vbox>
<vbox>
<hbox selected="true"><box width="13" height="13"/></hbox>
</vbox>
<vbox>
<hbox selected="true"><box width="16" height="16"/></hbox>
</vbox>
</window>

Просмотреть файл

@ -1,31 +0,0 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
<?xml-stylesheet href="data:text/css,
vbox { height: 50px; }
radio {
color: transparent;
margin: 0;
}
" type="text/css"?>
<window title="Radio buttons with mini, small and regular control font"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<vbox style="font-size: 9px">
<hbox><radio label="Mini"/></hbox>
</vbox>
<vbox style="font: message-box">
<hbox><radio label="Small"/></hbox>
</vbox>
<vbox style="font: -moz-dialog">
<hbox><radio label="Regular"/></hbox>
</vbox>
<vbox style="font-size: 9px">
<hbox><radio label="Mini" selected="true"/></hbox>
</vbox>
<vbox style="font: message-box">
<hbox><radio label="Small" selected="true"/></hbox>
</vbox>
<vbox style="font: -moz-dialog">
<hbox><radio label="Regular" selected="true"/></hbox>
</vbox>
</window>

Просмотреть файл

@ -1,3 +1 @@
skip-if(MOZ_WIDGET_TOOLKIT!="cocoa") == 482681.xul 482681-ref.xul
skip-if(MOZ_WIDGET_TOOLKIT!="cocoa") == radiosize.xul radiosize-ref.xul
skip-if(MOZ_WIDGET_TOOLKIT!="cocoa") == checkboxsize.xul checkboxsize-ref.xul