fix some tree merge conflict hell.

This commit is contained in:
ben%netscape.com 2001-02-05 11:50:42 +00:00
parent 4a5b9f3e40
commit dbf14ccd8f

View File

@ -103,7 +103,11 @@ tree:focus > treechildren treeitem[selected="true"][current="true"] > treerow
border-top : 1px solid ThreeDLightShadow;
border-right : 1px solid ThreeDShadow;
border-bottom : 1px solid ThreeDShadow;
padding : 0px 5px 0px 4px;
}
.treecell-header-box
{
padding : 0px 4px 0px 4px;
}
.treecell-header-image-box
@ -127,12 +131,6 @@ tree:focus > treechildren treeitem[selected="true"][current="true"] > treerow
border-bottom : none;
border-left : 1px solid transparent;
}
.treecell-header-image
{
-moz-binding : url("chrome://global/skin/treeBindings.xml#treecell-header-image");
padding : 0px;
}
.treecell-header:hover:active > .treecell-header-box,
.treecell-inset-header:hover:active > .treecell-header-box
@ -140,25 +138,6 @@ tree:focus > treechildren treeitem[selected="true"][current="true"] > treerow
padding : 1px 4px 0px 5px;
}
.tree-header-image
{
list-style-image : inherit;
}
.treecell-image
{
padding : 0px;
}
.treecell-header-image-box
{
border-left : 1px solid ThreeDLightShadow;
border-top : 1px solid ThreeDLightShadow;
border-right : 1px solid ThreeDShadow;
border-bottom : 1px solid ThreeDShadow;
padding : 0px 0px 0px 0px;
}
.treecell-header-image:hover:active > .treecell-header-image-box
{
padding : 1px 1px 0px 2px;
@ -196,8 +175,6 @@ treecell.propertylist {
padding-left : 5px;
}
.tree-cell-primary-icon-inline-edit-leaf,
.tree-cell-primary-icon-inline-edit-folder,
.tree-cell-primary-icon {
list-style-image: inherit;
padding-right: 2px;
@ -214,12 +191,10 @@ treecell.propertylist {
padding-right: 2px;
}
.tree-cell-primary-icon-inline-edit-leaf,
.treecell-indent > .tree-cell-primary-icon {
padding-left: 14px;
}
.tree-cell-primary-icon-inline-edit-folder,
}
treeitem[container="true"] > treerow > .treecell-indent > .tree-cell-primary-icon {
padding-left: 0px;
}
@ -241,6 +216,7 @@ treeitem[selected="true"][container="true"][open="true"] > treerow > treecell >
}
/* tree header with sort direction indicators */
.tree-header-sortdirection {
list-style-image: none;
}
@ -254,19 +230,14 @@ treeitem[selected="true"][container="true"][open="true"] > treerow > treecell >
}
/* column selection popup menu icon */
.treecell-popupcell-menu
{
border-left : 1px solid threedface;
border-top : 1px solid threedface;
border-right : 1px solid threedshadow;
border-bottom : 1px solid threedshadow;
}
.treecell-popup-icon
{
list-style-image : url("chrome://global/skin/columnselect.gif");
}
/* Inline Editable Treecells */
.textfield-inline-edit
{