fixing navigation buttons
|
@ -9,3 +9,6 @@ menubutton.css
|
|||
navbar-endbox.gif
|
||||
splitter.css
|
||||
toolbar.css
|
||||
menubuttonBindings.xml
|
||||
tb-menubutton-dm.gif
|
||||
tb-menubutton-dm-disabled.gif
|
||||
|
|
|
@ -35,10 +35,13 @@ EXPORT_RESOURCE = \
|
|||
$(srcdir)/communicator.css \
|
||||
$(srcdir)/formatting.css \
|
||||
$(srcdir)/menu.css \
|
||||
$(srcdir)/menubuttonBindings.xml \
|
||||
$(srcdir)/menubutton.css \
|
||||
$(srcdir)/splitter.css \
|
||||
$(srcdir)/toolbar.css \
|
||||
$(srcdir)/navbar-endbox.gif \
|
||||
$(srcdir)/tb-menubutton-dm.gif \
|
||||
$(srcdir)/tb-menubutton-dm-disabled.gif \
|
||||
$(NULL)
|
||||
|
||||
DIRS = search xpinstall sidebar bookmarks directory profile regviewer related wallet
|
||||
|
|
|
@ -29,6 +29,7 @@ include <$(THEME_ROOT_DEPTH)\theme.mk>
|
|||
|
||||
install::
|
||||
$(MAKE_INSTALL) box.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
|
||||
$(MAKE_INSTALL) menubuttonBindings.xml $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
|
||||
$(MAKE_INSTALL) brand.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
|
||||
$(MAKE_INSTALL) button.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
|
||||
$(MAKE_INSTALL) communicator.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
|
||||
|
@ -37,6 +38,8 @@ install::
|
|||
$(MAKE_INSTALL) menubutton.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
|
||||
$(MAKE_INSTALL) navbar-endbox.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
|
||||
$(MAKE_INSTALL) splitter.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
|
||||
$(MAKE_INSTALL) tb-menubutton-dm.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
|
||||
$(MAKE_INSTALL) tb-menubutton-dm-disabled.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
|
||||
$(MAKE_INSTALL) toolbar.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
|
||||
|
||||
clobber::
|
||||
|
|
|
@ -52,4 +52,37 @@
|
|||
border-bottom : 1px solid #CCCCCC;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Navigation bar style menubuttons
|
||||
**/
|
||||
.toolbar.menubutton-dual,
|
||||
.toolbar.menubutton-dual
|
||||
{
|
||||
border : none ! important;
|
||||
}
|
||||
|
||||
.button-toolbar-1.menubutton-dual-button
|
||||
{
|
||||
list-style-image : inherit;
|
||||
}
|
||||
|
||||
.menubutton-dual-dropmarker
|
||||
{
|
||||
background : transparent;
|
||||
list-style-image : url("chrome://communicator/skin/tb-menubutton-dm.gif");
|
||||
}
|
||||
|
||||
.menubutton-dual-dropmarker[disabled="true"]
|
||||
{
|
||||
background : transparent;
|
||||
list-style-image : url("chrome://communicator/skin/tb-menubutton-dm-disabled.gif");
|
||||
}
|
||||
|
||||
.menubutton-dual-dropmarker-box
|
||||
{
|
||||
margin-left : 32px;
|
||||
margin-bottom : 1px;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
<?xml version="1.0"?>
|
||||
|
||||
<bindings id="xulBindings"
|
||||
xmlns="http://www.mozilla.org/xbl"
|
||||
xmlns:html="http://www.w3.org/TR/REC-html40"
|
||||
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
|
||||
<binding id="menubutton-dual-foo">
|
||||
<content excludes="observes,template,menupopup">
|
||||
<xul: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:image class="menubutton-dual-dropmarker" inherits="disabled"/>
|
||||
</xul:box>
|
||||
</xul:stack>
|
||||
</content>
|
||||
</binding>
|
||||
|
||||
</bindings>
|
После Ширина: | Высота: | Размер: 55 B |
После Ширина: | Высота: | Размер: 64 B |
Двоичные данные
themes/modern/global/button32-bg-active.gif
До Ширина: | Высота: | Размер: 321 B После Ширина: | Высота: | Размер: 299 B |
Двоичные данные
themes/modern/global/button32-bg-disabled.gif
До Ширина: | Высота: | Размер: 263 B После Ширина: | Высота: | Размер: 247 B |
Двоичные данные
themes/modern/global/button32-bg-hover.gif
До Ширина: | Высота: | Размер: 349 B После Ширина: | Высота: | Размер: 322 B |
Двоичные данные
themes/modern/global/button32-bg.gif
До Ширина: | Высота: | Размер: 336 B После Ширина: | Высота: | Размер: 310 B |
|
@ -43,12 +43,16 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
|
|||
*/
|
||||
#back-button
|
||||
{
|
||||
behavior : url("chrome://communicator/skin/menubuttonBindings.xml#menubutton-dual-foo");
|
||||
list-style-image : url("chrome://navigator/skin/back.gif");
|
||||
margin : 0px;
|
||||
}
|
||||
|
||||
#forward-button
|
||||
{
|
||||
behavior : url("chrome://communicator/skin/menubuttonBindings.xml#menubutton-dual-foo");
|
||||
list-style-image : url("chrome://navigator/skin/forward.gif");
|
||||
margin : 0px;
|
||||
}
|
||||
|
||||
#stop-button
|
||||
|
@ -116,4 +120,4 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
|
|||
.menuitem-iconic
|
||||
{
|
||||
padding : 2px;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -221,18 +221,15 @@ Contributor(s): ______________________________________. -->
|
|||
|
||||
<toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar" persist="collapsed" grippytooltiptext="&navigationBar.tooltip;">
|
||||
<box id="nav-bar-inner" autostretch="never" flex="1">
|
||||
<!--
|
||||
<button class="button-toolbar-1 top" id="back-button" crop="right" observes="canGoBack"/>
|
||||
<button class="button-toolbar-1 top" id="forward-button" crop="right" observes="canGoForward"/>
|
||||
-->
|
||||
<menubutton class="menubutton-dual" id="back-button" crop="right" orient="vertical" observes="canGoBack" oncommand="gotoHistoryIndex(event);"
|
||||
value="&backButton.label;"
|
||||
buttontooltiptext="&backButton.tooltip;">
|
||||
<menubutton class="menubutton-dual toolbar" id="back-button" value="&backButton.label;"
|
||||
crop="right" observes="canGoBack" oncommand="gotoHistoryIndex(event);"
|
||||
buttonaction="BrowserBack();" buttontooltiptext="&backButton.tooltip;">
|
||||
<menupopup oncreate="BrowserBackMenu(event);"/>
|
||||
</menubutton>
|
||||
<menubutton class="menubutton-dual" id="forward-button" crop="right" orient="vertical" observes="canGoForward" oncommand="gotoHistoryIndex(event);"
|
||||
value="&forwardButton.label;"
|
||||
buttontooltiptext="&forwardButton.tooltip;">
|
||||
<menubutton class="menubutton-dual toolbar" id="forward-button"
|
||||
crop="right" orient="vertical" observes="canGoForward"
|
||||
oncommand="gotoHistoryIndex(event);" buttonaction="BrowserForward();"
|
||||
value="&forwardButton.label;" buttontooltiptext="&forwardButton.tooltip;">
|
||||
<menupopup oncreate="BrowserForwardMenu(event);"/>
|
||||
</menubutton>
|
||||
<button class="button-toolbar-1 top" id="reload-button" crop="right" observes="canReload" value="&reloadButton.label;" tooltiptext="&reloadButton.tooltip;"/>
|
||||
|
@ -240,26 +237,25 @@ Contributor(s): ______________________________________. -->
|
|||
|
||||
<box class="box-toolbar-group" flex="1">
|
||||
<menubutton class="menubutton-icon button-toolbar-3" id="ubhist-keyword-popup" tooltiptext="&internetKeyword.tooltip;">
|
||||
<menupopup class="button-toolbar-3" oncreate="CreateUBHistoryMenu(event);" oncommand="ExecuteUBCommand(event);">
|
||||
<!-- <menuitem class="button-toolbar-3 menuitem-non-iconic" value=""eKeyword.label;" keyword="quote"/>
|
||||
<menupopup class="button-toolbar-3" oncreate="CreateUBHistoryMenu(event);" oncommand="ExecuteUBCommand(event);">
|
||||
<!--
|
||||
<menuitem class="button-toolbar-3 menuitem-non-iconic" value=""eKeyword.label;" keyword="quote"/>
|
||||
<menuitem class="button-toolbar-3 menuitem-non-iconic" value="&localKeyword.label;" keyword="local"/>
|
||||
<menuitem class="button-toolbar-3 menuitem-non-iconic" value="&shopKeyword.label;" keyword="shop"/>
|
||||
<menuitem class="button-toolbar-3 menuitem-non-iconic" value="&careerKeyword.label;" keyword="career"/>
|
||||
<menuitem class="button-toolbar-3 menuitem-non-iconic" value="&webmailKeyword.label;" keyword="webmail"/>
|
||||
<menuitem class="button-toolbar-3 menuitem-non-iconic" value="&listKeywords.label;" keyword="list"/>
|
||||
<menuseparator/> -->
|
||||
<menuseparator/>
|
||||
-->
|
||||
</menupopup>
|
||||
</menubutton>
|
||||
|
||||
|
||||
<box autostretch="never" valign="middle" flex="1">
|
||||
<image id="page-proxy-button" ondraggesture="DragProxyIcon(event);"/>
|
||||
<!--<textfield class="plain chromeclass-location" id="urlbar" flex="1"
|
||||
onkeypress="if( event.which == 13 ) { AddToUrlbarHistory(); BrowserLoadURL(); }"
|
||||
tooltiptext="&locationBar.tooltip;"/> -->
|
||||
<textfield autocomplete="false" timeout="300" class="plain chromeclass-location"
|
||||
searchSessionType="urlbar" id="urlbar" tooltiptext="&locationBar.tooltip;"
|
||||
onkeypress="if( event.which == 13 ) { AddToUrlbarHistory(); BrowserLoadURL(); }" flex="1"/>
|
||||
<textfield autocomplete="false" timeout="300" class="plain chromeclass-location"
|
||||
searchSessionType="urlbar" id="urlbar" tooltiptext="&locationBar.tooltip;"
|
||||
onkeypress="if( event.which == 13 ) { AddToUrlbarHistory(); BrowserLoadURL(); }" flex="1"/>
|
||||
<button class="button-toolbar-3" id="search-button" value="&searchButton.label;"
|
||||
oncommand="OpenSearch('internet',false, document.getElementById('urlbar').value);"
|
||||
tooltiptext="&searchButton.tooltip;"/>
|
||||
|
@ -272,7 +268,6 @@ Contributor(s): ______________________________________. -->
|
|||
<button class="plain" id="navigator-throbber" oncommand="goClickThrobber('browser.throbber.url')" tooltiptext="&throbber.tooltip;"/>
|
||||
</toolbar>
|
||||
|
||||
|
||||
<toolbar id="PersonalToolbar" class="chromeclass-directories" persist="collapsed" dragdroparea="innermostBox"
|
||||
ondraggesture="return BeginDragPersonalToolbar(event);"
|
||||
ondragdrop="return DropPersonalToolbar(event);"
|
||||
|
|