update EarlyBlue and LCARStrek for suite classic changes between SM 2.0a2 and 2008...
authorRobert Kaiser <robert@notebook.box.kairo.at>
Mon, 29 Dec 2008 17:20:36 +0000 (18:20 +0100)
committerRobert Kaiser <robert@notebook.box.kairo.at>
Mon, 29 Dec 2008 17:20:36 +0000 (18:20 +0100)
12 files changed:
EarlyBlue/communicator/bookmarks/bookmarks.css
EarlyBlue/communicator/history/calendar.png [new file with mode: 0644]
EarlyBlue/communicator/related/related.css [deleted file]
EarlyBlue/communicator/related/sitemap.gif [deleted file]
EarlyBlue/communicator/sidebar/sidebarListView.css
EarlyBlue/navigator/navigator.css
LCARStrek/communicator/bookmarks/bookmarks.css
LCARStrek/communicator/history/calendar.png [new file with mode: 0644]
LCARStrek/communicator/related/related.css [deleted file]
LCARStrek/communicator/related/sitemap.gif [deleted file]
LCARStrek/communicator/sidebar/sidebarListView.css
LCARStrek/navigator/navigator.css

index 8409655f6cd31c18db1573d330920f30f2a5cd13..f63954588287b9aa38be76c4bd52cbd076be3e16 100644 (file)
@@ -94,6 +94,11 @@ treechildren::-moz-tree-image(Name, container, group) {
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-group.gif");
 }
 
+/* calendar icon for folders grouping items by day */                                                                                                   
+treechildren::-moz-tree-image(Name, query, dayContainer) {                                                                                              
+  list-style-image: url("chrome://communicator/skin/history/calendar.png");                                                                             
+}                                                                                                                                                       
+                                                                                                                                                        
 treechildren::-moz-tree-image(Name, separator) {
   list-style-image: none;
 }
diff --git a/EarlyBlue/communicator/history/calendar.png b/EarlyBlue/communicator/history/calendar.png
new file mode 100644 (file)
index 0000000..f588172
Binary files /dev/null and b/EarlyBlue/communicator/history/calendar.png differ
diff --git a/EarlyBlue/communicator/related/related.css b/EarlyBlue/communicator/related/related.css
deleted file mode 100644 (file)
index 8f193e2..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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 the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Robert Kaiser <KaiRo@KaiRo.at>
- *
- * 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 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/*
-
-  Style rules specific to the related links panel
-
-*/
-
-#Tree, .tree-container-treerows
-{
-  border: none;
-}
-
-treeitem > treerow.relatedresult > treecell
-{
-  color: black;
-  text-decoration: none;
-}
-treeitem > treerow.relatedresult > treecell:hover
-{
-  color: #6699FF;
-  text-decoration: underline;
-  cursor              : pointer;
-}
-treeitem > treerow.relatedresult > treecell > titledbutton:active
-{
-  color: red;
-  text-decoration: underline;
-}
-
-treeitem[container="true"][open="true"][loading="true"] > treerow > .treecell-indent
-{
-  list-style-image: url("chrome://global/skin/icons/loading.gif") ! important ;
-}
-
-treeitem[container="true"][open="true"] > treerow > .treecell-indent 
-{
-  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif");
-}
-
-/* Uncomment if double-click model is needed
-treeitem[container="true"][open="true"][selected="true"] > treerow > .treecell-indent 
-{
-  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open-sel.gif");
-}
-*/
-
-treeitem[container="true"] > treerow > .treecell-indent 
-{
-  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif");
-}
-
-/* Uncomment if double-click model is needed
-treeitem[container="true"][selected="true"] > treerow > .treecell-indent 
-{
-  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed-sel.gif");
-}
-*/
-
-treeitem[container="true"][id="NC:SiteMapRoot"] > treerow > .treecell-indent 
-{
-  list-style-image: url("chrome://communicator/skin/related/sitemap.gif");
-}
-
-treeitem[container="true"][open="true"][id="NC:SiteMapRoot"] > treerow > .treecell-indent 
-{
-  list-style-image: url("chrome://communicator/skin/related/sitemap.gif");
-}
-
-/* Single click model, so undo regular search tree selection look. */
-treeitem[selected="true"] > treerow.relatedseparator, 
-treeitem[selected="true"] > treerow.relatedresult
-{ 
-  background-color: transparent;
-}
-
-.treecell-indent 
-{
-  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
-}
diff --git a/EarlyBlue/communicator/related/sitemap.gif b/EarlyBlue/communicator/related/sitemap.gif
deleted file mode 100644 (file)
index dab90b7..0000000
Binary files a/EarlyBlue/communicator/related/sitemap.gif and /dev/null differ
index 5d8193c42bb6a73dcae20a9eaa47318ab9e1a2a4..267a8fee057b54e9fa5f91546c10dbf9f2337712 100644 (file)
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-treechildren::-moz-tree-image,
-treechildren::-moz-tree-cell-text {
-  cursor: pointer;
-}
+treechildren::-moz-tree-image(leaf),                                                                                                     
+treechildren::-moz-tree-cell(leaf) {                                                                                                     
+  cursor: pointer;                                                                                                                       
+}                                                                                                                                        
+                                                                                                                                         
+treechildren::-moz-tree-cell-text(leaf, hover) {                                                                                         
+  cursor: pointer;                                                                                                                       
+  text-decoration: underline;                                                                                                            
+}                                                                                                                                        
+                                                                                                                                         
+treechildren::-moz-tree-cell(separator) {                                                                                                
+  cursor: default;                                                                                                                       
+}                                                                                                                                        
index 5bf2e68be803b51f9ad8adc5a694c35249e7747e..e147bc9ae066238e09d7bc2365f4b5f4c2dc4873 100644 (file)
   -moz-image-region: rect(0px 50px 21px 25px);
 }
 
+#home-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(84px 25px 105px 0px);
+}
+
+#home-button[disabled="true"] {
+  -moz-image-region: rect(84px 50px 105px 25px);
+}
+
 #clear-button {
   list-style-image: url("chrome://global/skin/icons/close-button.gif");
 }
   /* display: none; */
 }
 
+toolbar[iconsize="small"] > #back-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(32px 16px 48px 0);
+}
+
+toolbar[iconsize="small"] > #back-button[disabled="true"] {
+  -moz-image-region: rect(32px 32px 48px 16px) !important;
+}
+
+toolbar[iconsize="small"] > #forward-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(48px 16px 64px 0);
+}
+
+toolbar[iconsize="small"] > #forward-button[disabled="true"] {
+  -moz-image-region: rect(48px 32px 64px 16px) !important;
+}
+
+toolbar[iconsize="small"] > #reload-button {
+  list-style-image: url("chrome://navigator/skin/icons/navigatoricons-small.png");
+  -moz-image-region: rect(0 16px 16px 0);
+}
+
+toolbar[iconsize="small"] > #reload-button[disabled="true"] {
+  -moz-image-region: rect(0 32px 16px 16px) !important;
+}
+
+toolbar[iconsize="small"] > #stop-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(16px 16px 32px 0);
+}
+
+toolbar[iconsize="small"] > #stop-button[disabled="true"] {
+  -moz-image-region: rect(16px 32px 32px 16px) !important;
+}
+
+toolbar[iconsize="small"] > #print-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(0 16px 16px 0);
+}
+
+toolbar[iconsize="small"] > #print-button[disabled="true"] {
+  -moz-image-region: rect(0 32px 16px 16px) !important;
+}
+
+toolbar[iconsize="small"] > #home-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(64px 16px 80px 0);
+}
+
+toolbar[iconsize="small"] > #home-button[disabled="true"] {
+  -moz-image-region: rect(64px 32px 80px 16px) !important;
+}
+
 /* ::::: fullscreen window controls ::::: */
 
 #window-controls {
@@ -275,15 +338,6 @@ toolbar[mode="icons"] #search-button > .button-box > .button-text {
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif");
 }
 
-#home-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-  -moz-image-region: rect(84px 25px 105px 0px);
-}
-
-#home-button[disabled="true"] {
-  -moz-image-region: rect(84px 50px 105px 25px);
-}
-
 #toolbarbutton.chevron {
   list-style-image: url("chrome://navigator/skin/icons/chevron.gif") !important;
 }
@@ -306,6 +360,19 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
   display: -moz-box !important;
 }
 
+#PersonalToolbar[iconsize="small"] > #home-button > .toolbarbutton-icon {
+  /* width: 16px;
+  height: 16px; */
+}
+
+#PersonalToolbar > #home-button {
+  cursor: pointer;
+}
+
+#PersonalToolbar > #home-button[disabled="true"] {
+  cursor: default !important;
+}
+
 /* ::::: feeds ::::: */
 
 #feedsMenu {
@@ -329,72 +396,3 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
 #feedsButton:hover:active {
   -moz-image-region: rect(48px 32px 64px 16px);
 }
-
-toolbar[iconsize="small"] > #back-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-  -moz-image-region: rect(32px 16px 48px 0);
-}
-
-toolbar[iconsize="small"] > #back-button[disabled="true"] {
-  -moz-image-region: rect(32px 32px 48px 16px) !important;
-}
-
-toolbar[iconsize="small"] > #forward-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-  -moz-image-region: rect(48px 16px 64px 0);
-}
-
-toolbar[iconsize="small"] > #forward-button[disabled="true"] {
-  -moz-image-region: rect(48px 32px 64px 16px) !important;
-}
-
-toolbar[iconsize="small"] > #reload-button {
-  list-style-image: url("chrome://navigator/skin/icons/navigatoricons-small.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
-
-toolbar[iconsize="small"] > #reload-button[disabled="true"] {
-  -moz-image-region: rect(0 32px 16px 16px) !important;
-}
-
-toolbar[iconsize="small"] > #stop-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-  -moz-image-region: rect(16px 16px 32px 0);
-}
-
-toolbar[iconsize="small"] > #stop-button[disabled="true"] {
-  -moz-image-region: rect(16px 32px 32px 16px) !important;
-}
-
-toolbar[iconsize="small"] > #print-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
-
-toolbar[iconsize="small"] > #print-button[disabled="true"] {
-  -moz-image-region: rect(0 32px 16px 16px) !important;
-}
-
-toolbar[iconsize="small"] > #home-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-  -moz-image-region: rect(64px 16px 80px 0);
-}
-
-toolbar[iconsize="small"] > #home-button[disabled="true"] {
-  -moz-image-region: rect(64px 32px 80px 16px) !important;
-}
-
-/* ::::: home button on the personal toolbar ::::: */
-
-#PersonalToolbar[iconsize="small"] > #home-button > .toolbarbutton-icon {
-  /* width: 16px;
-  height: 16px; */
-}
-
-#PersonalToolbar > #home-button {
-  cursor: pointer;
-}
-
-#PersonalToolbar > #home-button[disabled="true"] {
-  cursor: default !important;
-}
index b50ad302a68d449ab0b910d7c8e358c9d132bde7..4b10018dd91e3e8b21a300c6a635c82760411baf 100644 (file)
@@ -94,6 +94,11 @@ treechildren::-moz-tree-image(Name, container, group) {
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-group.gif");
 }
 
+/* calendar icon for folders grouping items by day */                                                                                                   
+treechildren::-moz-tree-image(Name, query, dayContainer) {                                                                                              
+  list-style-image: url("chrome://communicator/skin/history/calendar.png");                                                                             
+}                                                                                                                                                       
+                                                                                                                                                        
 treechildren::-moz-tree-image(Name, separator) {
   list-style-image: none;
 }
diff --git a/LCARStrek/communicator/history/calendar.png b/LCARStrek/communicator/history/calendar.png
new file mode 100644 (file)
index 0000000..dcc2c71
Binary files /dev/null and b/LCARStrek/communicator/history/calendar.png differ
diff --git a/LCARStrek/communicator/related/related.css b/LCARStrek/communicator/related/related.css
deleted file mode 100644 (file)
index 63a1b03..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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 the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Robert Kaiser <KaiRo@KaiRo.at>
- *
- * 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 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/*
-  Style rules specific to the related links panel
-*/
-
-#Tree, .tree-container-treerows {
-  border: none;
-}
-
-treeitem > treerow.relatedresult > treecell {
-  color: #FF9F00;
-  text-decoration: none;
-}
-
-treeitem > treerow.relatedresult > treecell:hover {
-  background-color: #FFCF00;
-  color: #000000;
-  cursor: pointer;
-}
-
-treeitem > treerow.relatedresult > treecell > titledbutton:active {
-  background-color: #008484;
-  color: #FFCF00;
-}
-
-treeitem[container="true"][open="true"][loading="true"] > treerow > .treecell-indent {
-  list-style-image: url("chrome://global/skin/icons/loading.gif") ! important ;
-}
-
-treeitem[container="true"][open="true"] > treerow > .treecell-indent {
-  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif");
-}
-
-/* Uncomment if double-click model is needed
-treeitem[container="true"][open="true"][selected="true"] > treerow > .treecell-indent {
-  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open-sel.gif");
-}
-*/
-
-treeitem[container="true"] > treerow > .treecell-indent {
-  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif");
-}
-
-/* Uncomment if double-click model is needed
-treeitem[container="true"][selected="true"] > treerow > .treecell-indent {
-  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed-sel.gif");
-}
-*/
-
-treeitem[container="true"][id="NC:SiteMapRoot"] > treerow > .treecell-indent {
-  list-style-image: url("chrome://communicator/skin/related/sitemap.gif");
-}
-
-treeitem[container="true"][open="true"][id="NC:SiteMapRoot"] > treerow > .treecell-indent {
-  list-style-image: url("chrome://communicator/skin/related/sitemap.gif");
-}
-
-/* Single click model, so undo regular search tree selection look. */
-treeitem[selected="true"] > treerow.relatedseparator, 
-treeitem[selected="true"] > treerow.relatedresult { 
-  background-color: transparent;
-}
-
-.treecell-indent {
-  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
-}
diff --git a/LCARStrek/communicator/related/sitemap.gif b/LCARStrek/communicator/related/sitemap.gif
deleted file mode 100644 (file)
index dab90b7..0000000
Binary files a/LCARStrek/communicator/related/sitemap.gif and /dev/null differ
index 5d8193c42bb6a73dcae20a9eaa47318ab9e1a2a4..778ce42217a56702d0196341872325f7f2f8e15a 100644 (file)
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-treechildren::-moz-tree-image,
-treechildren::-moz-tree-cell-text {
-  cursor: pointer;
-}
+treechildren::-moz-tree-image(leaf),                                                                                                     
+treechildren::-moz-tree-cell(leaf) {                                                                                                     
+  cursor: pointer;                                                                                                                       
+}                                                                                                                                        
+                                                                                                                                         
+treechildren::-moz-tree-cell-text(leaf, hover) {                                                                                         
+  cursor: pointer;                                                                                                                       
+  color: #000000;                                                                                                            
+  background-color: #FFCF00;                                                                                                            
+}                                                                                                                                        
+
+treechildren::-moz-tree-cell(separator) {                                                                                                
+  cursor: default;                                                                                                                       
+}                                                                                                                                        
index 5b6982446bd25bc996288b190e8e46d23b8e1953..c7e6a2551e039b4407847971edb1213c02cc3fb8 100644 (file)
   -moz-image-region: rect(0px 75px 21px 50px);
 }
 
+#home-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(84px 25px 105px 0px);
+}
+
+#home-button[disabled="true"] {
+  -moz-image-region: rect(84px 50px 105px 25px);
+}
+
+#home-button:not([disabled="true"]):hover,
+#home-button:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(84px 75px 105px 50px);
+}
+
 #clear-button {
   list-style-image: url("chrome://global/skin/icons/close-button.gif");
 }
   /* display: none; */
 }
 
+toolbar[iconsize="small"] > #back-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(32px 16px 48px 0);
+}
+
+toolbar[iconsize="small"] > #back-button[disabled="true"] {
+  -moz-image-region: rect(32px 32px 48px 16px) !important;
+}
+
+toolbar[iconsize="small"] > #back-button:not([disabled="true"]):hover,
+toolbar[iconsize="small"] > #back-button:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(32px 48px 48px 32px);
+}
+
+toolbar[iconsize="small"] > #forward-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(48px 16px 64px 0);
+}
+
+toolbar[iconsize="small"] > #forward-button[disabled="true"] {
+  -moz-image-region: rect(48px 32px 64px 16px) !important;
+}
+
+toolbar[iconsize="small"] > #forward-button:not([disabled="true"]):hover,
+toolbar[iconsize="small"] > #forward-button:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(48px 48px 64px 32px);
+}
+
+toolbar[iconsize="small"] > #reload-button {
+  list-style-image: url("chrome://navigator/skin/icons/navigatoricons-small.png");
+  -moz-image-region: rect(0 16px 16px 0);
+}
+
+toolbar[iconsize="small"] > #reload-button[disabled="true"] {
+  -moz-image-region: rect(0 32px 16px 16px) !important;
+}
+
+toolbar[iconsize="small"] > #reload-button:not([disabled="true"]):hover,
+toolbar[iconsize="small"] > #reload-button:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(0 48px 16px 32px);
+}
+
+toolbar[iconsize="small"] > #stop-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(16px 16px 32px 0);
+}
+
+toolbar[iconsize="small"] > #stop-button[disabled="true"] {
+  -moz-image-region: rect(16px 32px 32px 16px) !important;
+}
+
+toolbar[iconsize="small"] > #stop-button:not([disabled="true"]):hover,
+toolbar[iconsize="small"] > #stop-button:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(16px 48px 32px 32px);
+}
+
+toolbar[iconsize="small"] > #print-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(0 16px 16px 0);
+}
+
+toolbar[iconsize="small"] > #print-button[disabled="true"] {
+  -moz-image-region: rect(0 32px 16px 16px) !important;
+}
+
+toolbar[iconsize="small"] > #print-button:not([disabled="true"]):hover,
+toolbar[iconsize="small"] > #print-button:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(0 48px 16px 32px);
+}
+
+toolbar[iconsize="small"] > #home-button {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(64px 16px 80px 0);
+}
+
+toolbar[iconsize="small"] > #home-button[disabled="true"] {
+  -moz-image-region: rect(64px 32px 80px 16px) !important;
+}
+
+toolbar[iconsize="small"] > #home-button:not([disabled="true"]):hover,
+toolbar[iconsize="small"] > #home-button:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(64px 48px 80px 32px);
+}
+
 /* ::::: fullscreen window controls ::::: */
 
 #window-controls {
@@ -343,20 +441,6 @@ toolbar[mode="icons"] #search-button > .button-box > .button-text {
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif");
 }
 
-#home-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-  -moz-image-region: rect(84px 25px 105px 0px);
-}
-
-#home-button[disabled="true"] {
-  -moz-image-region: rect(84px 50px 105px 25px);
-}
-
-#home-button:not([disabled="true"]):hover,
-#home-button:not([disabled="true"]):hover:active {
-  -moz-image-region: rect(84px 75px 105px 50px);
-}
-
 toolbarbutton.chevron {
   list-style-image: url("chrome://navigator/skin/icons/chevron.gif") !important;
 }
@@ -384,6 +468,19 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
   display: -moz-box !important;
 }
 
+#PersonalToolbar[iconsize="small"] > #home-button > .toolbarbutton-icon {
+  /* width: 16px;
+  height: 16px; */
+}
+
+#PersonalToolbar > #home-button {
+  cursor: pointer;
+}
+
+#PersonalToolbar > #home-button[disabled="true"] {
+  cursor: default !important;
+}
+
 /* ::::: feeds ::::: */
 
 #feedsMenu {
@@ -407,102 +504,3 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
 #feedsButton:hover:active {
   -moz-image-region: rect(48px 32px 64px 16px);
 }
-
-toolbar[iconsize="small"] > #back-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-  -moz-image-region: rect(32px 16px 48px 0);
-}
-
-toolbar[iconsize="small"] > #back-button[disabled="true"] {
-  -moz-image-region: rect(32px 32px 48px 16px) !important;
-}
-
-toolbar[iconsize="small"] > #back-button:not([disabled="true"]):hover,
-toolbar[iconsize="small"] > #back-button:not([disabled="true"]):hover:active {
-  -moz-image-region: rect(32px 48px 48px 32px);
-}
-
-toolbar[iconsize="small"] > #forward-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-  -moz-image-region: rect(48px 16px 64px 0);
-}
-
-toolbar[iconsize="small"] > #forward-button[disabled="true"] {
-  -moz-image-region: rect(48px 32px 64px 16px) !important;
-}
-
-toolbar[iconsize="small"] > #forward-button:not([disabled="true"]):hover,
-toolbar[iconsize="small"] > #forward-button:not([disabled="true"]):hover:active {
-  -moz-image-region: rect(48px 48px 64px 32px);
-}
-
-toolbar[iconsize="small"] > #reload-button {
-  list-style-image: url("chrome://navigator/skin/icons/navigatoricons-small.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
-
-toolbar[iconsize="small"] > #reload-button[disabled="true"] {
-  -moz-image-region: rect(0 32px 16px 16px) !important;
-}
-
-toolbar[iconsize="small"] > #reload-button:not([disabled="true"]):hover,
-toolbar[iconsize="small"] > #reload-button:not([disabled="true"]):hover:active {
-  -moz-image-region: rect(0 48px 16px 32px);
-}
-
-toolbar[iconsize="small"] > #stop-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-  -moz-image-region: rect(16px 16px 32px 0);
-}
-
-toolbar[iconsize="small"] > #stop-button[disabled="true"] {
-  -moz-image-region: rect(16px 32px 32px 16px) !important;
-}
-
-toolbar[iconsize="small"] > #stop-button:not([disabled="true"]):hover,
-toolbar[iconsize="small"] > #stop-button:not([disabled="true"]):hover:active {
-  -moz-image-region: rect(16px 48px 32px 32px);
-}
-
-toolbar[iconsize="small"] > #print-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
-
-toolbar[iconsize="small"] > #print-button[disabled="true"] {
-  -moz-image-region: rect(0 32px 16px 16px) !important;
-}
-
-toolbar[iconsize="small"] > #print-button:not([disabled="true"]):hover,
-toolbar[iconsize="small"] > #print-button:not([disabled="true"]):hover:active {
-  -moz-image-region: rect(0 48px 16px 32px);
-}
-
-toolbar[iconsize="small"] > #home-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-  -moz-image-region: rect(64px 16px 80px 0);
-}
-
-toolbar[iconsize="small"] > #home-button[disabled="true"] {
-  -moz-image-region: rect(64px 32px 80px 16px) !important;
-}
-
-toolbar[iconsize="small"] > #home-button:not([disabled="true"]):hover,
-toolbar[iconsize="small"] > #home-button:not([disabled="true"]):hover:active {
-  -moz-image-region: rect(64px 48px 80px 32px);
-}
-
-/* ::::: home button on the personal toolbar ::::: */
-
-#PersonalToolbar[iconsize="small"] > #home-button > .toolbarbutton-icon {
-  /* width: 16px;
-  height: 16px; */
-}
-
-#PersonalToolbar > #home-button {
-  cursor: pointer;
-}
-
-#PersonalToolbar > #home-button[disabled="true"] {
-  cursor: default !important;
-}