#46423 -> New Modern Skin Polish. CSS/XBL to accompany the many new modern skin graphics I checked in earlier today. The modern skin will be polished even further in the coming weeks.

git-svn-id: svn://10.0.0.236/trunk@77181 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
nbhatla%netscape.com 2000-08-25 05:25:46 +00:00
parent b8f6edabd4
commit fe3c937345
24 changed files with 706 additions and 107 deletions

View File

@ -25,3 +25,6 @@ dialogOverlay.css
prefpanels.css
content-large.gif
content-small.gif
tb-menubutton-dm-clicked.png
tb-menubutton-dm-hover.png
tb-menubutton-dm.png

View File

@ -55,6 +55,9 @@ EXPORT_RESOURCE = \
$(srcdir)/prefpanels.css \
$(srcdir)/content-large.gif \
$(srcdir)/content-small.gif \
$(srcdir)/tb-menubutton-dm-clicked.png \
$(srcdir)/tb-menubutton-dm-hover.png \
$(srcdir)/tb-menubutton-dm.png \
$(NULL)
DIRS = search xpinstall sidebar bookmarks directory profile regviewer related

View File

@ -12,3 +12,7 @@ personal-folder-closed-sel.gif
personal-folder-closed.gif
personal-folder-open-sel.gif
personal-folder-open.gif
bookmark-folder-closed.png
bookmark-folder-open.png
bookmark-item.png
home.png

View File

@ -45,6 +45,10 @@ EXPORT_RESOURCE_SAMPLES = \
personal-folder-closed-sel.gif \
personal-folder-open.gif \
personal-folder-open-sel.gif \
bookmark-folder-closed.png \
bookmark-folder-open.png \
bookmark-item.png \
home.png \
$(NULL)
include $(topsrcdir)/config/rules.mk

View File

@ -22,7 +22,7 @@
.bookmarkitem
{
list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-item.png");
cursor : pointer;
}
@ -33,7 +33,7 @@
.bookmarkfolder
{
list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif");
list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.png");
}
.bookmarkfolder[menuactive="true"]
@ -43,7 +43,7 @@
.bookmarkfolder[open="true"]
{
list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif");
list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-folder-open.png");
}
.bookmarkfolder[open="true"][menuactive="true"]
@ -66,7 +66,7 @@ treeitem[type="http://home.netscape.com/NC-rdf#Folder"] > treerow > .treecell-bo
treeitem[type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"] > treerow > .treecell-bookmark,
treeitem[container="true"][open="true"] > treerow > .treecell-bookmark
{
list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif");
list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.png");
}
treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#Folder"] > treerow > .treecell-bookmark,
@ -79,7 +79,7 @@ treeitem[selected="true"][container="true"][open="true"] > treerow > .treecell-b
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");
list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.png");
}
treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#Folder"][open="true"] > treerow > .treecell-bookmark,
@ -89,7 +89,7 @@ treeitem[selected="true"][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-open.gif");
list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.png");
}
treeitem[type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"] > treerow > .treecell-bookmark
@ -114,7 +114,7 @@ treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#Folder"][id="NC:
treeitem[type="http://home.netscape.com/NC-rdf#BookmarkSeparator"] > treerow > .treecell-bookmark
{
list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.png");
}
treeitem[type="http://home.netscape.com/NC-rdf#IEFavorite"] > treerow > .treecell-bookmark
@ -124,7 +124,7 @@ treeitem[type="http://home.netscape.com/NC-rdf#IEFavorite"] > treerow > .treecel
treeitem[type="http://home.netscape.com/NC-rdf#Bookmark"] > treerow > .treecell-bookmark
{
list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.png");
}
treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"][container="true"][open="true"] > treerow > .treecell-bookmark
@ -143,5 +143,5 @@ treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"] > treerow > .t
}
treeitem > treerow > .treecell-bookmark {
list-style-image:url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
list-style-image:url("chrome://communicator/skin/bookmarks/bookmark-item.png");
}

View File

@ -42,3 +42,7 @@ install::
$(MAKE_INSTALL) personal-folder-closed.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin\bookmarks
$(MAKE_INSTALL) personal-folder-open-sel.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin\bookmarks
$(MAKE_INSTALL) personal-folder-open.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin\bookmarks
$(MAKE_INSTALL) bookmark-folder-closed.png $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin\bookmarks
$(MAKE_INSTALL) bookmark-folder-open.png $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin\bookmarks
$(MAKE_INSTALL) bookmark-item.png $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin\bookmarks
$(MAKE_INSTALL) home.png $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin\bookmarks

View File

@ -1,6 +1,6 @@
/* This white box is no longer needed in the new Modern skin. Commented out. (8/24/00) -nbhatla*/
.box-toolbar-group
/*.box-toolbar-group
{
background-color : #FFFFFF;
-moz-border-radius : 5px;
@ -8,4 +8,4 @@
margin : 0px 10px 0px 5px;
}
*/

View File

@ -2,15 +2,14 @@
#navigator-throbber
{
behavior : url("chrome://global/content/xulBindings.xml#buttontop");
background-image : url("chrome://communicator/skin/navbar-endbox.gif");
background-repeat : no-repeat;
list-style-image : url("chrome://global/skin/animthrob_single.gif");
width : 56px;
max-width : 56px;
padding : 8px 8px 7px 16px;
padding : 7px 8px 6px 16px;
margin : 0px;
cursor : pointer;
border : none;
background-color : transparent;
}
#navigator-throbber[busy="true"]
@ -20,7 +19,7 @@
#navigator-throbber:hover:active
{
padding : 9px 7px 6px 17px;
padding : 8px 7px 5px 17px;
}
#navigator-throbber > .button-internal-box
@ -34,4 +33,4 @@
{
display : none;
}

View File

@ -7,7 +7,7 @@
border : 1px solid transparent;
margin : 1px 0px 1px 0px;
-moz-border-radius : 0px;
color : black;
color : #FFFFFF;
padding : 0px;
font : 3mm arial;
max-width : 10em;
@ -74,36 +74,33 @@
/* outer frame */
.button-toolbar-1
{
background-repeat : no-repeat;
background-color : transparent;
background-position : 0px 0px;
background-image : url("chrome://global/skin/button32-bg.gif");
color : #CCFFFF;
width : 36px;
height : 36px;
margin : 2px 6px 1px 1px;
width : 34px;
height : 34px;
margin : 4px 6px 8px 1px;
font-size : smaller;
border : none;
border : 0px;
padding : 0px;
-moz-border-radius : 0px;
}
.button-toolbar-1:hover
{
background-image : url("chrome://global/skin/button32-bg-hover.gif");
border : none;
border : 0px;
padding : 0px;
}
.button-toolbar-1:hover:active
{
margin : 3px 5px 0px 2px;
border : none;
border : 0px;
padding : 0px;
}
.button-toolbar-1[disabled="true"],
.button-toolbar-1[disabled="true"]:hover,
.button-toolbar-1[disabled="true"]:hover:active
{
background-image : url("chrome://global/skin/button32-bg-disabled.gif");
margin : 2px 6px 1px 1px;
margin : 0px 6px 4px 1px;
border : none;
}
@ -112,15 +109,17 @@
.button-toolbar-1[disabled="true"]:hover > .button-internal-box,
.button-toolbar-1[disabled="true"]:hover:active > .button-internal-box
{
border : none;
border : 0px;
padding : 0px;
}
.button-toolbar-1 > .button-internal-box,
.button-toolbar-1:hover > .button-internal-box,
.button-toolbar-1:hover:active > .button-internal-box
{
border : none;
border : 0px;
vertical-align : middle;
padding : 0px;
}
.button-toolbar-1 > .button-internal-box > .button-text-container
@ -198,23 +197,67 @@
**/
.button-toolbar-3
{
behavior : url("chrome://global/skin/globalBindings.xml#three-slice-button");
margin : 0px 0px 0px 3px;
font-weight : bold;
background-color : #99CCCC;
}
.button-toolbar-3 > .button-internal-box
{
border : 1px outset #99CCCC;
padding : 2px 4px 2px 4px;
background-color : transparent;
border : 0px;
margin : 5px 7px 6px 0px;
color : #2F405D;
}
.button-toolbar-3:hover:active > .button-internal-box
{
border : 1px inset #99CCCC;
padding : 3px 3px 1px 5px;
}
.button-toolbar-3[disabled="true"], .button-toolbar-3[disabled="true"]:hover, .button-toolbar-3[disabled="true"]:hover:active
{
border : 0px;
}
.three-slice-button-image-left {
background : url(chrome://global/skin/button-3slice-normal-left.png) no-repeat;
width : 5px;
height : 20px;
}
.three-slice-button-image-middle {
background : url(chrome://global/skin/button-3slice-normal-middle.png) repeat-x;
}
.three-slice-button-text-box {
text-align : center;
vertical-align : middle;
padding : 0px 3px;
font-size : 10px;
}
.three-slice-button-image-right {
background : url(chrome://global/skin/button-3slice-normal-right.png) no-repeat;
width : 5px;
height : 20px;
}
.three-slice-button-top-spring {
height : 2px;
}
.three-slice-button-bottom-spring {
height : 2px;
}
.button-toolbar-3:hover:active {
color : #B2CAC9;
}
.button-toolbar-3:hover:active > .three-slice-button-image-left {
background : url(chrome://global/skin/button-3slice-active-left.png) no-repeat;
}
.button-toolbar-3:hover:active > .three-slice-button-image-middle {
background : url(chrome://global/skin/button-3slice-active-middle.png) repeat-x;
}
.button-toolbar-3:hover:active > .three-slice-button-image-right {
background : url(chrome://global/skin/button-3slice-active-right.png) no-repeat;
}
/** Expanding Region Button **/
/* outer frame */
@ -258,38 +301,38 @@
**/
.button-toolbar-4
{
color : #99CCCC;
color : #D0E7E7;
background : inherit;
font : inherit;
border : none;
padding : 1px !important;
margin : 0px;
padding : 1px;
margin : 0px 8px;
}
.button-toolbar-4:hover
{
text-decoration : none;
background-color : #336699;
color : #CCFFFF;
}
.button-toolbar-4:hover:active
{
text-decoration : none;
color : #CCFFFF;
padding : 2px 0px 0px 2px !important;
}
menubutton.button-toolbar-4
{
behavior : url("chrome://global/content/menulistBindings.xml#menubutton-single-right");
}
.button-toolbar-4 > .menubutton-internal-box > .menubutton-single-icon
{
list-style-image : url(chrome://global/skin/mb-single-arrow.png);
}
.button-toolbar-4 > .button-internal-box,
.button-toolbar-4 > .menubutton-internal-box
{
border : none !important;
border : 0px !important;
padding : 0px !important;
}

View File

@ -54,6 +54,9 @@ install::
$(MAKE_INSTALL) prefpanels.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
$(MAKE_INSTALL) content-large.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
$(MAKE_INSTALL) content-small.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
$(MAKE_INSTALL) tb-menubutton-dm-clicked.png $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
$(MAKE_INSTALL) tb-menubutton-dm-hover.png $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
$(MAKE_INSTALL) tb-menubutton-dm.png $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
clobber::
rm -f $(DIST)\chrome\$(THEME)\communicator\skin\*.*

View File

@ -59,13 +59,25 @@
.menubutton-dual.toolbar
{
behavior : url("chrome://communicator/skin/menubuttonBindings.xml#menubutton-dual-foo");
border : none ! important;
border : 0px;
margin : 4px 6px 8px 1px;
padding : 0px;
}
.button-toolbar-1.menubutton-dual-button
.menubutton-dual.toolbar[disabled="true"],
.menubutton-dual.toolbar[disabled="true"]:hover,
.menubutton-dual.toolbar[disabled="true"]:hover:active
{
margin : 0px 6px 4px 1px;
padding : 0px;
}
.button-toolbar-1.menubutton-dual-button,
.button-toolbar-1.menubutton-dual-button[disabled="true"],
.button-toolbar-1.menubutton-dual-button[disabled="true"]:hover:active
{
list-style-image : inherit;
min-height : 0px;
margin : 0px;
}
.button-toolbar-2.menubutton-dual-button
@ -82,19 +94,33 @@
.menubutton-dual-dropmarker
{
background : transparent;
list-style-image : url("chrome://communicator/skin/tb-menubutton-dm.gif");
list-style-image : url("chrome://communicator/skin/tb-menubutton-dm.png");
}
.menubutton-dual-dropmarker[disabled="true"]
.menubutton-dual.toolbar:hover > .menubutton-dual-stack > .menubutton-dual-dropmarker-box > .menubutton-dual-dropmarker
{
background : transparent;
list-style-image : url("chrome://communicator/skin/tb-menubutton-dm-hover.png");
}
.menubutton-dual.toolbar:hover:active > .menubutton-dual-stack > .menubutton-dual-dropmarker-box > .menubutton-dual-dropmarker
{
background : transparent;
list-style-image : url("chrome://communicator/skin/tb-menubutton-dm-clicked.png");
}
.menubutton-dual-dropmarker[disabled="true"],
.menubutton-dual.toolbar:hover[disabled="true"] > .menubutton-dual-stack > .menubutton-dual-dropmarker-box > .menubutton-dual-dropmarker,
.menubutton-dual.toolbar:hover:active[disabled="true"] > .menubutton-dual-stack > .menubutton-dual-dropmarker-box > .menubutton-dual-dropmarker
{
background : transparent;
list-style-image : url("chrome://communicator/skin/tb-menubutton-dm-disabled.gif");
list-style-image : none;
}
.menubutton-dual-dropmarker-box
{
margin-left : 32px;
margin-bottom : 1px;
margin-left : 23px;
margin-top : 25px;
}
.button-toolbar-2 + .menubutton-dual-dropmarker-box
@ -111,4 +137,4 @@
<xul:text class="button-text" inherits="value,accesskey,crop"/>
</xul:box>
</xul:box>

View File

@ -7,10 +7,10 @@
<binding id="menubutton-dual-foo">
<content excludes="observes,template,menupopup">
<xul:stack>
<xul:stack class="menubutton-dual-stack">
<xul:button class="menubutton-dual-button button-toolbar-1 top" allowevents="true"
inherits="buttontooltiptext:tooltiptext,buttonaction:oncommand,src,value,crop,accesskey,disabled"/>
<xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="bottom" flex="1">
<xul:box class="menubutton-dual-dropmarker-box" autostretch="never" flex="1">
<xul:image class="menubutton-dual-dropmarker" inherits="disabled"/>
</xul:box>
</xul:stack>
@ -19,14 +19,14 @@
<binding id="menubutton-dual-standard">
<content excludes="observes,template,menupopup">
<xul:stack>
<xul:stack class="menubutton-dual-stack">
<xul:button class="menubutton-dual-button button-toolbar-2 top" allowevents="true"
inherits="buttontooltiptext:tooltiptext,buttonaction:oncommand,src,value,crop,accesskey,disabled"/>
<xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="bottom" flex="1">
<xul:box class="menubutton-dual-dropmarker-box" autostretch="never" flex="1">
<xul:image class="menubutton-dual-dropmarker" inherits="disabled"/>
</xul:box>
</xul:stack>
</content>
</binding>
</bindings>
</bindings>

View File

@ -1,11 +1,21 @@
#mini-nav
{
list-style-image : url("chrome://global/skin/taskbar-navigator.gif");
list-style-image : url("chrome://global/skin/taskbar-navigator.png");
}
#mini-mail
#mini-nav:hover:active
{
list-style-image : url("chrome://global/skin/taskbar-mail.gif");
list-style-image : url("chrome://global/skin/taskbar-navigator-clicked.png");
}
#mini-mail
{
list-style-image : url("chrome://global/skin/taskbar-mail.png");
}
#mini-mail:hover:active
{
list-style-image : url("chrome://global/skin/taskbar-mail-clicked.png");
}
#mini-mail[BiffState="NewMail"]
@ -15,24 +25,56 @@
#mini-addr
{
list-style-image : url("chrome://global/skin/taskbar-addressbook.gif");
list-style-image : url("chrome://global/skin/taskbar-addressbook.png");
}
#mini-addr:hover:active
{
list-style-image : url("chrome://global/skin/taskbar-addressbook-clicked.png");
}
#mini-comp
{
list-style-image : url("chrome://global/skin/taskbar-composer.gif");
list-style-image : url("chrome://global/skin/taskbar-composer.png");
}
#mini-comp:hover:active
{
list-style-image : url("chrome://global/skin/taskbar-composer-clicked.png");
}
#taskbar
{
margin-top : 2px;
behavior : url(chrome://global/skin/globalBindings.xml#taskbar);
min-height : 1em;
user-focus : ignore;
}
.taskbar-image-left
{
background : url(chrome://global/skin/taskbar-bg-left.png) no-repeat;
width : 8px;
height : 17px;
}
.taskbar-image-middle
{
background : url(chrome://global/skin/taskbar-bg.png) repeat-x;
height : 17px;
}
.taskbar-image-right
{
background : url(chrome://global/skin/taskbar-bg-right.png) no-repeat;
width : 8px;
height : 17px;
}
.taskbutton
{
margin-right : 1em !important;
margin-right : -4px;
margin-left : 0px;
padding : 0px;
}
.taskbarspacer
@ -40,3 +82,30 @@
min-width : 0.3em;
width : 1em;
}
#taskbarMenuBox
{
behavior : url(chrome://global/skin/globalBindings.xml#taskbar-menu-box);
user-focus : ignore;
max-width : 75px;
margin-left : 100px; // Need to change the XUL Later
}
.taskbar-mb-image-left
{
background : url(chrome://global/skin/taskbar-groove-left.png) no-repeat;
width : 6px;
height : 17px;
}
.taskbar-mb-image-middle
{
background : url(chrome://global/skin/taskbar-groove-middle.png) repeat-x;
}
.taskbar-mb-image-right
{
background : url(chrome://global/skin/taskbar-groove-right.png) no-repeat;
width : 6px;
height : 17px;
}

View File

@ -124,3 +124,31 @@ wizardOverlay.css
tabcontrol.css
loading.gif
globalBindings.xml
button-3slice-active-left.png
button-3slice-active-middle.png
button-3slice-active-right.png
button-3slice-normal-left.png
button-3slice-normal-middle.png
button-3slice-normal-right.png
navbar-bg-leftcap.png
navbar-bg-rightcap.png
taskbar-addressbook.png
taskbar-bg-left.png
taskbar-bg-right.png
taskbar-bg.png
taskbar-composer-clicked.png
taskbar-composer.png
taskbar-groove-left.png
taskbar-groove-middle.png
taskbar-groove-right.png
taskbar-mail-clicked.png
mb-single-arrow.png
navbar-bg.png
taskbar-addressbook-clicked.png
taskbar-mail.png
taskbar-navigator-clicked.png
taskbar-navigator.png
print-disabled.png
print-hover.png
print-clicked.png
print.png

View File

@ -100,6 +100,16 @@ EXPORT_RESOURCE_SAMPLES_1 = \
progressmeter-busy.gif \
question-icon.gif \
radio.css \
mb-single-arrow.png \
navbar-bg.png \
taskbar-addressbook-clicked.png \
taskbar-mail.png \
taskbar-navigator-clicked.png \
taskbar-navigator.png \
print-disabled.png \
print-hover.png \
print-clicked.png \
print.png \
return-disabled.gif \
return.gif
@ -160,6 +170,24 @@ EXPORT_RESOURCE_SAMPLES_2 = \
tabcontrol.css \
loading.gif \
globalBindings.xml \
button-3slice-active-left.png \
button-3slice-active-middle.png \
button-3slice-active-right.png \
button-3slice-normal-left.png \
button-3slice-normal-middle.png \
button-3slice-normal-right.png \
navbar-bg-leftcap.png \
navbar-bg-rightcap.png \
taskbar-addressbook.png \
taskbar-bg-left.png \
taskbar-bg-right.png \
taskbar-bg.png \
taskbar-composer-clicked.png \
taskbar-composer.png \
taskbar-groove-left.png \
taskbar-groove-middle.png \
taskbar-groove-right.png \
taskbar-mail-clicked.png \
$(NULL)
include $(topsrcdir)/config/rules.mk

View File

@ -10,7 +10,7 @@
border : 1px solid #000000;
-moz-border-radius : 3px 2px 2px 3px;
margin : 1px 5px 2px 5px;
background-color : #CCCCCC;
background-color : transparent;
}
button[disabled="true"],

View File

@ -53,7 +53,7 @@
{
background-color : #FFFFFF;
padding : 0px;
font-family : Geneva, Tahoma, Helvetica, Arial, sans-serif;
font-family : Verdana, Geneva, Tahoma, Helvetica, Arial, sans-serif;
}
window[wait-cursor]
@ -126,10 +126,12 @@
*/
#status-bar
{
border-top : 1px solid #999999;
background-color : #CCCCCC;
border-top : 1px solid #11151F;
background-color : #647B9F;
user-focus : ignore;
overflow : hidden
overflow : hidden;
margin : 0px;
padding : 0px;
}
statusbar

View File

@ -18,4 +18,114 @@
</content>
</binding>
</bindings>
<binding id="toolbar-primary" extends="chrome://global/content/toolbarBindings.xml#toolbar">
<content inherits="false">
<xul:stack flex="1">
<xul:box flex="1" class="toolbar-primary-bg-images">
<xul:box class="toolbar-primary-image-left"/>
<xul:box flex="1" class="toolbar-primary-image-middle"/>
<xul:box class="toolbar-primary-image-right"/>
</xul:box>
<xul:box flex="1">
<xul:toolbargrippy inherits="grippytooltiptext:tooltiptext,grippytooltip:tooltip,last-toolbar"
onclick="this.grippyClicked();" tbattr="toolbar-grippy"
class="toolbar-primary-grippy"/>
<xul:box flex="1" class="toolbar-holder" inherits="collapsed,last-toolbar,tborient:orient,tbautostretch:autostretch" autostretch="never">
<children/>
</xul:box>
</xul:box>
</xul:stack>
</content>
</binding>
<binding id="toolbar-bordered" extends="chrome://global/content/toolbarBindings.xml#toolbar">
<content inherits="false">
<xul:box class="inner-box" flex="1">
<xul:toolbargrippy inherits="grippytooltiptext:tooltiptext,grippytooltip:tooltip,last-toolbar"
onclick="this.grippyClicked();" tbattr="toolbar-grippy"
class="toolbar-primary-grippy"/>
<xul:box flex="1" class="toolbar-holder" inherits="collapsed,last-toolbar,tborient:orient,tbautostretch:autostretch" autostretch="never">
<children/>
</xul:box>
</xul:box>
</content>
</binding>
<binding id="nav-bar-inner" extends="xul:box">
<content>
<xul:stack flex="1">
<xul:box flex="1" class="navbar-inner-groove-images">
<xul:box class="navbar-inner-groove-image-left"/>
<xul:box flex="1" class="navbar-inner-groove-image-middle"/>
<xul:box class="navbar-inner-groove-image-right"/>
</xul:box>
<xul:box flex="1">
<children/>
</xul:box>
</xul:stack>
</content>
</binding>
<binding id="urlbar-group" extends="xul:box">
<content>
<xul:stack flex="1">
<xul:box flex="1" class="urlbar-groove-images">
<xul:box class="urlbar-image-left"/>
<xul:box flex="1" class="urlbar-image-middle"/>
<xul:box class="urlbar-image-right"/>
</xul:box>
<xul:box flex="1">
<children/>
</xul:box>
</xul:stack>
</content>
</binding>
<binding id="three-slice-button" extends="chrome://global/content/xulBindings.xml#basetext">
<content excludes="observes,template">
<xul:spring class="three-slice-button-image-left" inherits="default,disabled"/>
<xul:box flex="1" class="three-slice-button-image-middle" inherits="default,disabled" orient="vertical" align="center">
<xul:spring flex="1" class="three-slice-button-top-spring"/>
<xul:box flex="1">
<xul:image class="three-slice-button-icon" inherits="src"/>
<xul:box class="three-slice-button-text-box" flex="1">
<xul:text inherits="disabled,value,crop,accesskey"/>
</xul:box>
</xul:box>
<xul:spring flex="1" class="three-slice-button-bottom-spring"/>
</xul:box>
<xul:spring class="three-slice-button-image-right" inherits="default,disabled"/>
</content>
</binding>
<binding id="taskbar" extends="xul:box">
<content>
<xul:stack flex="1">
<xul:box flex="1" class="taskbar-bg-images">
<xul:box class="taskbar-image-left"/>
<xul:box flex="1" class="taskbar-image-middle"/>
<xul:box class="taskbar-image-right"/>
</xul:box>
<xul:box flex="1">
<children/>
</xul:box>
</xul:stack>
</content>
</binding>
<binding id="taskbar-menu-box" extends="xul:box">
<content>
<xul:stack flex="1">
<xul:box flex="1" class="taskbar-mb-images">
<xul:box class="taskbar-mb-image-left"/>
<xul:box flex="1" class="taskbar-mb-image-middle"/>
<xul:box class="taskbar-mb-image-right"/>
</xul:box>
<xul:box flex="1">
<children/>
</xul:box>
</xul:stack>
</content>
</binding>
</bindings>

View File

@ -154,3 +154,31 @@ install::
$(MAKE_INSTALL) wizardOverlay.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) loading.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) globalBindings.xml $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) button-3slice-active-left.png $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) button-3slice-active-middle.png $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) button-3slice-active-right.png $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) button-3slice-normal-left.png $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) button-3slice-normal-middle.png $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) button-3slice-normal-right.png $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) navbar-bg-leftcap.png $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) navbar-bg-rightcap.png $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) taskbar-addressbook.png $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) taskbar-bg-left.png $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) taskbar-bg-right.png $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) taskbar-bg.png $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) taskbar-composer-clicked.png $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) taskbar-composer.png $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) taskbar-groove-left.png $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) taskbar-groove-middle.png $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) taskbar-groove-right.png $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) taskbar-mail-clicked.png $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) mb-single-arrow.png $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) navbar-bg.png $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) taskbar-addressbook-clicked.png $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) taskbar-mail.png $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) taskbar-navigator-clicked.png $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) taskbar-navigator.png $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) print-disabled.png $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) print-hover.png $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) print-clicked.png $(DIST)\bin\chrome\skins\$(THEME)\global\skin
$(MAKE_INSTALL) print.png $(DIST)\bin\chrome\skins\$(THEME)\global\skin

View File

@ -29,7 +29,7 @@
.menubutton-single-icon
{
margin-right : 3px;
margin-left : 3px;
}
/** "Dual Functionality" menubutton
@ -115,4 +115,4 @@
border : 1px inset #CCCCCC;
padding : 2px 0px 0px 2px;
}

View File

@ -16,3 +16,27 @@ reload.gif
search.gif
stop.gif
pageInfo.css
back-clicked.png
back-disabled.png
back-hover.png
forward-clicked.png
forward-disabled.png
forward-hover.png
navbar-inner-groove-left.png
navbar-inner-groove-middle.png
navbar-inner-groove-right.png
reload-clicked.png
reload-disabled.png
reload-hover.png
stop-clicked.png
stop-disabled.png
stop-hover.png
ubhist-keyword-popup-active.png
ubhist-keyword-popup.png
urlbar-left.png
urlbar-middle.png
urlbar-right.png
back.png
forward.png
reload.png
stop.png

View File

@ -48,6 +48,30 @@ EXPORT_RESOURCE_SAMPLES = \
search.gif \
stop.gif \
pageInfo.css \
back-clicked.png \
back-disabled.png \
back-hover.png \
forward-clicked.png \
forward-disabled.png \
forward-hover.png \
navbar-inner-groove-left.png \
navbar-inner-groove-middle.png \
navbar-inner-groove-right.png \
reload-clicked.png \
reload-disabled.png \
reload-hover.png \
stop-clicked.png \
stop-disabled.png \
stop-hover.png \
urlbar-left.png \
urlbar-middle.png \
urlbar-right.png \
back.png \
forward.png \
reload.png \
stop.png \
ubhist-keyword-popup-active.png \
ubhist-keyword-popup.png \
$(NULL)
include $(topsrcdir)/config/rules.mk

View File

@ -46,3 +46,27 @@ install::
$(MAKE_INSTALL) reload.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) search.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) stop.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) back-clicked.png $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) back-disabled.png $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) back-hover.png $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) forward-clicked.png $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) forward-disabled.png $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) forward-hover.png $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) navbar-inner-groove-left.png $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) navbar-inner-groove-middle.png $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) navbar-inner-groove-right.png $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) reload-clicked.png $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) reload-disabled.png $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) reload-hover.png $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) stop-clicked.png $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) stop-disabled.png $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) stop-hover.png $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) ubhist-keyword-popup-active.png $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) ubhist-keyword-popup.png $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) urlbar-left.png $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) urlbar-middle.png $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) urlbar-right.png $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) back.png $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) forward.png $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) reload.png $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) stop.png $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin

View File

@ -43,40 +43,216 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
*/
#back-button
{
list-style-image : url("chrome://navigator/skin/back.gif");
margin : 0px;
list-style-image : url("chrome://navigator/skin/back.png");
}
#back-button[disabled="true"],
#back-button[disabled="true"]:hover,
#back-button[disabled="true"]:hover:active,
#back-button[disabled="true"] > .menubutton-dual-stack > .menubutton-dual-button,
#back-button[disabled="true"] > .menubutton-dual-stack > .menubutton-dual-button:hover,
#back-button[disabled="true"] > .menubutton-dual-stack > .menubutton-dual-button:hover:active
{
list-style-image : url("chrome://navigator/skin/back-disabled.png");
}
#back-button > .menubutton-dual-stack > .menubutton-dual-button:hover
{
list-style-image : url("chrome://navigator/skin/back-hover.png");
}
#back-button > .menubutton-dual-stack > .menubutton-dual-button:hover:active
{
list-style-image : url("chrome://navigator/skin/back-clicked.png");
}
#forward-button
{
list-style-image : url("chrome://navigator/skin/forward.gif");
margin : 0px;
list-style-image : url("chrome://navigator/skin/forward.png");
}
#forward-button[disabled="true"],
#forward-button[disabled="true"]:hover,
#forward-button[disabled="true"]:hover:active,
#forward-button[disabled="true"] > .menubutton-dual-stack > .menubutton-dual-button,
#forward-button[disabled="true"] > .menubutton-dual-stack > .menubutton-dual-button:hover,
#forward-button[disabled="true"] > .menubutton-dual-stack > .menubutton-dual-button:hover:active
{
list-style-image : url("chrome://navigator/skin/forward-disabled.png");
}
#forward-button > .menubutton-dual-stack > .menubutton-dual-button:hover
{
list-style-image : url("chrome://navigator/skin/forward-hover.png");
}
#forward-button > .menubutton-dual-stack > .menubutton-dual-button:hover:active
{
list-style-image : url("chrome://navigator/skin/forward-clicked.png");
}
#stop-button
{
list-style-image : url("chrome://navigator/skin/stop.gif");
list-style-image : url("chrome://navigator/skin/stop.png");
}
#stop-button[disabled="true"],
#stop-button[disabled="true"]:hover,
#stop-button[disabled="true"]:hover:active
{
list-style-image : url("chrome://navigator/skin/stop-disabled.png");
}
#stop-button:hover
{
list-style-image : url("chrome://navigator/skin/stop-hover.png");
}
#stop-button:hover:active
{
list-style-image : url("chrome://navigator/skin/stop-clicked.png");
}
#reload-button
{
list-style-image : url("chrome://navigator/skin/reload.gif");
list-style-image : url("chrome://navigator/skin/reload.png");
}
#reload-button[disabled="true"],
#reload-button[disabled="true"]:hover,
#reload-button[disabled="true"]:hover:active
{
ist-style-image : url("chrome://navigator/skin/reload.png");
}
#reload-button:hover
{
list-style-image : url("chrome://navigator/skin/reload-hover.png");
}
#reload-button:hover:active
{
list-style-image : url("chrome://navigator/skin/reload-clicked.png");
}
#print-button
{
behavior : url("chrome://communicator/skin/menubuttonBindings.xml#menubutton-dual-foo");
list-style-image : url("chrome://global/skin/print.png");
margin-left : 4px;
}
#print-button[disabled="true"],
#print-button[disabled="true"]:hover,
#print-button[disabled="true"]:hover:active,
#print-button[disabled="true"] > .menubutton-dual-stack > .menubutton-dual-button,
#print-button[disabled="true"] > .menubutton-dual-stack > .menubutton-dual-button:hover,
#print-button[disabled="true"] > .menubutton-dual-stack > .menubutton-dual-button:hover:active
{
list-style-image : url("chrome://global/skin/print-disabled.png");
}
#print-button > .menubutton-dual-stack > .menubutton-dual-button:hover
{
list-style-image : url("chrome://global/skin/print-hover.png");
}
#print-button > .menubutton-dual-stack > .menubutton-dual-button:hover:active
{
list-style-image : url("chrome://global/skin/print-clicked.png");
}
/*all the urlbar stuff*/
#nav-bar-inner
{
behavior : url("chrome://global/skin/globalBindings.xml#nav-bar-inner");
padding-left : 6px;
margin-top : -3px;
}
.navbar-inner-groove-image-left
{
background : url("chrome://navigator/skin/navbar-inner-groove-left.png") no-repeat;
width : 6px;
height : 31px;
}
.navbar-inner-groove-image-middle
{
background : url("chrome://navigator/skin/navbar-inner-groove-middle.png") repeat-x;
}
.navbar-inner-groove-image-right
{
background : url("chrome://navigator/skin/navbar-inner-groove-right.png") no-repeat;
width : 6px;
height : 31px;
}
#urlbar-group
{
behavior : url("chrome://global/skin/globalBindings.xml#urlbar-group");
margin : 6px 8px 6px 8px;
}
.urlbar-image-left
{
background : url("chrome://navigator/skin/urlbar-left.png") no-repeat;
width : 4px;
height : 18px;
}
.urlbar-image-middle
{
background : url("chrome://navigator/skin/urlbar-middle.png") repeat-x;
}
.urlbar-image-right
{
background : url("chrome://navigator/skin/urlbar-right.png") no-repeat;
width : 3px;
height : 18px;
}
#page-proxy-button
{
list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
cursor : grab;
margin-left : 4px;
margin-right : 2px;
list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-item.png");
cursor : grab;
}
/* #ubhist-keyword-popup does not exist in Mozilla, only in Netscape. It gets overlayed in with
* navExtraOverlay.xul. Ideally, this styling should only exist in Netscape, but since it is
* in Mozilla right now, it should not be removed before we ship. Take this out and put it in
* commercial after shipping. (8/24/00) - nbhatla
*/
#ubhist-keyword-popup
{
margin : 0px 4px 0px 0px;
width : 10px;
list-style-image : url("chrome://global/skin/scroll-down.gif");
list-style-image : url("chrome://navigator/skin/ubhist-keyword-popup.png");
background-color : transparent;
border : 0px;
}
#ubhist-keyword-popup > .menubutton-icon-internal-box
{
border : 0px;
}
#ubhist-keyword-popup:hover:active
{
margin : 0px 4px 0px 0px;
width : 10px;
list-style-image : url("chrome://navigator/skin/ubhist-keyword-popup-active.png");
}
/*************************************/
#ubhist
{
margin : 3px 1px 3px 0px;
@ -119,19 +295,19 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
list-style-image : url("chrome://communicator/skin/document-error.gif");
}
#nav-bar-inner
#go-button
{
padding-left : 6px;
display : none;
}
#search-button
{
margin-right : 1px;
margin-right : 10px;
}
#home-button
{
list-style-image : url("chrome://communicator/skin/bookmarks/home.gif");
list-style-image : url("chrome://communicator/skin/bookmarks/home.png");
}
.menuitem-iconic
@ -139,15 +315,12 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
padding : 2px;
}
#print-button
#PersonalToolbar
{
list-style-image : url("chrome://global/skin/print.gif");
behavior : url("chrome://global/skin/globalBindings.xml#toolbar-bordered");
}
#nav-bar-buttons
#PersonalToolbar > .inner-box
{
/* behavior : url("chrome://navigator/skin/navigatorBindings.xml#navigation-buttons");*/
vertical-align : middle;
}
border-bottom : 1px solid #000000;
}