[Pkg-mozext-commits] [sage-extension] 41/54: Fixing toolbar buttons

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to tag sage_1_3
in repository sage-extension.

commit dc2f2c235607c926689a2f41af6dcdf7834b714c
Author: Erik Arvidsson <erik.arvidsson at gmail.com>
Date:   Sun Oct 10 09:04:58 2004 +0000

    Fixing toolbar buttons
---
 src/sage/content/sage.xul      | 17 +++++++++--------
 src/sage/skin/classic/sage.css | 16 ++++++++++++++--
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/sage/content/sage.xul b/src/sage/content/sage.xul
index 8ad5475..0c706b8 100755
--- a/src/sage/content/sage.xul
+++ b/src/sage/content/sage.xul
@@ -2,6 +2,7 @@
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/content/bookmarks/bookmarks.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/browser.css" type="text/css"?>
 <?xml-stylesheet href="chrome://sage/skin/sage.css" type="text/css"?>
 
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
@@ -75,10 +76,10 @@
 
 <toolbox class="plain">
 	<toolbar>
-		<toolbarbutton id="checkFeeds" class="sage_button" oncommand="updateCheck()" tooltiptext="&menu.checkUpdate;"/>
-		<toolbarbutton id="discoverFeeds" class="sage_button" oncommand="discoverFeeds()" tooltiptext="&menu.discoverFeeds;"/>
+		<toolbarbutton id="checkFeeds" class="sage_button toolbarbutton-1" oncommand="updateCheck()" tooltiptext="&menu.checkUpdate;"/>
+		<toolbarbutton id="discoverFeeds" class="sage_button toolbarbutton-1" oncommand="discoverFeeds()" tooltiptext="&menu.discoverFeeds;"/>
 		<spacer flex="1"/>
-		<toolbarbutton type="menu" label="&menu.tools;">
+		<toolbarbutton id="toolsMenuButton" type="menu" label="&menu.tools;" class="sage_button toolbarbutton-1">
 			<menupopup>
 				<menuitem id="chkShowSearchBar" type="checkbox" persist="checked" label="&menu.showSearchBar;" oncommand="toggleShowSearchBar()"/>
 				<menuitem id="chkShowTooltip" type="checkbox" persist="checked" label="&menu.showDescTooltip;"/>
@@ -132,11 +133,11 @@
 		</sidebarheader>
 
 		<toolbox class="plain">
-			<toolbar id="itemListToolbar">
-				<toolbarbutton id="markAsReadButton" class="sage_button" command="cmd_markasread"/>
-				<toolbarbutton id="markAsUnreadButton" class="sage_button" command="cmd_markasunread"/>
-				<toolbarbutton id="markAllAsReadButton" class="sage_button" command="cmd_markallasread"/>
-				<toolbarbutton id="markAllAsUnreadButton" class="sage_button" command="cmd_markallasunread"/>
+			<toolbar id="itemListToolbar" iconsize="small" mode="icons">
+				<toolbarbutton id="markAsReadButton" class="sage_button toolbarbutton-1" command="cmd_markasread"/>
+				<toolbarbutton id="markAsUnreadButton" class="sage_button toolbarbutton-1" command="cmd_markasunread"/>
+				<toolbarbutton id="markAllAsReadButton" class="sage_button toolbarbutton-1" command="cmd_markallasread"/>
+				<toolbarbutton id="markAllAsUnreadButton" class="sage_button toolbarbutton-1" command="cmd_markallasunread"/>
 			</toolbar>
 		</toolbox>
 
diff --git a/src/sage/skin/classic/sage.css b/src/sage/skin/classic/sage.css
index cf212b9..349885a 100755
--- a/src/sage/skin/classic/sage.css
+++ b/src/sage/skin/classic/sage.css
@@ -1,14 +1,26 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 toolbarbutton.sage_button {
-	list-style-image: url("chrome://sage/skin/toolbar.png") !important;
-	-moz-binding: url("chrome://sage/skin/sage.xbl#toolbarbutton");
+	list-style-image:	url("chrome://sage/skin/toolbar.png") !important;
 }
 
 toolbarbutton.sage_button2 > .toolbarbutton-text {
 	display: none !important;
 }
 
+/* Override to hide icon and show text */
+#toolsMenuButton {
+	-moz-box-orient:	horizontal;
+}
+
+#toolsMenuButton .toolbarbutton-text {
+	display:	-moz-box;
+}
+
+#toolsMenuButton .toolbarbutton-icon {
+	display:	none;
+}
+
 #checkFeeds {
 	-moz-image-region: rect(0px 26px 24px 0px) !important;
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/sage-extension.git