Bug 1435688 - Part 4 - Remove the "listitem-iconic" and "listcell-iconic" bindings. r=bgrins
MozReview-Commit-ID: LKLPmes4LCC
--- a/toolkit/content/widgets/listbox.xml
+++ b/toolkit/content/widgets/listbox.xml
@@ -1025,25 +1025,16 @@
control.selectItemRange(this, this);
}
control._userSelecting = false;
]]>
</handler>
</handlers>
</binding>
- <binding id="listitem-iconic"
- extends="chrome://global/content/bindings/listbox.xml#listitem">
- <content>
- <children>
- <xul:listcell class="listcell-iconic" xbl:inherits="label,image,crop,disabled,flexlabel"/>
- </children>
- </content>
- </binding>
-
<binding id="listitem-checkbox"
extends="chrome://global/content/bindings/listbox.xml#listitem">
<content>
<children>
<xul:listcell type="checkbox" xbl:inherits="label,crop,checked,disabled,flexlabel"/>
</children>
</content>
@@ -1084,26 +1075,16 @@
<content>
<children>
<xul:label class="listcell-label" xbl:inherits="value=label,flex=flexlabel,crop,disabled" flex="1" crop="right"/>
</children>
</content>
</binding>
- <binding id="listcell-iconic"
- extends="chrome://global/content/bindings/listbox.xml#listcell">
- <content>
- <children>
- <xul:image class="listcell-icon" xbl:inherits="src=image"/>
- <xul:label class="listcell-label" xbl:inherits="value=label,flex=flexlabel,crop,disabled" flex="1" crop="right"/>
- </children>
- </content>
- </binding>
-
<binding id="listcell-checkbox"
extends="chrome://global/content/bindings/listbox.xml#listcell">
<content>
<children>
<xul:image class="listcell-check" xbl:inherits="checked,disabled"/>
<xul:label class="listcell-label" xbl:inherits="value=label,flex=flexlabel,crop,disabled" flex="1" crop="right"/>
</children>
</content>
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -511,24 +511,16 @@ listheader {
listcell {
-moz-binding: url("chrome://global/content/bindings/listbox.xml#listcell");
}
listcell[type="checkbox"] {
-moz-binding: url("chrome://global/content/bindings/listbox.xml#listcell-checkbox");
}
-.listitem-iconic {
- -moz-binding: url("chrome://global/content/bindings/listbox.xml#listitem-iconic");
-}
-
-.listcell-iconic {
- -moz-binding: url("chrome://global/content/bindings/listbox.xml#listcell-iconic");
-}
-
listbox {
display: -moz-grid;
}
listbox[rows] {
height: auto;
}
--- a/toolkit/themes/linux/global/listbox.css
+++ b/toolkit/themes/linux/global/listbox.css
@@ -71,20 +71,16 @@ listheader {
margin: 0 !important;
padding-top: 0;
padding-bottom: 1px;
padding-inline-start: 4px;
padding-inline-end: 0;
white-space: nowrap;
}
-.listcell-icon {
- margin-inline-end: 2px;
-}
-
.listcell-label[disabled="true"] {
color: GrayText;
}
/* ::::: listcell checkbox ::::: */
.listcell-check {
-moz-appearance: checkbox;
--- a/toolkit/themes/osx/global/listbox.css
+++ b/toolkit/themes/osx/global/listbox.css
@@ -61,20 +61,16 @@ listheader[sortable="true"]:hover:active
.listcell-label {
margin: 0px !important;
padding-bottom: 1px;
padding-inline-start: 4px;
white-space: nowrap;
}
-.listcell-icon {
- margin-inline-end: 2px;
-}
-
.listcell-label[disabled="true"] {
color: GrayText;
}
/* ::::: listcell checkbox ::::: */
.listcell-check {
-moz-appearance: checkbox;
--- a/toolkit/themes/windows/global/listbox.css
+++ b/toolkit/themes/windows/global/listbox.css
@@ -100,20 +100,16 @@ listheader[sortable="true"]:hover:active
margin: 0px !important;
padding-top: 0px;
padding-bottom: 1px;
padding-inline-start: 4px;
padding-inline-end: 0px;
white-space: nowrap;
}
-.listcell-icon {
- margin-inline-end: 2px;
-}
-
.listcell-label[disabled="true"] {
color: GrayText;
}
/* ::::: listcell checkbox ::::: */
.listcell-check {
-moz-appearance: checkbox;