Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix up tree styles. Fixes icons, indenting, and twisties. Also, reduces amount of style matching that needs to be done. r=hyatt

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@225667 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
slamm%netscape.com
2007-05-05 04:33:12 +00:00
parent 695a3b2f3d
commit 6f567ceb79
2 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mozilla/suite/common/bookmarks/bm-panel.xul
View File

@@ -37,8 +37,6 @@
<html:script src="chrome://communicator/content/bookmarks/bookmarksDD.js"/>
<html:script src="chrome://global/content/strres.js"/>
<html:div style="width:100px;height:100px" flex="1">
<popupset>
<popup id="contextual" oncreate="return fillContextMenu('contextual');" >
<menu />
@@ -46,7 +44,7 @@
</popupset>
<tree id="bookmarksTree" context="contextual" ref="NC:BookmarksRoot"
style="height: 100%; width:100%;"
flex="1"
multiple="true"
ondragover="return DragOverTree(event);"
ondraggesture="return BeginDragTree(event);"
@@ -60,7 +58,7 @@
<treeitem uri="...">
<treerow>
<treecell>
<html:hr width="75%" align="center" size="1" />
<treeindentation/><separator width="75%" align="center" class="groove" />
</treecell>
</treerow>
</treeitem>
@@ -69,9 +67,17 @@
<rule>
<treechildren>
<treeitem uri="..." persist="open" web:status="rdf:http://home.netscape.com/WEB-rdf#status" rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type" loading="rdf:http://home.netscape.com/NC-rdf#loading">
<treeitem uri="..." persist="open"
web:status="rdf:http://home.netscape.com/WEB-rdf#status"
rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
loading="rdf:http://home.netscape.com/NC-rdf#loading">
<treerow>
<treecell indent="true" value="rdf:http://home.netscape.com/NC-rdf#Name" src="rdf:http://home.netscape.com/NC-rdf#Icon" />
<treecell class="treecell-bookmark treecell-indent"
value="rdf:http://home.netscape.com/NC-rdf#Name"
src="rdf:http://home.netscape.com/NC-rdf#Icon"
web:status="rdf:http://home.netscape.com/WEB-rdf#status"
rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
loading="rdf:http://home.netscape.com/NC-rdf#loading" />
</treerow>
</treeitem>
</treechildren>
@@ -80,6 +86,5 @@
<treecol id="NameColumn" rdf:resource="http://home.netscape.com/NC-rdf#Name"/>
</tree>
</html:div>
</window>

48
mozilla/suite/common/bookmarks/bookmarks.css
View File

@@ -22,96 +22,96 @@
@import url(chrome://communicator/skin/);
treeitem[container="true"][open="true"][loading="true"] > treerow > treecell > .tree-icon
treeitem[container="true"][open="true"][loading="true"] > treerow > .treecell-bookmark
{
list-style-image: url("resource:/res/rdf/loading.gif") ! important ;
}
treeitem[status="new"] > treerow > treecell > .tree-icon
.treecell-bookmark[status="new"]
{
list-style-image: url("resource:/res/rdf/loading.gif") ! important ;
}
treeitem[type="http://home.netscape.com/NC-rdf#Folder"] > treerow > treecell > .tree-icon,
treeitem[type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"] > treerow > treecell > .tree-icon,
treeitem[container="true"][open="true"] > treerow > treecell > .tree-icon
.treecell-bookmark[type="http://home.netscape.com/NC-rdf#Folder"],
.treecell-bookmark[type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"],
treeitem[container="true"][open="true"] > treerow > .treecell-bookmark
{
list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif");
}
treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#Folder"] > treerow > treecell > .tree-icon,
treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"] > treerow > treecell > .tree-icon,
treeitem[selected="true"][container="true"][open="true"] > treerow > treecell > .tree-icon
treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#Folder"] > treerow > .treecell-bookmark,
treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"] > treerow > .treecell-bookmark,
treeitem[selected="true"][container="true"][open="true"] > treerow > .treecell-bookmark
{
list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed-sel.gif");
}
treeitem[type="http://home.netscape.com/NC-rdf#Folder"][open="true"] > treerow > treecell > .tree-icon
treeitem[type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"][open="true"] > treerow > treecell > .tree-icon
treeitem[type="http://home.netscape.com/NC-rdf#Folder"][open="true"] > treerow > .treecell-bookmark
treeitem[type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"][open="true"] > treerow > .treecell-bookmark
{
list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif");
}
treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#Folder"][open="true"] > treerow > treecell > .tree-icon,
treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"][open="true"] > treerow > treecell > .tree-icon
treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#Folder"][open="true"] > treerow > .treecell-bookmark,
treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"][open="true"] > treerow > .treecell-bookmark
{
list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open-sel.gif");
}
treeitem[container="true"][open="true"] > treerow > treecell > .tree-icon {
treeitem[container="true"][open="true"] > treerow > .treecell-bookmark {
list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif");
}
treeitem[type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"] > treerow > treecell > .tree-icon
treeitem[type="http://home.netscape.com/NC-rdf#Folder"]#NC:PersonalToolbarFolder > treerow > .treecell-bookmark
{
list-style-image: url("chrome://communicator/skin/bookmarks/personal-folder-closed.gif");
}
treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"] > treerow > treecell > .tree-icon
treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#Folder"]#NC:PersonalToolbarFolder > treerow > .treecell-bookmark
{
list-style-image: url("chrome://communicator/skin/bookmarks/personal-folder-closed-sel.gif");
}
treeitem[type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"][open="true"] > > treerow > treecell > .tree-icon
treeitem[type="http://home.netscape.com/NC-rdf#Folder"][open="true"]#NC:PersonalToolbarFolder > treerow > .treecell-bookmark
{
list-style-image: url("chrome://communicator/skin/bookmarks/personal-folder-open.gif");
}
treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"][open="true"] > > treerow > treecell > .tree-icon
treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#Folder"][open="true"]#NC:PersonalToolbarFolder > treerow > .treecell-bookmark
{
list-style-image: url("chrome://communicator/skin/bookmarks/personal-folder-open-sel.gif");
}
treeitem[type="http://home.netscape.com/NC-rdf#BookmarkSeparator"] > treerow > treecell > .tree-icon
.treecell-bookmark[type="http://home.netscape.com/NC-rdf#BookmarkSeparator"]
{
list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
}
treeitem[type="http://home.netscape.com/NC-rdf#IEFavorite"] > treerow > treecell > .tree-icon
.treecell-bookmark[type="http://home.netscape.com/NC-rdf#IEFavorite"]
{
list-style-image: url("chrome://communicator/skin/bookmarks/iefavorite.gif");
}
treeitem[type="http://home.netscape.com/NC-rdf#Bookmark"] > treerow > treecell > .tree-icon
.treecell-bookmark[type="http://home.netscape.com/NC-rdf#Bookmark"]
{
list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
}
treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"][container="true"][open="true"] > treerow > treecell > .tree-icon
treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"][container="true"][open="true"] > treerow > .treecell-bookmark
{
list-style-image: url("resource:/res/rdf/folder-open.gif");
}
treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"][container="true"] > treerow > treecell > .tree-icon
treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"][container="true"] > treerow > .treecell-bookmark
{
list-style-image: url("resource:/res/rdf/folder-closed.gif");
}
treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"] > treerow > treecell > .tree-icon
.treecell-bookmark[type="http://home.netscape.com/NC-rdf#FileSystemObject"]
{
list-style-image: url("resource:/res/rdf/article.gif");
}
treeitem > treerow > treecell > .tree-icon {
.treecell-bookmark {
list-style-image:url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
}