# HG changeset patch
# User Matt A. Tobin <email@mattatobin.com>
# Date 1724007834 18000
# Node ID 21e8c1325dd88a9ff2fdca1a937f810c21a2e027
# Parent  8a4065f3f2865f273c415ea45a24eb8b5e120ebf
[UNFINISHED] Issue 9999999 - Use Kempelton icons for the main navi buttons

diff --git a/suite/themes/classic/jar.mn b/suite/themes/classic/jar.mn
--- a/suite/themes/classic/jar.mn
+++ b/suite/themes/classic/jar.mn
@@ -481,16 +481,18 @@ classic.jar:
   skin/classic/navigator/btn1/previous-hover.png                        (navigator/btn1/previous-hover.png)
   skin/classic/navigator/btn1/top-disabled.png                          (navigator/btn1/top-disabled.png)
   skin/classic/navigator/btn1/top-hover.png                             (navigator/btn1/top-hover.png)
   skin/classic/navigator/btn1/up-disabled.png                           (navigator/btn1/up-disabled.png)
   skin/classic/navigator/btn1/up-hover.png                              (navigator/btn1/up-hover.png)
   skin/classic/navigator/icons/close.png                                (navigator/icons/close.png)
   skin/classic/navigator/icons/identity.png                             (navigator/icons/identity.png)
   skin/classic/navigator/icons/minimize.png                             (navigator/icons/minimize.png)
+  skin/classic/navigator/icons/neogatoricons.png                        (navigator/icons/neogatoricons.png)
+  skin/classic/navigator/icons/neogatoricons-small.png                  (navigator/icons/neogatoricons-small.png)
   skin/classic/navigator/icons/navigatoricons.png                       (navigator/icons/navigatoricons.png)
   skin/classic/navigator/icons/navigatoricons-small.png                 (navigator/icons/navigatoricons-small.png)
   skin/classic/navigator/icons/restore.png                              (navigator/icons/restore.png)
   skin/classic/navigator/icons/tab-arrow-left.png                       (navigator/icons/tab-arrow-left.png)
   skin/classic/navigator/icons/tab-arrow-right.png                      (navigator/icons/tab-arrow-right.png)
 #endif
   skin/classic/navigator/btn1/feeds.png                                 (navigator/btn1/feeds.png)
   skin/classic/navigator/btn1/first.png                                 (navigator/btn1/first.png)
diff --git a/suite/themes/classic/navigator/icons/neogatoricons-small.png b/suite/themes/classic/navigator/icons/neogatoricons-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b4bee0845004433c4d6bd60fa7d0738d5402d66
GIT binary patch
literal 5219
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

diff --git a/suite/themes/classic/navigator/icons/neogatoricons.png b/suite/themes/classic/navigator/icons/neogatoricons.png
new file mode 100644
index 0000000000000000000000000000000000000000..f20cf4d196b51c78bfa14074581672c01c021cea
GIT binary patch
literal 9022
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

diff --git a/suite/themes/classic/navigator/navigator.css b/suite/themes/classic/navigator/navigator.css
--- a/suite/themes/classic/navigator/navigator.css
+++ b/suite/themes/classic/navigator/navigator.css
@@ -5,199 +5,103 @@
 @import url("chrome://navigator/content/navigator.css");
 @import url("chrome://communicator/skin/");
 @import url("chrome://communicator/skin/places/bookmarksToolbar.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: primary toolbar buttons ::::: */
 
-#back-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-  -moz-image-region: rect(60px 29px 89px 0);
+/* Hover */
+:-moz-any(#back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, toolbarbutton.bookmark-item):hover {
+  filter: saturate(120%) brightness(110%);
+}
+
+/* Pressed */
+:-moz-any(#back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, toolbarbutton.bookmark-item):not([disabled="true"]):hover:active,
+toolbarbutton.bookmark-item[open="true"] {
+  filter: brightness(75%);
 }
 
-#back-button:hover {
-  -moz-image-region: rect(60px 59px 89px 30px);
+/* Disabled */
+:-moz-any(#back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button)[disabled="true"] {
+  filter: grayscale(100%) opacity(40%);
 }
 
-#back-button:hover:active {
-  -moz-image-region: rect(60px 89px 89px 60px);
+/* Large Icons */
+:-moz-any(#back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button) {
+  list-style-image: url("chrome://navigator/skin/icons/neogatoricons.png");
 }
 
-#back-button[disabled="true"] {
-  -moz-image-region: rect(60px 119px 89px 90px) !important;
+#back-button {
+  -moz-image-region: rect(0px, 29px, 29px, 0px);
 }
 
 #forward-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-  -moz-image-region: rect(90px 29px 119px 0);
+  -moz-image-region: rect(0px, 58px, 29px, 29px);
 }
 
-#forward-button:hover {
-  -moz-image-region: rect(90px 59px 119px 30px);
-}
-
-#forward-button:hover:active {
-  -moz-image-region: rect(90px 89px 119px 60px);
-}
-
-#forward-button[disabled="true"] {
-  -moz-image-region: rect(90px 119px 119px 90px) !important;
+#stop-button {
+  -moz-image-region: rect(0px, 87px, 29px, 58px);
 }
 
 #reload-button {
-  list-style-image: url("chrome://navigator/skin/icons/navigatoricons.png");
-  -moz-image-region: rect(0 29px 29px 0);
-}
-
-#reload-button:hover {
-  -moz-image-region: rect(0 59px 29px 30px);
-}
-
-#reload-button:hover:active {
-  -moz-image-region: rect(0 89px 29px 60px);
-}
-
-#reload-button[disabled="true"] {
-  -moz-image-region: rect(0 119px 29px 90px) !important;
-}
-
-#stop-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-  -moz-image-region: rect(30px 29px 59px 0);
-}
-
-#stop-button:hover {
-  -moz-image-region: rect(30px 59px 59px 30px);
-}
-
-#stop-button:hover:active {
-  -moz-image-region: rect(30px 89px 59px 60px);
-}
-
-#stop-button[disabled="true"] {
-  -moz-image-region: rect(30px 119px 59px 90px) !important;
+  -moz-image-region: rect(0px, 116px, 29px, 87px);
 }
 
 #home-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-  -moz-image-region: rect(120px 29px 149px 0);
+  -moz-image-region: rect(0px, 145px, 29px, 116px);
 }
 
-#home-button:hover {
-  -moz-image-region: rect(120px 59px 149px 30px);
-} 
-
-#home-button:hover:active {
-  -moz-image-region: rect(120px 89px 149px 60px);
-}
-
-#home-button[disabled="true"] {
-  -moz-image-region: rect(120px 119px 149px 90px) !important;
+#print-button {
+  -moz-image-region: rect(0px, 174px, 29px, 145px);
 }
 
 #sync-button {
   list-style-image: url("chrome://communicator/skin/sync/sync-32.png");
 }
 
 #sync-button[status=active] {
   list-style-image: url("chrome://communicator/skin/sync/sync-32-throbber.png");
 }
 
-/* ::::: small primary toolbar buttons ::::: */
+/* Small Icons */
+toolbar[iconsize="small"] > toolbarpaletteitem > :-moz-any(#back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button),
+toolbar[iconsize="small"] > :-moz-any(#back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button) {
+  list-style-image: url("chrome://navigator/skin/icons/neogatoricons-small.png");
+}
 
 toolbar[iconsize="small"] > toolbarpaletteitem > #back-button,
 toolbar[iconsize="small"] > #back-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-  -moz-image-region: rect(40px 19px 59px 0);
-}
-
-toolbar[iconsize="small"] > #back-button:hover {
-  -moz-image-region: rect(40px 39px 59px 20px);
-}
-
-toolbar[iconsize="small"] > #back-button:hover:active {
-  -moz-image-region: rect(40px 59px 59px 40px);
-}
-
-toolbar[iconsize="small"] > #back-button[disabled="true"] {
-  -moz-image-region: rect(40px 79px 59px 60px) !important;
+  -moz-image-region: rect(0px, 19px, 19px, 0px);
 }
 
 toolbar[iconsize="small"] > toolbarpaletteitem > #forward-button,
 toolbar[iconsize="small"] > #forward-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-  -moz-image-region: rect(60px 19px 79px 0);
+  -moz-image-region: rect(0px, 38px, 19px, 19px);
 }
 
-toolbar[iconsize="small"] > #forward-button:hover {
-  -moz-image-region: rect(60px 39px 79px 20px);
-}
-
-toolbar[iconsize="small"] > #forward-button:hover:active {
-  -moz-image-region: rect(60px 59px 79px 40px);
-}
-
-toolbar[iconsize="small"] > #forward-button[disabled="true"] {
-  -moz-image-region: rect(60px 79px 79px 60px) !important;
+toolbar[iconsize="small"] > toolbarpaletteitem > #stop-button,
+toolbar[iconsize="small"] > #stop-button {
+  -moz-image-region: rect(0px, 57px, 19px, 38px);
 }
 
 toolbar[iconsize="small"] > toolbarpaletteitem > #reload-button,
 toolbar[iconsize="small"] > #reload-button {
-  list-style-image: url("chrome://navigator/skin/icons/navigatoricons-small.png");
-  -moz-image-region: rect(0 19px 19px 0);
-}
-
-toolbar[iconsize="small"] > #reload-button:hover {
-  -moz-image-region: rect(0 39px 19px 20px);
-}
-
-toolbar[iconsize="small"] > #reload-button:hover:active {
-  -moz-image-region: rect(0 59px 19px 40px);
-}
-
-toolbar[iconsize="small"] > #reload-button[disabled="true"] {
-  -moz-image-region: rect(0 79px 19px 60px) !important;
-}
-
-toolbar[iconsize="small"] > toolbarpaletteitem > #stop-button,
-toolbar[iconsize="small"] > #stop-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-  -moz-image-region: rect(20px 19px 39px 0);
-}
-
-toolbar[iconsize="small"] > #stop-button:hover {
-  -moz-image-region: rect(20px 39px 39px 20px);
-}
-
-toolbar[iconsize="small"] > #stop-button:hover:active {
-  -moz-image-region: rect(20px 59px 39px 40px);
-}
-
-toolbar[iconsize="small"] > #stop-button[disabled="true"] {
-  -moz-image-region: rect(20px 79px 39px 60px) !important;
+  -moz-image-region: rect(0px, 76px, 19px, 57px);
 }
 
 toolbar[iconsize="small"] > toolbarpaletteitem > #home-button,
 toolbar[iconsize="small"] > #home-button {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-  -moz-image-region: rect(80px 19px 99px 0);
+  -moz-image-region: rect(0px, 95px, 19px, 76px);
 }
 
-toolbar[iconsize="small"] > #home-button:hover {
-  -moz-image-region: rect(80px 39px 99px 20px);
-}
-
-toolbar[iconsize="small"] > #home-button:hover:active {
-  -moz-image-region: rect(80px 59px 99px 40px);
-}
-
-toolbar[iconsize="small"] > #home-button[disabled="true"] {
-  -moz-image-region: rect(80px 79px 99px 60px) !important;
+toolbar[iconsize="small"] > toolbarpaletteitem > #print-button,
+toolbar[iconsize="small"] > #print-button {
+  -moz-image-region: rect(0px, 114px, 19px, 95px);
 }
 
 toolbar[iconsize="small"] > toolbarpaletteitem > #sync-button,
 toolbar[iconsize="small"] > #sync-button {
   list-style-image: url("chrome://communicator/skin/sync/sync-16.png");
 }
 
 toolbar[iconsize="small"] > toolbarpaletteitem > #sync-button[status=active],
