--- themes/classic/navigator/navigator.css
+++ themes/classic/navigator/navigator.css Thu Sep 12 21:33:48 2002
@@ -140,9 +140,7 @@
min-width: 0;
}
-.toolbarbutton-1[toolbarmode="small"] > .toolbarbutton-menubutton-button
- > .toolbarbutton-text,
-.toolbarbutton-1[toolbarmode="small"] > .toolbarbutton-text {
+.toolbarbutton-text[toolbarmode="small"] {
display: none;
}
@@ -150,15 +148,18 @@
display: none;
}
-#nav-bar[toolbarmode="small"] > #nav-bar-inner {
- margin: 0;
- border: none;
+.toolbarbutton-icon[toolbarmode="small"] {
+ display: inline;
}
#nav-bar[toolbarmode="small"] > .toolbar-primary-grippy {
display: none;
}
+.toolbarbutton-text[buttonstyle="text"] {
+ padding: 4px 0;
+}
+
/* ::::: fullscreen window controls ::::: */
#window-controls {
@@ -185,7 +186,6 @@
#nav-bar-inner {
-moz-box-align: center;
min-width: 0px;
- margin: 4px 6px;
}
#urlbar {
--- themes/classic/communicator/brand.css
+++ themes/classic/communicator/brand.css Thu Sep 12 21:32:58 2002
@@ -56,11 +56,15 @@
list-style-image: url("chrome://communicator/skin/brand/throbber-anim.gif");
}
+#navigator-throbber[buttonstyle="text"],
+#navigator-throbber[buttonstyle="pictures"],
#navigator-throbber[toolbarmode="small"] {
- margin: 0 5px 0 0;
+ margin: 0 5px;
list-style-image: url("chrome://communicator/skin/brand/throbber16-single.gif");
}
+#navigator-throbber[buttonstyle="text"][busy="true"],
+#navigator-throbber[buttonstyle="pictures"][busy="true"],
#navigator-throbber[toolbarmode="small"][busy="true"] {
list-style-image: url("chrome://communicator/skin/brand/throbber16-anim.gif");
}
--- themes/classic/communicator/button.css
+++ themes/classic/communicator/button.css Thu Sep 12 21:33:16 2002
@@ -61,6 +61,16 @@
display: none;
}
+.toolbarbutton-1[buttonstyle="pictures"],
+.toolbarbutton-menubutton-button[buttonstyle="pictures"] {
+ min-width: 0px;
+}
+
+.toolbarbutton-text[buttonstyle="pictures"],
+.toolbarbutton-icon[buttonstyle="text"] {
+ display: none;
+}
+
/* ::::: standard toolbar buttons ::::: */
.button-toolbar {
--- themes/modern/global/globalBindings.xml
+++ themes/modern/global/globalBindings.xml Thu Sep 12 21:34:08 2002
@@ -16,8 +16,8 @@
-
+
--- themes/modern/navigator/navigator.css
+++ themes/modern/navigator/navigator.css Thu Sep 12 21:34:42 2002
@@ -142,7 +142,13 @@
.toolbarbutton-1 > stack > .toolbarbutton-menubutton-button
> .toolbarbutton-text,
.toolbarbutton-1 > .toolbarbutton-text {
- display: none;
+ display: none !important;
+}
+
+.toolbarbutton-1 > stack > .toolbarbutton-menubutton-button
+ > .toolbarbutton-icon,
+.toolbarbutton-1 > .toolbarbutton-icon {
+ display: inline !important;
}
/* ::::: small primary toolbar buttons ::::: */
@@ -216,12 +222,8 @@
-moz-image-region: rect(57px 76px 76px 57px) !important;
}
-#back-button[toolbarmode="small"] > .toolbarbutton-menubutton-stack
- > .toolbarbutton-menubutton-dropmarker,
-#forward-button[toolbarmode="small"] > .toolbarbutton-menubutton-stack
- > .toolbarbutton-menubutton-dropmarker
-{
- margin: 8px 0px 0px 14px;
+.toolbarbutton-menubutton-dropmarker[toolbarmode="small"] {
+ margin: 8px 0px 0px 14px !important;
}
/* temporary - still don't have small print icons */
--- themes/modern/communicator/brand.css
+++ themes/modern/communicator/brand.css Thu Sep 12 21:34:58 2002
@@ -68,11 +68,13 @@
background: url("chrome://communicator/skin/toolbar/prtb-bg-noline.gif") #B1BDC9 repeat-x top;
}
+#navigator-throbber[buttonstyle="text"],
#navigator-throbber[toolbarmode="small"] {
- margin: 0 5px 0 0;
+ margin: 0 5px;
list-style-image: url("chrome://communicator/skin/brand/throbber16-single.gif");
}
+#navigator-throbber[buttonstyle="text"][busy="true"],
#navigator-throbber[toolbarmode="small"][busy="true"] {
list-style-image: url("chrome://communicator/skin/brand/throbber16-anim.gif");
}
--- themes/modern/communicator/button.css
+++ themes/modern/communicator/button.css Thu Sep 12 21:35:18 2002
@@ -82,6 +82,19 @@
display: none;
}
+.toolbarbutton-text[buttonstyle="pictures"],
+.toolbarbutton-icon[buttonstyle="text"] {
+ display: none;
+}
+
+.toolbarbutton-menubutton-dropmarker[buttonstyle="pictures"] {
+ margin: 20px 0px 0px 40px;
+}
+
+.toolbarbutton-menubutton-dropmarker[buttonstyle="text"] {
+ margin: 8px 0px 0px 40px;
+}
+
/* ::::: standard toolbar buttons ::::: */
.button-toolbar {
--- themes/modern/communicator/toolbar.css
+++ themes/modern/communicator/toolbar.css Thu Sep 12 21:35:30 2002
@@ -45,7 +45,6 @@
.toolbar-primary {
-moz-binding: url("chrome://communicator/skin/toolbar/toolbarBindings.xml#toolbar-primary");
- min-height: 45px;
background-color: #B1BDC9;
}
@@ -57,6 +56,14 @@
border-left: none;
}
+.toolbar-primary-holder[buttonstyle="pictures"] {
+ background-image: url("chrome://communicator/skin/toolbar/prtb-bg-noline.gif");
+}
+
+.toolbar-primary-holder[buttonstyle="text"] {
+ background: #D0D7DF;
+}
+
.toolbar-primary-icon {
width: 77px;
height: 50px;
@@ -64,9 +71,15 @@
background-position: top;
}
+.toolbar-primary-icon[buttonstyle="pictures"],
+.toolbar-primary-icon[buttonstyle="text"] {
+ display: none;
+}
+
/* ::::: toolbargrippy ::::: */
.toolbar-primary-grippy {
+ -moz-binding: url("chrome://communicator/skin/toolbar/toolbarBindings.xml#toolbargrippy-primary");
border: none;
background: url("chrome://communicator/skin/toolbar/prtb-grip-mid.gif") repeat-y;
list-style-image: url("chrome://communicator/skin/toolbar/prtb-grip-btm.gif");
@@ -74,8 +87,8 @@
.toolbar-primary-grippy > .toolbargrippy-texture {
width: 13px;
- height: 34px;
- background: url("chrome://communicator/skin/toolbar/prtb-grip-top.gif") no-repeat top;
+ height: 0px;
+ list-style-image: url("chrome://communicator/skin/toolbar/prtb-grip-top.gif");
}
.toolbar-primary-grippy > .toolbargrippy-arrow {
@@ -91,7 +104,7 @@
}
.toolbar-primary-grippy:hover:active > .toolbargrippy-texture {
- background-image: url("chrome://communicator/skin/toolbar/prtb-grip-top-act.gif");
+ list-style-image: url("chrome://communicator/skin/toolbar/prtb-grip-top-act.gif");
}
/* ::::: toolbar-primary separator ::::: */
--- themes/modern/communicator/toolbar/toolbarBindings.xml
+++ themes/modern/communicator/toolbar/toolbarBindings.xml Thu Sep 12 21:34:50 2002
@@ -6,12 +6,12 @@
xmlns:xbl="http://www.mozilla.org/xbl">
+ extends="chrome://global/content/bindings/toolbar.xml#toolbar-primary">
-
-
+
+
@@ -22,8 +22,8 @@
-
-
+
+
--- xpfe/global/resources/content/bindings/toolbar.xml
+++ xpfe/global/resources/content/bindings/toolbar.xml Thu Sep 12 21:28:46 2002
@@ -165,6 +165,58 @@
+
+
+
+ "browser.chrome.toolbar_style"
+
+
+
+ Components.classes["@mozilla.org/preferences-service;1"]
+ .getService(Components.interfaces.nsIPrefBranchInternal)
+ .QueryInterface(Components.interfaces.nsIPrefBranch)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ this.prefs.addObserver(this.domain, this, false);
+ this.observe(this.prefs, "nsPref:changed", this.domain);
+
+
+
+ this.prefs.removeObserver(this.domain, this);
+
+
+
+
@@ -23,9 +23,9 @@
extends="chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton">
-
+
+ xbl:inherits="value=label,accesskey,crop,dragover-top,toolbarmode,buttonstyle"/>
@@ -41,9 +41,9 @@
+ align,dir,pack,orient,toolbarmode,buttonstyle"/>
+ xbl:inherits="align,dir,pack,orient,disabled,toolbarmode,buttonstyle"/>
--- xpfe/components/prefwindow/resources/content/pref-appearance.xul
+++ xpfe/components/prefwindow/resources/content/pref-appearance.xul Thu Sep 12 21:28:04 2002
@@ -37,7 +37,7 @@
@@ -50,6 +50,16 @@
+
+
+
+
+
+
+
+
+