Bug 516376: no pressed/checked state css rules for some buttons [r=mark.finkle]

This commit is contained in:
Vivien Nicolas 2009-09-14 12:50:21 -04:00
Родитель f1e5f48294
Коммит 3c74f1cd08
5 изменённых файлов: 42 добавлений и 15 удалений

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

@ -31,7 +31,7 @@
</xul:vbox>
</xul:hbox>
<xul:hbox class="show-on-select buttons-box">
<xul:button anonid="options-button" class="addon-options" label="&addonOptions.label;"
<xul:button anonid="options-button" type="checkbox" class="addon-options" label="&addonOptions.label;"
oncommand="document.getBindingParent(this).toggleOptions();"/>
<xul:spacer flex="1"/>
<xul:button anonid="enable-button" class="show-on-disable hide-on-enable hide-on-uninstall addon-enable" label="&addonEnable.label;"
@ -85,7 +85,9 @@
<body>
<![CDATA[
let box = document.getAnonymousElementByAttribute(this, "anonid", "options-box");
let button = document.getAnonymousElementByAttribute(this, "anonid", "options-button");
box.collapsed = !box.collapsed;
button.checked = !box.collapsed;
if (box.hasChildNodes())
return;

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

@ -930,11 +930,11 @@ var BookmarkList = {
close: function() {
BrowserUI.updateStar();
document.getElementById("tool-bookmarks-manage").checked = false;
if (this._bookmarks.isEditing)
this._bookmarks.stopEditing();
this._bookmarks.blur();
this._panel.hidden = true;
BrowserUI.popDialog();
},

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

@ -310,7 +310,7 @@
<box id="panel-container" hidden="true" class="panel-dark" top="0" left="0">
<box id="panel-controls" oncommand="BrowserUI.switchPane(event.target.getAttribute('linkedpanel'));">
<toolbarbutton id="tool-panel-close" type="check" checked="true" class="page-button button-image" command="cmd_panel"/>
<toolbarbutton id="tool-panel-close" class="page-button button-image" command="cmd_panel"/>
<toolbarbutton id="tool-addons" type="radio" group="1" class="panel-button button-image" linkedpanel="addons-container"/>
<toolbarbutton id="tool-downloads" type="radio" group="1" class="panel-button button-image" linkedpanel="downloads-container"/>
<toolbarbutton id="tool-preferences" type="radio" group="1" checked="true" class="panel-button button-image" linkedpanel="prefs-container"/>
@ -434,10 +434,9 @@
<vbox id="bookmarklist-container" class="panel-dark" hidden="true" top="0" left="0">
<hbox id="bookmarklist-header">
<description flex="1">&bookmarksHeader.label;</description>
<toolbarbutton id="tool-bookmarks-manage" class="urlbar-button show-text button-dark" type="check" autocheck="true" label="&bookmarksManage.label;"
oncommand="BookmarkList.toggleManage();"/>
<toolbarbutton id="tool-bookmarks-close" class="urlbar-button button-image" type="check" checked="true"
command="cmd_close"/>
<toolbarbutton id="tool-bookmarks-manage" class="urlbar-button show-text button-dark" type="checkbox" autocheck="true"
label="&bookmarksManage.label;" oncommand="BookmarkList.toggleManage();"/>
<toolbarbutton id="tool-bookmarks-close" class="urlbar-button button-image" command="cmd_close"/>
</hbox>
<placelist id="bookmark-items" type="bookmarks" flex="1"
onmove="FolderPicker.show(this);"
@ -447,8 +446,7 @@
<vbox id="folder-container" class="panel-dark" hidden="true" top="0" left="0">
<hbox id="folder-header">
<description flex="1">&foldersHeader.label;</description>
<toolbarbutton id="tool-folders-close" class="urlbar-button button-image" type="check" checked="true"
command="cmd_close"/>
<toolbarbutton id="tool-folders-close" class="urlbar-button button-image" command="cmd_close"/>
</hbox>
<placetree id="folder-items" type="bookmarks" mode="folders" flex="1" onselect="FolderPicker.moveItem();"/>
</vbox>

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

@ -100,6 +100,7 @@ button {
-moz-appearance: none !important;
}
button[type="checkbox"][checked="true"],
button:not([disabled="true"]):active:hover {
-moz-border-image: url("chrome://browser/skin/images/button-active-64.png") 8 repeat repeat;
}
@ -121,6 +122,7 @@ notification button {
-moz-border-image: url("chrome://browser/skin/images/buttondark-default-64.png") 8 repeat repeat;
}
button.button-dark[type="checkbox"][checked="true"],
button.button-dark:not([disabled="true"]):active:hover,
notification button:not([disabled="true"]):active:hover {
-moz-border-image: url("chrome://browser/skin/images/buttondark-active-64.png") 8 repeat repeat;
@ -163,6 +165,7 @@ toolbarbutton.button-dark {
-moz-border-image: url("chrome://browser/skin/images/toolbarbutton-default-64.png") 10 repeat repeat;
}
toolbarbutton.button-dark[type="checkbox"][checked="true"],
toolbarbutton.button-dark:not([disabled="true"]):active:hover {
-moz-border-image: url("chrome://browser/skin/images/toolbarbutton-active-64.png") 10 repeat repeat;
}
@ -171,10 +174,11 @@ toolbarbutton.button-dark[disabled="true"] {
color: #ddd;
}
toolbarbutton.button-dark[checked="true"] {
toolbarbutton.button-dark[type="checkbox"][checked="true"] {
/* checked overrides */
border: 8px solid transparent !important;
background: #303030 !important;
border: 10px solid transparent !important;
color: #fff !important;
background: none !important;
padding: 0.5mm 1mm !important;
}
@ -265,6 +269,7 @@ radio.checkbox-radio-off:not([selected]) .radio-label-box {
-moz-border-image: url("chrome://browser/skin/images/toggledarkmiddle-inactive-64.png") 8 repeat repeat;
}
.toggle-dark:not([disabled=true]) radio:active:hover,
.toggle-dark radio[selected] {
-moz-border-image: url("chrome://browser/skin/images/toggledarkmiddle-active-64.png") 8 repeat repeat;
}
@ -273,6 +278,7 @@ radio.checkbox-radio-off:not([selected]) .radio-label-box {
-moz-border-image: url("chrome://browser/skin/images/toggledarkleft-inactive-64.png") 8 repeat repeat;
}
.toggle-dark:not([disabled=true]) radio:first-child:active:hover,
.toggle-dark radio:first-child[selected] {
-moz-border-image: url("chrome://browser/skin/images/toggledarkleft-active-64.png") 8 repeat repeat;
}
@ -281,6 +287,7 @@ radio.checkbox-radio-off:not([selected]) .radio-label-box {
-moz-border-image: url("chrome://browser/skin/images/toggledarkright-inactive-64.png") 8 repeat repeat;
}
.toggle-dark:not([disabled=true]) radio:last-child:active:hover,
.toggle-dark radio:last-child[selected] {
-moz-border-image: url("chrome://browser/skin/images/toggledarkright-active-64.png") 8 repeat repeat;
}

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

@ -92,6 +92,7 @@ button[disabled="true"] {
-moz-border-image: url("chrome://browser/skin/images/button-default-64.png") 8 repeat repeat;
}
button[type="checkbox"][checked="true"],
button:not([disabled="true"]):active:hover {
-moz-border-image: url("chrome://browser/skin/images/button-active-64.png") 8 repeat repeat;
}
@ -104,6 +105,7 @@ button[disabled="true"] {
-moz-border-image: url("chrome://browser/skin/images/button-default-36.png") 4 repeat repeat;
}
button[type="checkbox"][checked="true"],
button:not([disabled="true"]):active:hover {
-moz-border-image: url("chrome://browser/skin/images/button-active-36.png") 4 repeat repeat;
}
@ -132,6 +134,7 @@ button.button-dark[disabled="true"] {
-moz-border-image: url("chrome://browser/skin/images/buttondark-default-64.png") 8 repeat repeat;
}
button.button-dark[type="checkbox"][checked="true"],
button.button-dark:not([disabled="true"]):active:hover,
notification button:not([disabled="true"]):active:hover {
-moz-border-image: url("chrome://browser/skin/images/buttondark-active-64.png") 8 repeat repeat;
@ -145,6 +148,7 @@ button.button-dark[disabled="true"] {
-moz-border-image: url("chrome://browser/skin/images/buttondark-default-36.png") 4 repeat repeat;
}
button.button-dark[type="checkbox"][checked="true"],
button.button-dark:not([disabled="true"]):active:hover,
notification button:not([disabled="true"]):active:hover {
-moz-border-image: url("chrome://browser/skin/images/buttondark-active-36.png") 4 repeat repeat;
@ -200,10 +204,10 @@ toolbarbutton.button-dark[disabled="true"] {
color: #ddd;
}
toolbarbutton.button-dark[checked="true"] {
toolbarbutton.button-dark[type="checkbox"][checked="true"] {
/* checked overrides */
border: 0.05mm solid #202020 !important;
background: #303030 !important;
color: #fff !important;
background: none !important;
padding: 0.25mm 0.5mm !important;
}
@ -214,9 +218,14 @@ toolbarbutton.button-dark[checked="true"] {
-moz-border-image: url("chrome://browser/skin/images/toolbarbutton-default-64.png") 10 repeat repeat;
}
toolbarbutton.button-dark[type="checkbox"][checked="true"],
toolbarbutton.button-dark:not([disabled="true"]):active:hover {
-moz-border-image: url("chrome://browser/skin/images/toolbarbutton-active-64.png") 10 repeat repeat;
}
toolbarbutton.button-dark[type="checkbox"][checked="true"] {
border: 10px solid transparent !important;
}
}
/* low-res screens */
@ -226,9 +235,14 @@ toolbarbutton.button-dark[checked="true"] {
-moz-border-image: url("chrome://browser/skin/images/toolbarbutton-default-36.png") 6 repeat repeat;
}
toolbarbutton.button-dark[type="checkbox"][checked="true"],
toolbarbutton.button-dark:not([disabled="true"]):active:hover {
-moz-border-image: url("chrome://browser/skin/images/toolbarbutton-active-36.png") 6 repeat repeat;
}
toolbarbutton.button-dark[type="checkbox"][checked="true"] {
border: 6px solid transparent !important;
}
}
/* image buttons ----------------------------------------------------------- */
@ -385,6 +399,7 @@ radio.checkbox-radio-off:not([selected]) .radio-label-box {
-moz-border-image: url("chrome://browser/skin/images/toggledarkmiddle-inactive-64.png") 8 repeat repeat;
}
.toggle-dark:not([disabled=true]) radio:active:hover,
.toggle-dark radio[selected] {
-moz-border-image: url("chrome://browser/skin/images/toggledarkmiddle-active-64.png") 8 repeat repeat;
}
@ -393,6 +408,7 @@ radio.checkbox-radio-off:not([selected]) .radio-label-box {
-moz-border-image: url("chrome://browser/skin/images/toggledarkleft-inactive-64.png") 8 repeat repeat;
}
.toggle-dark:not([disabled=true]) radio:first-child:active:hover,
.toggle-dark radio:first-child[selected] {
-moz-border-image: url("chrome://browser/skin/images/toggledarkleft-active-64.png") 8 repeat repeat;
}
@ -401,6 +417,7 @@ radio.checkbox-radio-off:not([selected]) .radio-label-box {
-moz-border-image: url("chrome://browser/skin/images/toggledarkright-inactive-64.png") 8 repeat repeat;
}
.toggle-dark:not([disabled=true]) radio:last-child:active:hover,
.toggle-dark radio:last-child[selected] {
-moz-border-image: url("chrome://browser/skin/images/toggledarkright-active-64.png") 8 repeat repeat;
}
@ -412,6 +429,7 @@ radio.checkbox-radio-off:not([selected]) .radio-label-box {
-moz-border-image: url("chrome://browser/skin/images/toggledarkmiddle-inactive-36.png") 4 repeat repeat;
}
.toggle-dark:not([disabled=true]) radio:active:hover,
.toggle-dark radio[selected] {
-moz-border-image: url("chrome://browser/skin/images/toggledarkmiddle-active-36.png") 4 repeat repeat;
}
@ -420,6 +438,7 @@ radio.checkbox-radio-off:not([selected]) .radio-label-box {
-moz-border-image: url("chrome://browser/skin/images/toggledarkleft-inactive-36.png") 4 repeat repeat;
}
.toggle-dark:not([disabled=true]) radio:first-child:active:hover,
.toggle-dark radio:first-child[selected] {
-moz-border-image: url("chrome://browser/skin/images/toggledarkleft-active-36.png") 4 repeat repeat;
}
@ -428,6 +447,7 @@ radio.checkbox-radio-off:not([selected]) .radio-label-box {
-moz-border-image: url("chrome://browser/skin/images/toggledarkright-inactive-36.png") 4 repeat repeat;
}
.toggle-dark:not([disabled=true]) radio:last-child:active:hover,
.toggle-dark radio:last-child[selected] {
-moz-border-image: url("chrome://browser/skin/images/toggledarkright-active-36.png") 4 repeat repeat;
}