[Pkg-mozext-commits] [compactheader] 81/441: New version 0.99.1: Version bump of CustomizeHeaderToolbar to 0.1.4 Cleanup of buttons Some bug fixes for change layout (classical/wide/vertical) (not yet finished)

David Prévot taffit at moszumanska.debian.org
Wed Mar 18 12:28:46 UTC 2015


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

taffit pushed a commit to branch master
in repository compactheader.

commit d7853e5db4dbcdf2ffc39aaa1b0ba8d8d589b6d6
Author: joachim.herb <none at none>
Date:   Tue Oct 27 01:19:30 2009 +0000

    New version 0.99.1:
    Version bump of CustomizeHeaderToolbar to 0.1.4
    Cleanup of buttons
    Some bug fixes for change layout (classical/wide/vertical) (not yet finished)
---
 chrome.manifest                                    |   1 +
 chrome/CompactHeader/content/cohe.xml              | 264 ---------------------
 .../CompactHeader/content/compactHeaderOverlay.js  |  37 ++-
 .../CompactHeader/content/compactHeaderOverlay.xul |   2 +-
 chrome/CompactHeader/skin/global/CompactHeader.css |  11 +-
 chrome/CompactHeader/skin/gnome/osdef.css          |  81 ++-----
 chrome/CompactHeader/skin/mac/osdef.css            |  70 ++----
 chrome/CompactHeader/skin/windows/osdef.css        |  24 +-
 install.rdf                                        |   2 +-
 9 files changed, 81 insertions(+), 411 deletions(-)

diff --git a/chrome.manifest b/chrome.manifest
index c23ca0d..2b4275d 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -10,6 +10,7 @@ locale    CustomizeHeaderToolbar     en-US   chrome/CustomizeHeaderToolbar/local
 
 overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://CustomizeHeaderToolbar/content/CHTPaneOverlay.xul
 overlay chrome://global/content/customizeToolbar.xul     chrome://CustomizeHeaderToolbar/content/CHTDialogOverlay.xul
+overlay chrome://messenger/content/messenger.xul         chrome://CustomizeHeaderToolbar/content/CHTMessenger.xul
 style   chrome://global/content/customizeToolbar.xul     chrome://messenger/skin/messageHeader.css
 style   chrome://global/content/customizeToolbar.xul     chrome://CustomizeHeaderToolbar/skin/messageHeader.css
 style   chrome://global/content/customizeToolbar.xul     chrome://CustomizeHeaderToolbar-os/skin/messageHeader.css
diff --git a/chrome/CompactHeader/content/cohe.xml b/chrome/CompactHeader/content/cohe.xml
deleted file mode 100644
index 5a0618a..0000000
--- a/chrome/CompactHeader/content/cohe.xml
+++ /dev/null
@@ -1,264 +0,0 @@
-<?xml version="1.0"?>
-
-<bindings xmlns="http://www.mozilla.org/xbl"
-          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-          xmlns:xbl="http://www.mozilla.org/xbl">
-	
-  
-  <binding id="CoHeToolbox" extends="chrome://global/content/bindings/toolbar.xml#toolbox">
-
-  	<implementation>
-  		
-      <field name="anonymous">false</field>
-      <field name="palette">null</field>
-  	  
-  	  <constructor>
-  	    <![CDATA[
-  	    	
-  	    	var paletteId = "BrowserToolbarPalette";
-	  	    
-	  	    var tt = (typeof document.toolbarpalettes == "object") ? true : false;
-	  	    
-  	    	if(this.CoHePalette && !tt) return;
-  	    		
-	  	    if(document.getElementById(paletteId)) {
-	  	    	document.CoHePalette = document.getElementById(paletteId).cloneNode(true);
-	  	    }
-	  	    else if(tt && document.toolbarpalettes[paletteId]){
-	  	    	document.CoHePalette = document.toolbarpalettes[paletteId];
-	  	    }
-	  	    
-	        this.palette = document.CoHePalette;
-	        this.CoHePalette = true;
-	        
-  	    ]]>
-  	  </constructor>
-  	</implementation>	
-  </binding>
-  
-  
-  <binding id="CoHeToolbar">
-    <implementation implements="nsIAccessibleProvider">
-      <property name="accessibleType" readonly="true">
-        <getter>
-          return Components.interfaces.nsIAccessibleProvider.XULToolbar;
-        </getter>
-      </property>
-      <field name="firstPermanentChild">
-        null
-      </field>
-      <field name="lastPermanentChild">
-        null
-      </field>
-      <field name="palette">null</field>
-
-      <property name="toolbarName"
-          onget="return this.getAttribute('toolbarname');"
-          onset="this.setAttribute('toolbarname', val); return val;"/>
-
-      <constructor>
-      <![CDATA[
-        
-        // Searching for the toolbox palette in the toolbar binding because
-        // toolbars are constructed first.
-        var toolbox = (this.localName == 'statusbar') ? this : this.parentNode;
-        
-         if (!toolbox.palette) {
-          // Look to see if there is a toolbarpalette.
-          var node = toolbox.firstChild;
-          while (node) {
-            if (node.localName == "toolbarpalette")
-              break;
-            node = node.nextSibling;
-          }
-          
-          if (!node)
-            return;
-
-          // Hold on to the palette but remove it from the document.
-          toolbox.palette = node;
-          toolbox.removeChild(node);
-        }
-        
-        // Build up our contents from the palette.
-        var currentSet = this.getAttribute("currentset");
-        if (!currentSet)
-          currentSet = this.getAttribute("defaultset");
-        if (currentSet) {
-          this.currentSet = currentSet;
-         
-          // Update attribute, items may have been uninstalled..
-          this.setAttribute("currentset", this.currentSet);
-          // Persist currentset only on fixed toolbars, not user defined toolbars..
-          if (!this.hasAttribute("customindex"))
-            document.persist(this.id, "currentset");
-        }
-
-        // If only one toolbar in toolbox and it's empty, set it..
-        var count = 0;
-        var child = toolbox.lastChild;
-        while(child) {
-          if (child.localName == "toolbar")
-            ++count;
-          child = child.previousSibling;
-        }
-        
-        if (count <= 1 && this.currentSet == "__empty")
-          toolbox.setAttribute("empty", true);
-      ]]>
-      </constructor>
-      
-      <property name="currentSet">
-        <getter>
-        <![CDATA[
-          var node = this.firstChild;
-          var currentSet = "";
-          while (node) {
-            if (node.id &&
-                (this.localName == "statusbar" && !node.hasAttribute("removed")) || 
-                node.localName == "toolbaritem" || 
-                node.localName == "toolbarbutton" ||
-                node.localName == "toolbarseparator" ||
-                node.localName == "toolbarspring" ||
-                node.localName == "toolbarspacer")
-            {
-              if (currentSet)
-                currentSet += ",";
-
-              if (node.localName == "toolbarseparator")
-                currentSet += "separator";
-              else if (node.localName == "toolbarspring")
-                currentSet += "spring";
-              else if (node.localName == "toolbarspacer")
-                currentSet += "spacer";
-              else
-                currentSet += node.id;
-            }
-            node = node.nextSibling;
-          }
-           
-          return currentSet ? currentSet : "__empty";
-        ]]>
-        </getter>
-
-        <setter>
-        <![CDATA[
-         
-          // Remove all items before the first permanent child and after the last permanent child.
-          while (this.lastChild) {
-            if (this.lastChild == this.lastPermanentChild ||
-                (this.lastChild.localName == "toolbarpaletteitem" &&
-                this.lastChild.firstChild == this.lastPermanentChild))
-              break;
-            this.removeChild(this.lastChild);
-          }
-
-          while (this.firstChild) {
-            if (this.firstChild == this.firstPermanentChild ||
-                (this.firstChild.localName == "toolbarpaletteitem" &&
-                this.firstChild.firstChild == this.firstPermanentChild))
-              break;
-            this.removeChild(this.firstChild);
-          }
-
-          var firstChildID = this.firstPermanentChild ? this.firstPermanentChild.id : "";
-          var lastChildID = this.lastPermanentChild ? this.lastPermanentChild.id : "";
-
-          if (val && val != "__empty") {
-            var itemIds = val.split(",");
-            var before = true;
-            for (var i = 0; i < itemIds.length; i++) {
-              if (itemIds[i] == firstChildID || itemIds[i] == lastChildID)
-                before = false;
-              else
-                this.insertItem(itemIds[i], null, null, before);
-            }
-          }
-          return val;
-        ]]>
-        </setter>
-      </property>
-
-      <method name="insertItem">
-         <parameter name="aId"/>
-         <parameter name="aBeforeElt"/>
-         <parameter name="aWrapper"/>
-         <parameter name="aBeforePermanent"/>
-         <body>
-         <![CDATA[
-           var newItem = null;
-           
-           // Create special cases of palette items.
-           var uniqueId;
-           if (aId == "separator") {
-             newItem = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
-                                                "toolbarseparator");
-             uniqueId = (new Date()).getTime()+this.childNodes.length;
-             newItem.id = "separator" + uniqueId;
-             newItem.className = "chromeclass-toolbar-additional";
-           } else if (aId == "spring") {
-             newItem = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
-                                                "toolbarspring");
-             uniqueId = (new Date()).getTime()+this.childNodes.length;
-             newItem.flex = 1;
-             newItem.id = "spring" + uniqueId;
-             newItem.className = "chromeclass-toolbar-additional";
-           } else if (aId == "spacer") {
-             newItem = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
-                                                "toolbarspacer");
-             uniqueId = (new Date()).getTime()+this.childNodes.length;
-             newItem.id = "spacer" + uniqueId;
-             newItem.className = "chromeclass-toolbar-additional";
-           } else if (this.parentNode.localName == "toolbox" || this.localName == "statusbar") {
-             
-             //if (document.getElementById(aId))
-               //return false;
-             // Attempt to locate an item with a matching id within palette.
-             var paletteItem = this.parentNode.palette.firstChild;
-             while (paletteItem) {
-               var paletteId = paletteItem.id;
-               if (paletteId == aId) {
-                 newItem = paletteItem.cloneNode(true);
-                 break;
-               }
-               paletteItem = paletteItem.nextSibling;
-             }
-           }
-           
-           if (!newItem)
-             return false;
-
-           var insertItem = newItem;
-           
-           // Wrap the item in another node if so inclined.
-           if (aWrapper) {
-             aWrapper.appendChild(newItem);
-             insertItem = aWrapper;
-           }
-           
-           // Insert the palette item into the toolbar.
-           if (aBeforeElt)
-             this.insertBefore(insertItem, aBeforeElt);
-           else if (aBeforePermanent && this.firstPermanentChild)
-             this.insertBefore(insertItem, this.firstPermanentChild);
-           else
-             this.appendChild(insertItem);
-              
-           return newItem;
-         ]]>
-         </body>
-      </method>
-    </implementation>
-  </binding>
-  
-  
-  <!-- like chrome://global/content/bindings/toolbar.xml#toolbarpaletteitem, but with a vbox rather than hbox 
-  <binding id="toolbarpaletteitem-vertical" extends="chrome://global/content/bindings/toolbar.xml#toolbar-base" display="xul:button">
-    <content>
-      <xul:vbox class="toolbarpaletteitem-box" flex="1" xbl:inherits="type,place">
-        <children/>
-      </xul:vbox>
-    </content>
-  </binding>-->
-  
-</bindings>
\ No newline at end of file
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index fc1325d..acb05af 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -21,9 +21,7 @@
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
-#   Markus Hossner <markushossner at gmx.de>
-#   Mark Banner <bugzilla at standard8.plus.com>
-#   David Ascher <dascher at mozillamessaging.com>
+#   Joachim Herb <joachim.herb at gmx.de>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -172,10 +170,19 @@ function coheOnLoadMsgHeaderPane()
   {
     coheFirstTime = false;
     gMessageListeners.push(coheMessageListener);
+    loadToolboxData();
     fillToolboxPalette();
+    saveToolboxData();
+    var toolbox = document.getElementById("header-view-toolbox");
+    toolbox.customizeDone = function(aEvent) {
+      MailToolboxCustomizeDone(aEvent, "CustomizeHeaderToolbar");
+      enableButtons();
+      CHTUpdateReplyButton();
+      saveToolboxData();
+    };
   }
   
-  coheToggleMenuLabel();
+  coheToggleHeaderContent();
 }
 
 var coheMessageListener = 
@@ -268,9 +275,19 @@ function coheUpdateHeaderView()
   }
   
   //fillToolboxPalette();
-  coheToggleMenuLabel();
-  UpdateReplyButtons();
-  if (document.getElementById("hdrJunkButton")) UpdateJunkButton();
+  coheToggleHeaderContent();
+  CHTUpdateReplyButton();
+  CHTUpdateJunkButton();
+}
+
+function enableButtons() {
+  var hdrToolbar = document.getElementById("header-view-toolbar");
+  if (toolbar) {
+    var buttons = hdrToolbar.querySelectorAll("[disabled*='true']");
+    for (var i=0; i<buttons.length; i++) {
+      buttons[i].removeAttribute("disabled");
+    }
+  }
 }
 
 function fillToolboxPalette() {
@@ -357,14 +374,16 @@ function coheToggleHeaderView ()
   // by the tallest panel in the deck even if that panel is not selected...
   deck.selectedPanel.collapsed = false;
   
-  coheToggleMenuLabel();
+  coheToggleHeaderContent();
 }
 
-function coheToggleMenuLabel() {
+function coheToggleHeaderContent() {
   var strHideLabel = document.getElementById("CoheHideDetailsLabel").value;
   var strShowLabel = document.getElementById("CoheShowDetailsLabel").value;
   var strLabel;
   
+  loadToolboxData();
+
   var hdrToolbox = document.getElementById("header-view-toolbox");
   var hdrToolbar = document.getElementById("header-view-toolbar");
   var firstPermanentChild = hdrToolbar.firstPermanentChild;
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.xul b/chrome/CompactHeader/content/compactHeaderOverlay.xul
index a01d4f1..35c672f 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.xul
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.xul
@@ -68,7 +68,7 @@
           </toolbarpalette>
           <toolbar id="header-view-toolbar"
                    mode="icons" defaultmode="icons"
-                   defaultset="hdrReplyButton,hdrReplyAllButton,hdrReplyListButton,hdrForwardButton,button-reply,button-forward,hdrArchiveButton,hdrJunkButton,hdrTrashButton,hdrOtherActionsButton">
+                   defaultset="hdrReplyButton,hdrReplyAllButton,hdrReplyListButton,hdrForwardButton,button-reply,button-forward,hdrArchiveButton,hdrJunkButton,hdrSJunkButton,hdrTrashButton,hdrOtherActionsButton">
           </toolbar>
       	</toolbox>
       </hbox>
diff --git a/chrome/CompactHeader/skin/global/CompactHeader.css b/chrome/CompactHeader/skin/global/CompactHeader.css
index 8b2160c..203066c 100644
--- a/chrome/CompactHeader/skin/global/CompactHeader.css
+++ b/chrome/CompactHeader/skin/global/CompactHeader.css
@@ -20,6 +20,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
+ * Joachim Herb <joachim.herb at gmx.de>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -230,13 +231,3 @@
   display: none;
 }
 
-toolbox[labelalign="end"] toolbar[mode="full"] .hdrArchiveButton .toolbarbutton-icon,
-toolbox[labelalign="end"] toolbar[mode="full"] .hdrJunkButton .toolbarbutton-icon {
-  display: -moz-box;
-  -moz-padding-start: 4px !important;
-}
-
-toolbar[mode="full"] .hdrJunkButton,
-toolbar[mode="full"] toolbarpaletteitem .hdrJunkButton {
-  padding-top: 3px !important;
-}
diff --git a/chrome/CompactHeader/skin/gnome/osdef.css b/chrome/CompactHeader/skin/gnome/osdef.css
index f06c472..895c40a 100644
--- a/chrome/CompactHeader/skin/gnome/osdef.css
+++ b/chrome/CompactHeader/skin/gnome/osdef.css
@@ -41,84 +41,31 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-#button-archive {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 336px 24px 312px);
-}
-
-toolbar[iconsize="small"] #button-archive {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 224px 16px 208px);
-}
-
-toolbar[iconsize="small"] #button-other-actions,
-#otherActionsButton {
-  list-style-image: url("chrome://CompactHeader-os/skin/other-action-small.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-}
-
-#button-other-actions {
+.hdrOtherActionsButton {
   list-style-image: url("chrome://CompactHeader-os/skin/other-action.png");
-  -moz-image-region: rect(0px 24px 24px 0px);
-}
-
-/*
-.cohe-buttons {
-  list-style-image: url("chrome://CompactHeader-os/skin/mail-toolbar-small.png");
-}
-
-.cohe-button-other-actions
-{
-  list-style-image: url("chrome://CompactHeader/skin/other-action-small.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-}
-
-.cohe-button-archive {
-  -moz-image-region: rect(0px 224px 16px 208px);
 }
 
-.cohe-button-reply {
-  -moz-image-region: rect(0px 64px 16px 48px);
-}
-
-.cohe-button-replyall {
-  -moz-image-region: rect(0px 80px 16px 64px);
-}
-
-.cohe-button-replylist {
-  -moz-image-region: rect(0px 96px 16px 80px);
-}
-
-.cohe-button-forward {
-  -moz-image-region: rect(0px 112px 16px 96px);
-}
-
-.cohe-button-deleted {
-  list-style-image: url("moz-icon://stock/gtk-delete?size=menu");
-}
-
-.cohe-button-junk{
-  -moz-image-region: rect(0px 128px 16px 112px);
+toolbar[iconsize="small"] .hdrOtherActionsButton {
+  list-style-image: url("chrome://CompactHeader-os/skin/other-action-small.png");
 }
 
-.cohe-button-tag {
-  -moz-image-region: rect(0px 192px 16px 176px);
-}
-*/
 #expandedButtonBox {
   margin: 0px;
   padding: 0px;
 }
 
-.msgHeaderView-flat-button[type="menu"] > .button-box > .button-menu-dropmarker > .dropmarker-icon,
-.msgHeaderView-flat-button[type="menu-button"] > .button-menubutton-dropmarker > .dropmarker-icon {
-  list-style-image: none;
-  /*list-style-image: url("chrome://messenger/skin/icons/arrow-dn-grey.png");*/
+toolbox[labelalign="end"] toolbar[mode="full"] .hdrJunkButton .toolbarbutton-icon,
+toolbox[labelalign="end"] toolbar[mode="full"] toolbarpaletteitem .hdrJunkButton .toolbarbutton-icon {
+  display: -moz-box;
 }
 
-.msgHeaderView-flat-button[type="menu"]:hover > .button-box > .button-menu-dropmarker > .dropmarker-icon,
-.msgHeaderView-flat-button[type="menu-button"]:hover > .button-menubutton-dropmarker > .dropmarker-icon {
-  /*list-style-image: url("chrome://messenger/skin/icons/arrow-dn-black.png");*/
-  list-style-image: none;
+toolbox[labelalign="end"] toolbar[mode="full"] .hdrJunkButton .toolbarbutton-text,
+toolbox[labelalign="end"] toolbar[mode="full"] toolbarpaletteitem .hdrJunkButton .toolbarbutton-text {
+  -moz-margin-start: 2px !important;
 }
 
+toolbox[labelalign="end"] toolbar[mode="full"] .hdrJunkButton,
+toolbox[labelalign="end"] toolbar[mode="full"] toolbarpaletteitem .hdrJunkButton {
+  padding-top: 0px !important;
+  padding-bottom: 0px !important;
+}
diff --git a/chrome/CompactHeader/skin/mac/osdef.css b/chrome/CompactHeader/skin/mac/osdef.css
index a7556e0..8d47d43 100644
--- a/chrome/CompactHeader/skin/mac/osdef.css
+++ b/chrome/CompactHeader/skin/mac/osdef.css
@@ -41,68 +41,32 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-toolbar[iconsize="small"] #button-other-actions,
-#otherActionsButton {
-  list-style-image: url("chrome://CompactHeader-os/skin/other-action-small.png");
-  -moz-image-region: rect(0px 24px 24px 0px);
-}
-
-#button-other-actions {
+/* All values copied from gnomestrip theme. Have to be checked */
+.hdrOtherActionsButton {
   list-style-image: url("chrome://CompactHeader-os/skin/other-action.png");
-  -moz-image-region: rect(0px 32px 32px 0px);
-}
-
-
-#button-archive {
-  list-style-image: url("chrome://CompactHeader-os/skin/mail-toolbar.png");
-  -moz-image-region: rect(0px 640px 32px 608px);
-}
-
-toolbar[iconsize="small"] #button-archive {
-  list-style-image: url("chrome://CompactHeader-os/skin/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 480px 24px 456px);
-}
-
-/*
-.cohe-buttons {
-  list-style-image: url("chrome://CompactHeader-os/skin/mail-toolbar-small.png");
 }
 
-.cohe-button-other-actions
-{
-  list-style-image: url("chrome://CompactHeader/skin/other-action-small.png");
-  -moz-image-region: rect(0px 16px 16px 0px);
-}
-
-.cohe-button-archive {
-  -moz-image-region: rect(0px 480px 24px 456px);
-}
-
-.cohe-button-reply {
-  -moz-image-region: rect(0px 96px 24px 72px);
-}
-
-.cohe-button-replyall {
-  -moz-image-region: rect(0px 120px 24px 96px);
-}
-
-.cohe-button-replylist {
-  -moz-image-region: rect(0px 144px 24px 120px);
+toolbar[iconsize="small"] .hdrOtherActionsButton {
+  list-style-image: url("chrome://CompactHeader-os/skin/other-action-small.png");
 }
 
-.cohe-button-forward {
-  -moz-image-region: rect(0px 168px 24px 144px);
+#expandedButtonBox {
+  margin: 0px;
+  padding: 0px;
 }
 
-.cohe-button-deleted {
-  -moz-image-region: rect(0px 192px 24px 168px);
+toolbox[labelalign="end"] toolbar[mode="full"] .hdrJunkButton .toolbarbutton-icon,
+toolbox[labelalign="end"] toolbar[mode="full"] toolbarpaletteitem .hdrJunkButton .toolbarbutton-icon {
+  display: -moz-box;
 }
 
-.cohe-button-junk {
-  -moz-image-region: rect(0px 216px 24px 192px);
+toolbox[labelalign="end"] toolbar[mode="full"] .hdrJunkButton .toolbarbutton-text,
+toolbox[labelalign="end"] toolbar[mode="full"] toolbarpaletteitem .hdrJunkButton .toolbarbutton-text {
+  -moz-margin-start: 2px !important;
 }
 
-.cohe-button-tag {
-  -moz-image-region: rect(0px 384px 24px 360px);
+toolbox[labelalign="end"] toolbar[mode="full"] .hdrJunkButton,
+toolbox[labelalign="end"] toolbar[mode="full"] toolbarpaletteitem .hdrJunkButton {
+  padding-top: 0px !important;
+  padding-bottom: 0px !important;
 }
-*/
\ No newline at end of file
diff --git a/chrome/CompactHeader/skin/windows/osdef.css b/chrome/CompactHeader/skin/windows/osdef.css
index 37da1f1..ae65d6f 100644
--- a/chrome/CompactHeader/skin/windows/osdef.css
+++ b/chrome/CompactHeader/skin/windows/osdef.css
@@ -20,6 +20,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
+ * Joachim Herb <joachim.herb at gmx.de>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -49,12 +50,23 @@ toolbar[iconsize="small"] .hdrOtherActionsButton {
   list-style-image: url("chrome://CompactHeader-os/skin/other-action-small.png");
 }
 
-.hdrTagButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar.png");
-  -moz-image-region: rect(0px 384px 24px 360px);
+
+toolbox[labelalign="end"] toolbar[mode="full"] .hdrJunkButton,
+toolbox[labelalign="end"] toolbar[mode="full"] toolbarpaletteitem .hdrJunkButton {
+  padding-top: 3px !important;
+}
+
+toolbox[labelalign="end"] toolbar[mode="full"] .hdrJunkButton .toolbarbutton-icon,
+toolbox[labelalign="end"] toolbar[mode="full"] toolbarpaletteitem .hdrJunkButton .toolbarbutton-icon {
+  display: -moz-box;
+}
+
+toolbox[labelalign="end"] toolbar[mode="full"] .hdrJunkButton,
+toolbox[labelalign="end"] toolbar[mode="full"] toolbarpaletteitem .hdrJunkButton {
+  -moz-padding-start: 4px !important;
 }
 
-toolbar[iconsize="small"] .hdrTagButton {
-  list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png");
-  -moz-image-region: rect(0px 256px 16px 240px);
+toolbox[labelalign="end"] toolbar[mode="full"] .hdrJunkButton .toolbarbutton-text,
+toolbox[labelalign="end"] toolbar[mode="full"] toolbarpaletteitem .hdrJunkButton .toolbarbutton-text {
+  -moz-margin-start: 2px !important;
 }
diff --git a/install.rdf b/install.rdf
index ea9a890..521081b 100644
--- a/install.rdf
+++ b/install.rdf
@@ -6,7 +6,7 @@
 
 	<RDF:Description about="urn:mozilla:install-manifest">
 		<em:name>CompactHeader</em:name>
-		<em:version>0.99.0</em:version>
+		<em:version>0.99.1</em:version>
 		<em:description>Add ability to reduce header size to one or two lines. Linkify subjects in RSS feeds.</em:description>
 		<em:creator>Joachim Herb</em:creator>
 		<em:contributor>Zamula</em:contributor>

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



More information about the Pkg-mozext-commits mailing list