From 0efa96b710c827c9be3e968b422a7b3e622bc3b9 Mon Sep 17 00:00:00 2001
From: "rflint%ryanflint.com" <rflint%ryanflint.com>
Date: Wed, 7 Nov 2007 05:12:51 +0000
Subject: [PATCH] Bug 384730 - Remove unnecessary RTL images from winstripe.
 r=mano

---
 .../themes/gnomestripe/browser/browser.css    | 77 ++++++++++++++-----
 browser/themes/gnomestripe/browser/jar.mn     |  2 -
 2 files changed, 58 insertions(+), 21 deletions(-)

diff --git a/browser/themes/gnomestripe/browser/browser.css b/browser/themes/gnomestripe/browser/browser.css
index f50e191ab7c..3c805b59d44 100644
--- a/browser/themes/gnomestripe/browser/browser.css
+++ b/browser/themes/gnomestripe/browser/browser.css
@@ -258,13 +258,6 @@ menuitem.bookmark-item {
   list-style-image: url("chrome://browser/skin/Toolbar.png");
 }
 
-#back-button[chromedir="rtl"],
-#forward-button[chromedir="rtl"] {
-  -moz-box-orient: vertical;
-  min-width: 0;
-  list-style-image: url("chrome://browser/skin/Toolbar-rtl.png");
-}
-
 .toolbarbutton-1 .toolbarbutton-icon {
   -moz-margin-end: 0px;
 }
@@ -288,12 +281,11 @@ toolbar:not([iconsize="small"]) .toolbarbutton-1 .toolbarbutton-icon {
   padding-top: 1px;
 }
 
-/* back button-- */
+/* back button */
 
 #back-button {
   -moz-image-region: rect(0px 24px 24px 0px); 
 }
-
 #back-button:not([disabled="true"]):hover,
 #back-button[buttonover="true"] {
   -moz-image-region: rect(24px 24px 48px 0px);
@@ -305,12 +297,25 @@ toolbar:not([iconsize="small"]) .toolbarbutton-1 .toolbarbutton-icon {
   -moz-image-region: rect(96px 24px 120px 0px);
 }
 
+#back-button[chromedir="rtl"] {
+  -moz-image-region: rect(0px 48px 24px 24px);
+}
+#back-button[chromedir="rtl"]:not([disabled="true"]):hover,
+#back-button[chromedir="rtl"][buttonover="true"] {
+  -moz-image-region: rect(24px 48px 48px 24px);
+}
+#back-button[chromedir="rtl"][disabled="true"] {
+  -moz-image-region: rect(48px 48px 72px 24px);
+}
+#back-button[chromedir="rtl"]:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(96px 48px 120px 24px);
+}
+
 /* forward button */
 
 #forward-button {
   -moz-image-region: rect(0px 48px 24px 24px);
 }
-
 #forward-button:not([disabled="true"]):hover,
 #forward-button[buttonover="true"] {
   -moz-image-region: rect(24px 48px 48px 24px);
@@ -322,6 +327,20 @@ toolbar:not([iconsize="small"]) .toolbarbutton-1 .toolbarbutton-icon {
   -moz-image-region: rect(96px 48px 120px 24px);
 }
 
+#forward-button[chromedir="rtl"] {
+  -moz-image-region: rect(0px 24px 24px 0px); 
+}
+#forward-button[chromedir="rtl"]:not([disabled="true"]):hover,
+#forward-button[chromedir="rtl"][buttonover="true"] {
+  -moz-image-region: rect(24px 24px 48px 0px);
+}
+#forward-button[chromedir="rtl"][disabled="true"] {
+  -moz-image-region: rect(48px 24px 72px 0px);
+}
+#forward-button[chromedir="rtl"]:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(96px 24px 120px 0px);
+}
+
 /* stop button */
 
 #stop-button {
@@ -522,13 +541,6 @@ toolbar[iconsize="small"] .toolbarbutton-1 {
   list-style-image: url("chrome://browser/skin/Toolbar-small.png");
 }
 
-toolbar[iconsize="small"] #back-button[chromedir="rtl"],
-toolbar[iconsize="small"] #forward-button[chromedir="rtl"] {
-  -moz-box-orient: vertical;
-  min-width: 0;
-  list-style-image: url("chrome://browser/skin/Toolbar-rtl-small.png");
-}
-
 toolbar[iconsize="small"] .toolbarbutton-1 .toolbarbutton-icon {
   -moz-margin-end: 0px;
 }
@@ -539,7 +551,7 @@ toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"] {
 
 /* ::::: small back button ::::: */
 
-/* back button-- */
+/* back button */
 
 toolbar[iconsize="small"] #back-button .toolbarbutton-icon {
   padding-right: 1px;
@@ -558,8 +570,21 @@ toolbar[iconsize="small"] #back-button:not([disabled="true"]):hover:active {
   -moz-image-region: rect(64px 16px 80px 0px);
 }
 
+toolbar[iconsize="small"] #back-button[chromedir="rtl"] {
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+toolbar[iconsize="small"] #back-button[chromedir="rtl"]:not([disabled="true"]):hover,
+toolbar[iconsize="small"] #back-button[chromedir="rtl"][buttonover="true"] {
+  -moz-image-region: rect(16px 32px 32px 16px);
+}
+toolbar[iconsize="small"] #back-button[chromedir="rtl"][disabled="true"] {
+  -moz-image-region: rect(32px 32px 48px 16px);
+}
+toolbar[iconsize="small"] #back-button[chromedir="rtl"]:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(64px 32px 80px 16px);
+}
 
-/* small forward button-- */
+/* forward button */
 
 toolbar[iconsize="small"] #forward-button .toolbarbutton-icon {
   padding-right: 1px;
@@ -578,6 +603,20 @@ toolbar[iconsize="small"] #forward-button:not([disabled="true"]):hover:active {
   -moz-image-region: rect(64px 32px 80px 16px);
 }
 
+toolbar[iconsize="small"] #forward-button[chromedir="rtl"] {
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+toolbar[iconsize="small"] #forward-button[chromedir="rtl"]:not([disabled="true"]):hover,
+toolbar[iconsize="small"] #forward-button[chromedir="rtl"][buttonover="true"] {
+  -moz-image-region: rect(16px 16px 32px 0px);
+}
+toolbar[iconsize="small"] #forward-button[chromedir="rtl"][disabled="true"] {
+  -moz-image-region: rect(32px 16px 48px 0px);
+}
+toolbar[iconsize="small"] #forward-button[chromedir="rtl"]:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(64px 16px 80px 0px);
+}
+
 /* stop button */
 
 toolbar[iconsize="small"] #stop-button .toolbarbutton-icon {
diff --git a/browser/themes/gnomestripe/browser/jar.mn b/browser/themes/gnomestripe/browser/jar.mn
index c7c039168b6..3024e590d1d 100644
--- a/browser/themes/gnomestripe/browser/jar.mn
+++ b/browser/themes/gnomestripe/browser/jar.mn
@@ -17,9 +17,7 @@ classic.jar:
         skin/classic/browser/Throbber.png
         skin/classic/browser/Throbber-small.png
         skin/classic/browser/Toolbar.png
-        skin/classic/browser/Toolbar-rtl.png
         skin/classic/browser/Toolbar-small.png
-        skin/classic/browser/Toolbar-rtl-small.png
         skin/classic/browser/Go-arrow.png
         skin/classic/browser/Go-arrow-rtl.png
         skin/classic/browser/Go-bkgnd.png