cleaning up button names and states, fixes back/forward depressed state

browser/base/jar.mn

@@ -23,18 +23,17 @@ classic.jar:
         skin/classic/browser/back-forward-small.png   (skin/back-forward-small.png)
         skin/classic/browser/home-small.png           (skin/home-small.png)
         skin/classic/browser/print-small.png          (skin/print-small.png)
-        skin/classic/browser/o3-bookmark-icon-a.png   (skin/o3-bookmark-icon-a.png)
-        skin/classic/browser/o3-bookmark-icon-n.png   (skin/o3-bookmark-icon-n.png)
-        skin/classic/browser/o3-bookmark-icon-h.png   (skin/o3-bookmark-icon-h.png)
-        skin/classic/browser/o3-bookmark-icon-d.png   (skin/o3-bookmark-icon-d.png)
-        skin/classic/browser/o3-bookmark-folder-a.png (skin/o3-bookmark-folder-a.png)
-        skin/classic/browser/o3-bookmark-folder-n.png (skin/o3-bookmark-folder-n.png)
-        skin/classic/browser/o3-bookmark-folder-h.png (skin/o3-bookmark-folder-h.png)
-        skin/classic/browser/o3-bookmark-folder-d.png (skin/o3-bookmark-folder-d.png)
-        skin/classic/browser/o3-imap-dropmarker.png   (skin/o3-imap-dropmarker.png)
-        skin/classic/browser/o3-imap-close-v2.png     (skin/o3-imap-close-v2.png)  
-        skin/classic/browser/o3-imap-newtab.png       (skin/o3-imap-newtab.png)    
-        skin/classic/browser/customizeToolbar.css     (skin/customizeToolbar.css)  
+        skin/classic/browser/bookmark-icon-a.png      (skin/bookmark-icon-a.png)
+        skin/classic/browser/bookmark-icon-n.png      (skin/bookmark-icon-n.png)
+        skin/classic/browser/bookmark-icon-h.png      (skin/bookmark-icon-h.png)
+        skin/classic/browser/bookmark-icon-d.png      (skin/bookmark-icon-d.png)
+        skin/classic/browser/bookmark-folder-a.png    (skin/bookmark-folder-a.png)
+        skin/classic/browser/bookmark-folder-n.png    (skin/bookmark-folder-n.png)
+        skin/classic/browser/bookmark-folder-h.png    (skin/bookmark-folder-h.png)
+        skin/classic/browser/bookmark-folder-d.png    (skin/bookmark-folder-d.png)
+        skin/classic/browser/dropmarker.png           (skin/dropmarker.png)
+        skin/classic/browser/close.png                (skin/close.png)
+        skin/classic/browser/customizeToolbar.css     (skin/customizeToolbar.css)
         skin/classic/browser/browser.xml              (skin/browser.xml)
         skin/classic/browser/throbber-stopped.gif     (skin/throbber-stopped.gif)
         skin/classic/browser/throbber.gif             (skin/throbber.gif)
@@ -43,7 +42,7 @@ classic.jar:
         skin/classic/browser/lock-mixed.gif           (skin/lock-mixed.gif)
         skin/classic/browser/lock-secure.gif          (skin/lock-secure.gif)
         skin/classic/browser/loading.gif              (skin/loading.gif)
-        
+
 en-US.jar:
         locale/en-US/browser/contents.rdf             (locale/contents.rdf)
         locale/en-US/browser/browser.dtd              (locale/browser.dtd)

browser/base/locale/region.properties

@@ -1,5 +1,5 @@
 # navigator.properties
-homePageDefault=http://www.mozilla.org/
+homePageDefault=http://www.mozilla.org/projects/phoenix/
 shopKeyword=keyword:shop [Product]
 quoteKeyword=keyword:quote [Enter symbol here]
 localKeyword=keyword:zip [Your zip code]
@@ -12,7 +12,7 @@ otherSearchURL=http://home.netscape.com/bookmark/6_0/tsearch.html
 # all.js
 #
 browser.startup.homepage=http://www.mozilla.org/start
-browser.throbber.url=http://www.mozilla.org/
+browser.throbber.url=http://www.mozilla.org/projects/phoenix/
 browser.search.defaulturl=http://www.google.com/search?hl=en&lr=&ie=UTF-8&oe=UTF-8&q=
 
 wallet.Server=http://www.mozilla.org/wallet/tables/
@@ -20,7 +20,7 @@ wallet.Samples=http://www.mozilla.org/wallet/samples/
 
 #config.js
 #
-startup.homepage_override_url=http://www.mozilla.org/start
+startup.homepage_override_url=http://www.mozilla.org/projects/phoenix/
 
 # search-panel.properties
 #   Localizable URLs

browser/base/skin/browser.css

@@ -128,37 +128,37 @@ treechildren:-moz-tree-image(Name) {
 .bookmark-item,
 treechildren:-moz-tree-image(Name) {
   margin: 0px 2px;
-  list-style-image: url("chrome://browser/skin/o3-bookmark-icon-n.png");
+  list-style-image: url("chrome://browser/skin/bookmark-icon-n.png");
 }
 
 .bookmark-item:hover,
 treechildren:-moz-tree-image(Name) {
-  list-style-image: url("chrome://browser/skin/o3-bookmark-icon-h.png");
+  list-style-image: url("chrome://browser/skin/bookmark-icon-h.png");
 }
 
 .bookmark-item:active,
 treechildren:-moz-tree-image(Name) {
-  list-style-image: url("chrome://browser/skin/o3-bookmark-icon-a.png");
+  list-style-image: url("chrome://browser/skin/bookmark-icon-a.png");
 }
 
 .bookmark-item[container="true"],
 treechildren:-moz-tree-image(Name, container) {
-  list-style-image: url("chrome://browser/skin/o3-bookmark-folder-n.png");
+  list-style-image: url("chrome://browser/skin/bookmark-folder-n.png");
 }
 
 .bookmark-item[container="true"]:hover,
 treechildren:-moz-tree-image(Name, container) {
-  list-style-image: url("chrome://browser/skin/o3-bookmark-folder-h.png");
+  list-style-image: url("chrome://browser/skin/bookmark-folder-h.png");
 }
 
 .bookmark-item[open="true"],
 treechildren:-moz-tree-image(Name, open) {
-  list-style-image: url("chrome://browser/skin/o3-bookmark-folder-a.png");
+  list-style-image: url("chrome://browser/skin/bookmark-folder-a.png");
 }
 
 .bookmark-item[container="true"][open="true"],
 treechildren:-moz-tree-image(Name, open) {
-  list-style-image: url("chrome://browser/skin/o3-bookmark-folder-a.png");
+  list-style-image: url("chrome://browser/skin/bookmark-folder-a.png");
 }
 
 
@@ -204,7 +204,7 @@ menubutton:not([disabled="true"]):hover:active {
 }
 
 .toolbarbutton-menubutton-dropmarker {
-  list-style-image: url("chrome://browser/skin/o3-imap-dropmarker.png");
+  list-style-image: url("chrome://browser/skin/dropmarker.png");
   -moz-image-region: rect(0 14px 15px 0px) !important;
 }
 
@@ -214,7 +214,7 @@ toolbarbutton:hover > stack > .toolbarbutton-menubutton-dropmarker {
 
 toolbarbutton[disabled="true"] > stack > .toolbarbutton-menubutton-dropmarker,
 toolbarbutton[disabled="true"]:hover > stack > .toolbarbutton-menubutton-dropmarker {
-  list-style-image: url("chrome://browser/skin/o3-imap-dropmarker.png") !important;
+  list-style-image: url("chrome://browser/skin/dropmarker.png") !important;
   -moz-image-region: rect(0px 44px 15px 30px) !important;
 }
 
@@ -281,13 +281,13 @@ toolbar[mode="text"] .toolbarbutton-text {
   -moz-image-region: rect(0px 46px 42px 0px);
   -moz-box-orient: vertical;
 }
-#back-button:hover {
+#back-button[buttonover="true"] {
   -moz-image-region: rect(0px 100px 42px 54px);
 }
 #back-button[disabled="true"] {
   -moz-image-region: rect(0px 154px 42px 108px);
 }
-#back-button:hover:active {
+#back-button[buttondown="true"] {
   -moz-image-region: rect(0px 208px 42px 162px);
 }
 
@@ -297,13 +297,13 @@ toolbar[mode="text"] .toolbarbutton-text {
   -moz-image-region: rect(0px 46px 42px 0px);
   -moz-box-orient: vertical;
 }
-#forward-button:hover {
+#forward-button[buttonover="true"] {
   -moz-image-region: rect(0px 100px 42px 54px);
 }
 #forward-button[disabled="true"] {
   -moz-image-region: rect(0px 154px 42px 108px) !important;
 }
-#forward-button:hover:active {
+#forward-button[buttondown="true"] {
   -moz-image-region: rect(0px 208px 42px 162px);
 }
 
@@ -380,19 +380,19 @@ toolbar[mode="text"] .toolbarbutton-text {
 
 /* ::::: small primary toolbar buttons ::::: */
 
-toolbar[iconsize="small"]  #back-button {
+toolbar[iconsize="small"] #back-button {
   list-style-image: url("chrome://browser/skin/back-forward-small.png") !important;
   -moz-image-region: rect(0px 28px 25px 0px);
 }
 toolbar[iconsize="small"] #back-button:hover {
   -moz-image-region: rect(0px 56px 25px 28px);
 }
+toolbar[iconsize="small"] #back-button[buttondown="true"] {
+  -moz-image-region: rect(0px 112px 25px 84px);
+}
 toolbar[iconsize="small"] #back-button[disabled="true"] {
   -moz-image-region: rect(0px 84px 25px 56px);
 }
-toolbar[iconsize="small"] #back-button:hover:active {
-  -moz-image-region: rect(0px 112px 25px 84px) !important;
-}
 
 toolbar[iconsize="small"] #forward-button {
   list-style-image: url("chrome://browser/skin/back-forward-small.png") !important;
@@ -401,7 +401,7 @@ toolbar[iconsize="small"] #forward-button {
 toolbar[iconsize="small"] #forward-button:hover {
   -moz-image-region: rect(25px 56px 50px 28px);
 }
-toolbar[iconsize="small"] #forward-button:hover:active {
+toolbar[iconsize="small"] #forward-button[buttondown="true"] {
   -moz-image-region: rect(25px 84px 50px 56px);
 }
 toolbar[iconsize="small"] #forward-button[disabled="true"] {
@@ -501,7 +501,7 @@ toolbar[iconsize="small"] #print-button[disabled="true"] {
 }
 
 #page-proxy-button {
-  list-style-image: url("chrome://browser/skin/o3-bookmark-icon-n.png");
+  list-style-image: url("chrome://browser/skin/bookmark-icon-n.png");
 }
 
 #page-proxy-favicon {
@@ -509,16 +509,16 @@ toolbar[iconsize="small"] #print-button[disabled="true"] {
 }
 
 #page-proxy-button[pageproxystate="valid"]:hover  {
-  list-style-image: url("chrome://browser/skin/o3-bookmark-icon-h.png");
+  list-style-image: url("chrome://browser/skin/bookmark-icon-h.png");
 }
 
 #page-proxy-button[pageproxystate="valid"]:hover:active {
-  list-style-image: url("chrome://browser/skin/o3-bookmark-icon-a.png");
+  list-style-image: url("chrome://browser/skin/bookmark-icon-a.png");
 }
 
 #page-proxy-button[pageproxystate="invalid"] {
   cursor: default;
-  list-style-image: url("chrome://browser/skin/o3-bookmark-icon-d.png");
+  list-style-image: url("chrome://browser/skin/bookmark-icon-d.png");
 }
 
 /* ::::: autocomplete ::::: */
@@ -559,7 +559,7 @@ toolbar[iconsize="small"] #print-button[disabled="true"] {
   border: 0px;
   padding-top: 2px;
 
-  list-style-image: url("chrome://browser/skin/o3-imap-dropmarker.png");
+  list-style-image: url("chrome://browser/skin/dropmarker.png");
   -moz-image-region: rect(0 14px 15px 0px) !important;
   -moz-appearance: none !important;
 }
@@ -656,7 +656,7 @@ tab[busy] {
   margin-right: 3px;
   width: 16px;
   height: 16px;
-  list-style-image: url("chrome://browser/skin/o3-bookmark-icon-n.png");
+  list-style-image: url("chrome://browser/skin/bookmark-icon-n.png");
 }
 
 
@@ -666,7 +666,7 @@ tab[busy] {
   margin: 0px 4px;
   padding: 1px 2px 2px 2px;
   border: none;
-  list-style-image: url("chrome://browser/skin/o3-imap-close-v2.png");
+  list-style-image: url("chrome://browser/skin/close.png");
   -moz-image-region: rect(0px 20px 20px 0px);
 }
 
@@ -678,21 +678,6 @@ tab[busy] {
   -moz-image-region: rect(0px 110px 20px 90px);
 }
 
-.tabs-newbutton {
-  border: none;
-  padding: 1px 2px 2px 2px;
-  list-style-image: url("chrome://browser/skin/o3-imap-newtab.png");
-  -moz-image-region: rect(0px 20px 20px 0px);
-}
-
-.tabs-newbutton:hover {
-  -moz-image-region: rect(0px 50px 20px 30px);
-}
-
-.tabs-newbutton:hover:active {
-  -moz-image-region: rect(0px 110px 20px 90px);
-}
-
 
 /* ::::: throbber ::::: */