#46423 -> new modern skin. backing out changes to toolbar. workaround fix for #51768. navbar no longer accomodates larger fonts in urlbar. r=hewitt.

This commit is contained in:
nbhatla%netscape.com 2000-09-08 23:43:40 +00:00
Родитель 8c32d42fd9
Коммит a687a0e360
9 изменённых файлов: 63 добавлений и 290 удалений

Просмотреть файл

@ -3,7 +3,7 @@
{
-moz-binding : url("chrome://global/content/xulBindings.xml#buttontop");
list-style-image : url("chrome://global/skin/animthrob_single.gif");
margin : 5px 11px 6px 8px;
margin : 5px 1px 9px 8px;
padding : 0px;
cursor : pointer;
border : 0px;
@ -17,7 +17,7 @@
#navigator-throbber:hover:active
{
margin : 6px 10px 5px 9px;
margin : 4px 0px 5px 9px;
}
#navigator-throbber > .button-internal-box

Просмотреть файл

@ -207,7 +207,7 @@
font-weight : bold;
background-color : transparent;
border : 0px;
margin : 2px 7px 2px 0px;
margin : 3px 7px 2px 0px;
color : #2F405D;
}

Просмотреть файл

@ -81,22 +81,22 @@ toolbar[collapsed="true"] > toolbargrippy
.toolbar-primary-image-left
{
list-style-image : url("chrome://global/skin/navbar-bg-leftcap.gif");
background : url("chrome://global/skin/navbar-bg-leftcap.gif") no-repeat;
width : 24px;
height : 43px;
height : 46px;
}
.toolbar-primary-image-middle
{
list-style-image : url("chrome://global/skin/navbar-bg.gif");
height : 43px;
background : url("chrome://global/skin/navbar-bg.gif") repeat-x;
height : 46px;
}
.toolbar-primary-image-right
{
list-style-image : url("chrome://global/skin/navbar-bg-rightcap.gif");
background : url("chrome://global/skin/navbar-bg-rightcap.gif") no-repeat;
width : 24px;
height : 43px;
height : 46px;
}
.toolbary-primary-grippy

Просмотреть файл

@ -29,63 +29,41 @@
<binding id="toolbar-primary" extends="chrome://global/content/toolbarBindings.xml#toolbar">
<content>
<xul:stack flex="1">
<xul:box flex="1">
<xul:image class="toolbar-primary-image-left"/>
<xul:image flex="1" class="toolbar-primary-image-middle"/>
<xul:image class="toolbar-primary-image-right"/>
</xul:box>
<xul:box flex="1">
<xul:toolbargrippy inherits="tooltiptext=grippytooltiptext,tooltip=grippytooltip,last-toolbar"
onclick="this.grippyClicked();" tbattr="toolbar-grippy"
class="toolbar-primary-grippy"/>
<xul:box flex="1" class="toolbar-holder" inherits="collapsed,last-toolbar,orient=tborient,autostretch=tbautostretch" autostretch="never">
<children/>
</xul:box>
</xul:box>
</xul:stack>
</content>
<xul:box class="toolbar-primary-image-left">
<xul:toolbargrippy inherits="tooltiptext=grippytooltiptext,tooltip=grippytooltip,last-toolbar"
onclick="this.grippyClicked();" tbattr="toolbar-grippy" class="toolbar-primary-grippy"/>
</xul:box>
<xul:box flex="1" class="toolbar-primary-image-middle toolbar-holder"
inherits="collapsed,last-toolbar,orient=tborient,autostretch=tbautostretch" autostretch="never">
<children/>
</xul:box>
<xul:spring class="toolbar-primary-image-right"/>
</content>
</binding>
<binding id="nav-bar-inner" extends="xul:box">
<content>
<xul:box orient="vertical">
<xul:spring class="navbar-inner-groove-image-left-top"/>
<xul:spring flex="1" class="navbar-inner-groove-image-left-middle"/>
<xul:spring class="navbar-inner-groove-image-left-bottom"/>
</xul:box>
<xul:box flex="1" class="navbar-inner-border-outer">
<xul:image class="navbar-inner-groove-image-left"/>
<xul:box flex="1" class="navbar-inner-border-outer">
<xul:box flex="1" class="navbar-inner-border-middle">
<xul:box flex="1" class="navbar-inner-border-inner">
<children/>
</xul:box>
</xul:box>
</xul:box>
<xul:box orient="vertical">
<xul:spring class="navbar-inner-groove-image-right-top"/>
<xul:spring flex="1" class="navbar-inner-groove-image-right-middle"/>
<xul:spring class="navbar-inner-groove-image-right-bottom"/>
</xul:box>
</xul:box>
<xul:image class="navbar-inner-groove-image-right"/>
</content>
</binding>
<binding id="urlbar-group" extends="xul:box">
<content>
<xul:box orient="vertical">
<xul:spring class="urlbar-image-left-top"/>
<xul:spring flex="1" class="urlbar-image-left-middle"/>
<xul:spring class="urlbar-image-left-bottom"/>
</xul:box>
<xul:box flex="1" class="urlbar-border-outer">
<xul:box flex="1" class="urlbar-border-inner">
<xul:image class="urlbar-image-left"/>
<xul:box flex="1" class="urlbar-border-outer">
<xul:box flex="1" class="urlbar-border-inner">
<children/>
</xul:box>
</xul:box>
<xul:box orient="vertical">
<xul:spring class="urlbar-image-right-top"/>
<xul:spring flex="1" class="urlbar-image-right-middle"/>
<xul:spring class="urlbar-image-right-bottom"/>
</xul:box>
<xul:image class="urlbar-image-right"/>
</content>
</binding>

Просмотреть файл

@ -358,20 +358,6 @@ skins/modern.jar:
navigator/skin/urlbar-left.gif (navigator/urlbar-left.gif)
navigator/skin/urlbar-middle.gif (navigator/urlbar-middle.gif)
navigator/skin/urlbar-right.gif (navigator/urlbar-right.gif)
navigator/skin/navbar-groove-left-bottom.gif (navigator/navbar-groove-left-bottom.gif)
navigator/skin/navbar-groove-left-middle.gif (navigator/navbar-groove-left-middle.gif)
navigator/skin/navbar-groove-left-top.gif (navigator/navbar-groove-left-top.gif)
navigator/skin/navbar-groove-middle-bottom.gif (navigator/navbar-groove-middle-bottom.gif)
navigator/skin/navbar-groove-middle-top.gif (navigator/navbar-groove-middle-top.gif)
navigator/skin/navbar-groove-right-bottom.gif (navigator/navbar-groove-right-bottom.gif)
navigator/skin/navbar-groove-right-middle.gif (navigator/navbar-groove-right-middle.gif)
navigator/skin/navbar-groove-right-top.gif (navigator/navbar-groove-right-top.gif)
navigator/skin/urlbar-left-bottom.gif (navigator/urlbar-left-bottom.gif)
navigator/skin/urlbar-left-middle.gif (navigator/urlbar-left-middle.gif)
navigator/skin/urlbar-left-top.gif (navigator/urlbar-left-top.gif)
navigator/skin/urlbar-right-bottom.gif (navigator/urlbar-right-bottom.gif)
navigator/skin/urlbar-right-middle.gif (navigator/urlbar-right-middle.gif)
navigator/skin/urlbar-right-top.gif (navigator/urlbar-right-top.gif)
communicator/skin/bookmarks/bookmark-folder-closed-sel.gif (communicator/bookmarks/bookmark-folder-closed-sel.gif)
communicator/skin/bookmarks/bookmark-folder-closed.gif (communicator/bookmarks/bookmark-folder-closed.gif)
communicator/skin/bookmarks/bookmark-folder-open-sel.gif (communicator/bookmarks/bookmark-folder-open-sel.gif)

Просмотреть файл

@ -1,51 +0,0 @@
#!dest navigator:skin
alertl.gif
back-clicked.gif
back-disabled.gif
back-hover.gif
back.gif
errorl.gif
forward-clicked.gif
forward-disabled.gif
forward-hover.gif
forward.gif
home.gif
location-hover.gif
location.gif
messagel.gif
mynetscape.gif
n-box-persbar.gif
navbar-inner-groove-left.gif
navbar-inner-groove-middle.gif
navbar-inner-groove-right.gif
navigator.css
print.gif
questionl.gif
reload-clicked.gif
reload-disabled.gif
reload-hover.gif
reload.gif
search.gif
stop-clicked.gif
stop-disabled.gif
stop-hover.gif
stop.gif
ubhist-keyword-popup-active.gif
ubhist-keyword-popup.gif
urlbar-left.gif
urlbar-middle.gif
urlbar-right.gif
navbar-groove-left-bottom.gif
navbar-groove-left-middle.gif
navbar-groove-left-top.gif
navbar-groove-middle-bottom.gif
navbar-groove-middle-top.gif
navbar-groove-right-bottom.gif
navbar-groove-right-middle.gif
navbar-groove-right-top.gif
urlbar-left-bottom.gif
urlbar-left-middle.gif
urlbar-left-top.gif
urlbar-right-bottom.gif
urlbar-right-middle.gif
urlbar-right-top.gif

Просмотреть файл

@ -67,20 +67,6 @@ EXPORT_RESOURCE_SAMPLES = \
urlbar-left.gif \
urlbar-middle.gif \
urlbar-right.gif \
navbar-groove-left-bottom.gif \
navbar-groove-left-middle.gif \
navbar-groove-left-top.gif \
navbar-groove-middle-bottom.gif \
navbar-groove-middle-top.gif \
navbar-groove-right-bottom.gif \
navbar-groove-right-middle.gif \
navbar-groove-right-top.gif \
urlbar-left-bottom.gif \
urlbar-left-middle.gif \
urlbar-left-top.gif \
urlbar-right-bottom.gif \
urlbar-right-middle.gif \
urlbar-right-top.gif \
$(NULL)
include $(topsrcdir)/config/rules.mk

Просмотреть файл

@ -1,81 +0,0 @@
#
# The contents of this file are subject to the Netscape Public
# License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of
# the License at http://www.mozilla.org/NPL/
#
# Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing
# rights and limitations under the License.
#
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s):
#
DEPTH = ..\..\..
THEME_ROOT_DEPTH = ..
include <$(DEPTH)\config\rules.mak>
include <$(THEME_ROOT_DEPTH)\theme.mk>
clobber::
rm -f $(DIST)\chrome\skins\$(THEME)\navigator\skin\*.*
install::
$(MAKE_INSTALL) alertl.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) back-clicked.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) back-disabled.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) back-hover.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) back.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) errorl.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) forward-clicked.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) forward-disabled.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) forward-hover.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) forward.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) home.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) location-hover.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) location.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) messagel.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) mynetscape.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) n-box-persbar.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) navbar-inner-groove-left.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) navbar-inner-groove-middle.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) navbar-inner-groove-right.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) navigator.css $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) print.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) questionl.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) reload-clicked.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) reload-disabled.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) reload-hover.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(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-clicked.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) stop-disabled.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) stop-hover.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) stop.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) ubhist-keyword-popup-active.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) ubhist-keyword-popup.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) urlbar-left.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) urlbar-middle.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) urlbar-right.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) navbar-groove-left-bottom.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) navbar-groove-left-middle.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) navbar-groove-left-top.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) navbar-groove-middle-bottom.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) navbar-groove-middle-top.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) navbar-groove-right-bottom.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) navbar-groove-right-middle.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) navbar-groove-right-top.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) urlbar-left-bottom.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) urlbar-left-middle.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) urlbar-left-top.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) urlbar-right-bottom.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) urlbar-right-middle.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
$(MAKE_INSTALL) urlbar-right-top.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin

Просмотреть файл

@ -140,7 +140,7 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
{
-moz-binding : url("chrome://communicator/skin/menubuttonBindings.xml#menubutton-dual-foo");
list-style-image : url("chrome://global/skin/print.gif");
margin : 6px 6px 6px 6px;
margin : 6px 6px 10px 6px;
}
#print-button[disabled="true"],
@ -179,51 +179,23 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
/*all the urlbar stuff*/
#nav-bar > .toolbar-primary-image-left, #nav-bar > .toolbar-primary-image-middle, #nav-bar > .toolbar-primary-image-right
{
max-height : 43px;
}
#nav-bar-inner
{
-moz-binding : url("chrome://global/skin/globalBindings.xml#nav-bar-inner");
margin : 6px 0px 6px 6px;
margin : 6px 0px 9px 6px;
min-width : 0px;
}
.navbar-inner-groove-image-left-top
{
background : url("chrome://navigator/skin/navbar-groove-left-top.gif") no-repeat;
height : 15px;
width : 6px;
}
.navbar-inner-groove-image-left-middle
{
background : url("chrome://navigator/skin/navbar-groove-left-middle.gif") repeat-y;
width : 6px;
}
.navbar-inner-groove-image-left-bottom
{
background : url("chrome://navigator/skin/navbar-groove-left-bottom.gif") no-repeat;
height : 15px;
width : 6px;
}
.navbar-inner-groove-image-right-top
{
background : url("chrome://navigator/skin/navbar-groove-right-top.gif") no-repeat;
height : 15px;
width : 6px;
}
.navbar-inner-groove-image-right-middle
{
background : url("chrome://navigator/skin/navbar-groove-right-middle.gif") repeat-y;
width : 6px;
}
.navbar-inner-groove-image-right-bottom
{
background : url("chrome://navigator/skin/navbar-groove-right-bottom.gif") no-repeat;
height : 15px;
width : 6px;
.navbar-inner-groove-image-left
{
list-style-image : url("chrome://navigator/skin/navbar-inner-groove-left.gif");
width : 6px;
height : 31px;
}
/* 3px border on top and bottom of navbar-inner */
@ -246,50 +218,25 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
border-bottom : 1px solid #556D8B;
}
.navbar-inner-groove-image-right
{
list-style-image : url("chrome://navigator/skin/navbar-inner-groove-right.gif");
width : 6px;
height : 31px;
}
#urlbar-group
{
-moz-binding : url("chrome://global/skin/globalBindings.xml#urlbar-group");
margin : 3px 8px 4px 2px;
}
.urlbar-image-left-top
.urlbar-image-left
{
background : url("chrome://navigator/skin/urlbar-left-top.gif") no-repeat;
width : 3px;
height : 4px;
}
.urlbar-image-left-middle
{
background : url("chrome://navigator/skin/urlbar-left-middle.gif") repeat-y;
width : 3px;
}
.urlbar-image-left-bottom
{
background : url("chrome://navigator/skin/urlbar-left-bottom.gif") no-repeat;
width : 3px;
height : 4px;
}
.urlbar-image-right-top
{
background : url("chrome://navigator/skin/urlbar-right-top.gif") no-repeat;
width : 4px;
height : 8px;
}
.urlbar-image-right-middle
{
background : url("chrome://navigator/skin/urlbar-right-middle.gif") repeat-y;
width : 4px;
}
.urlbar-image-right-bottom
{
background : url("chrome://navigator/skin/urlbar-right-bottom.gif") no-repeat;
width : 4px;
height : 9px;
list-style-image : url("chrome://navigator/skin/urlbar-left.gif");
width : 3px;
height : 18px;
}
.urlbar-border-outer
@ -301,7 +248,15 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
{
border-top : 1px solid #A3A3A3;
}
.urlbar-image-right
{
list-style-image : url("chrome://navigator/skin/urlbar-right.gif");
width : 4px;
height : 18px;
}
#page-proxy-button
{
margin-left : 0px;
@ -320,7 +275,7 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
#ubhist-keyword-popup
{
margin : 2px 4px 9px 3px;
margin : 3px 4px 8px 3px;
width : 10px;
list-style-image : url("chrome://navigator/skin/ubhist-keyword-popup.gif");
background-color : transparent;
@ -334,7 +289,7 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
#ubhist-keyword-popup:hover:active
{
margin : 2px 4px 9px 3px;
margin : 3px 4px 8px 3px;
width : 10px;
list-style-image : url("chrome://navigator/skin/ubhist-keyword-popup-active.gif");
}