Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 05:45:37 +00:00
Code Issues 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
This commit is contained in:
slamm%netscape.com 2000-04-26 14:21:56 +00:00
parent f4ba4e32f4
commit 84869c36bd
4 changed files with 64 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
xpfe/components/bookmarks/resources/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
xpfe/components/bookmarks/resources/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");
}

39
xpfe/components/bookmarks/resources/bookmarks.xul
View File

@ -104,13 +104,13 @@
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><html:hr width="100%" align="center" size="1" /></treecell>
<treecell><html:hr width="100%" align="center" size="1" /></treecell>
<treecell><html:hr width="100%" align="center" size="1" /></treecell>
<treecell><html:hr width="100%" align="center" size="1" /></treecell>
<treecell><html:hr width="100%" align="center" size="1" /></treecell>
<treecell><html:hr width="100%" align="center" size="1" /></treecell>
<treecell><html:hr width="100%" align="center" size="1" /></treecell>
<treecell><treeindentation/><separator class="groove" flex="1" align="center"/></treecell>
<treecell><separator flex="1" align="center" class="groove" /></treecell>
<treecell><separator flex="1" align="center" class="groove" /></treecell>
<treecell><separator flex="1" align="center" class="groove" /></treecell>
<treecell><separator flex="1" align="center" class="groove" /></treecell>
<treecell><separator flex="1" align="center" class="groove" /></treecell>
<treecell><separator flex="1" align="center" class="groove" /></treecell>
</treerow>
</treeitem>
</treechildren>
@ -123,9 +123,12 @@
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"
<treecell class="treecell-bookmark treecell-indent"
value="rdf:http://home.netscape.com/NC-rdf#Name"
src="rdf:http://home.netscape.com/NC-rdf#Icon" />
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" />
<treecell
value="rdf:http://home.netscape.com/NC-rdf#URL"/>
<treecell
@ -177,14 +180,14 @@
<treehead>
<treerow id="headRow">
<treecell value="&tree.header.name.label;" onclick="return doSort('NameColumn');" observes="NameColumn" />
<treecell value="&tree.header.url.label;" onclick="return doSort('URLColumn');" observes="URLColumn" />
<treecell value="&tree.header.shortcut.label;" onclick="return doSort('ShortcutURLColumn');" observes="ShortcutURLColumn" />
<treecell value="&tree.header.description.label;" onclick="return doSort('DescriptionColumn');" observes="DescriptionColumn" />
<treecell value="&tree.header.lastvisit.label;" onclick="return doSort('LastVisitColumn');" observes="LastVisitColumn" />
<treecell value="&tree.header.addedon.label;" onclick="return doSort('AddedOnColumn');" observes="AddedOnColumn" />
<treecell value="&tree.header.lastmod.label;" onclick="return doSort('LastModColumn');" observes="LastModColumn" />
<treecell allowevents="true" id="popupCell">
<treecell class="treecell-header" value="&tree.header.name.label;" onclick="return doSort('NameColumn');" observes="NameColumn" />
<treecell class="treecell-header" value="&tree.header.url.label;" onclick="return doSort('URLColumn');" observes="URLColumn" />
<treecell class="treecell-header" value="&tree.header.shortcut.label;" onclick="return doSort('ShortcutURLColumn');" observes="ShortcutURLColumn" />
<treecell class="treecell-header" value="&tree.header.description.label;" onclick="return doSort('DescriptionColumn');" observes="DescriptionColumn" />
<treecell class="treecell-header" value="&tree.header.lastvisit.label;" onclick="return doSort('astVisitColumn');" observes="LastVisitColumn" />
<treecell class="treecell-header" value="&tree.header.addedon.label;" onclick="return doSort('AddedOnColumn');" observes="AddedOnColumn" />
<treecell class="treecell-header" value="&tree.header.lastmod.label;" onclick="return doSort('LastModColumn');" observes="LastModColumn" />
<treecell class="treecell-header" allowevents="true" id="popupCell">
<menu>
<titledbutton src="chrome://global/skin/opentwisty.gif"/>
<menupopup popupanchor="bottomright"
@ -210,7 +213,7 @@ necessary for win32 or gtk, but we can use this area for information
(maybe full URL of selected item or the like) in the future.
-->
<box id="status-bar" style="min-height:16px; max-height:16px;">
<titledbutton class="status-bar" align="left" value=""/>
<button class="status-bar" align="left" value=""/>
</box>
</window>

18
xpfe/components/sidebar/resources/customize.css
View File

@ -45,35 +45,31 @@
list-style-image:url("chrome://global/skin/scroll-down-disabled.gif");
}
treeitem > treerow > treecell > .tree-button
.treecell-panel
{
list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
}
treeitem[haslink="true"] > treerow > treecell > .tree-button,
treeitem[container="true"] > treerow > treecell > .tree-button
.treecell-panel[haslink="true"],
treeitem[container="true"] > treerow > .treecell-panel
{
list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif");
}
treeitem[selected="true"][haslink="true"] > treerow > treecell > .tree-button,
treeitem[selected="true"][container="true"] > treerow > treecell > .tree-button
treeitem[selected="true"] > treerow > .treecell-panel[haslink="true"],
treeitem[selected="true"][container="true"] > treerow > .treecell-panel
{
list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed-sel.gif");
}
treeitem[container="true"][open="true"] > treerow > treecell > .tree-button
treeitem[container="true"][open="true"] > treerow > .treecell-panel
{
list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif");
}
treeitem[selected="true"][container="true"][open="true"] > treerow > treecell > .tree-button
treeitem[selected="true"][container="true"][open="true"] > treerow > .treecell-panel
{
list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open-sel.gif");
}
treeitem > treerow > treecell > .tree-icon > .twisty{
display: none;
}
box#header {
list-style-image: url("chrome://communicator/skin/sidebar/sidebar-icon.gif");
}