bug 430202 Mac Firefox theme update, fixes many Mac theme blockers and wanted+ bugs. r=mano, ui-r=beltzner, a=beltzner

browser/themes/pinstripe/browser/browser.css

@@ -187,7 +187,7 @@ toolbarbutton.bookmark-item .toolbarbutton-text {
 
 .bookmark-item[livemark] > .toolbarbutton-menu-dropmarker {
   list-style-image: url("chrome://browser/skin/places/livemarkFolder.png");
-  padding: 4px 4px 3px 2px;
+  padding: 3px 4px 3px 4px;
 }
 
 .bookmark-item[livemark] {
@@ -726,10 +726,20 @@ toolbar[iconsize="small"][mode="icons"] #back-forward-dropmarker[open="true"] {
   cursor: -moz-grab;
 }
 
+#wrapper-urlbar-container[place="palette"] {
+  max-width: 20em;
+}
+
+#wrapper-urlbar-container > #urlbar-container > #urlbar > #identity-box > hbox > #identity-icon-label,
 #wrapper-urlbar-container #urlbar > .autocomplete-history-dropmarker {
   display: none;
 }
 
+#wrapper-urlbar-container > #urlbar-container > #urlbar > #identity-box.verifiedIdentity  > hbox > #identity-icon-label,
+#wrapper-urlbar-container > #urlbar-container > #urlbar > #identity-box.verifiedDomain > hbox > #identity-icon-label {
+  display: -moz-box;
+}
+
 /* Keep the URL bar LTR */
 
 #PopupAutoCompleteRichResult {
@@ -793,6 +803,12 @@ statusbarpanel#statusbar-display {
   height: 16px;
 }
 
+richlistitem[selected="true"][current="true"] > hbox > .ac-result-type-bookmark,
+.autocomplete-treebody::-moz-tree-image(selected, current, bookmark, treecolAutoCompleteImage) {
+  list-style-image: url("chrome://browser/skin/places/star-icons.png");
+  -moz-image-region: rect(32px, 16px, 48px, 0px);
+}
+
 .ac-result-type-tag,
 .autocomplete-treebody::-moz-tree-image(tag, treecolAutoCompleteImage) {
   list-style-image: url("chrome://browser/skin/places/tag.png");
@@ -801,7 +817,7 @@ statusbarpanel#statusbar-display {
 }
 
 .ac-comment {
-  font-size: 1.15em;
+  font-size: 1.1em;
 }
 
 .ac-extra > .ac-comment {
@@ -810,6 +826,7 @@ statusbarpanel#statusbar-display {
 
 .ac-url-text {
   color: #336633;
+  font-size: 0.95em;
 }
 
 .autocomplete-treebody::-moz-tree-cell-text(treecolAutoCompleteComment) {
@@ -1046,7 +1063,7 @@ statusbarpanel#statusbar-display {
 
 #editBookmarkPanel #editBMPanel_folderTree:focus {
   outline: 2px solid -moz-mac-focusring;
-  outline-offset: -2px;
+  outline-offset: -1px;
   -moz-outline-radius: 1px;
 }
 
@@ -1180,7 +1197,7 @@ statusbarpanel#statusbar-display {
 /**** name picker ****/
 
 #editBookmarkPanel #editBMPanel_namePicker[droppable="false"] {
-  color: #ffffff !important;
+  color: #ffffff;
 }
 
 #editBookmarkPanel #editBMPanel_namePicker[droppable="false"] > .menulist-dropmarker {
@@ -1212,6 +1229,8 @@ statusbarpanel#statusbar-display {
   outline: 2px solid -moz-mac-focusring;
   outline-offset: -1px;
   -moz-outline-radius: 1px;
+  background-color: #eeeeee;
+  color: #000000;
 }
 
 #editBookmarkPanel #editBMPanel_namePicker[droppable="false"][disabled="true"] > .menulist-editable-box {
@@ -1223,10 +1242,14 @@ statusbarpanel#statusbar-display {
   border: none !important;
   padding: 0px !important;
   background-color: inherit;
-  color: #ffffff !important;
+  color: #ffffff;
   font: inherit;
 }
 
+#editBookmarkPanel #editBMPanel_namePicker[droppable="false"][focused="true"] > .menulist-editable-box > html|*.menulist-editable-input {
+  color: #000000;
+}
+
 #editBookmarkPanel > #editBookmarkPanelContent > #editBookmarkPanelGrid > rows > row > label {
   text-align: right;
 }
@@ -1234,7 +1257,7 @@ statusbarpanel#statusbar-display {
 /* ----- SIDEBAR ELEMENTS ----- */
 
 sidebarheader { 
-  background-color: #d6dde5;
+  background-color: #d4dde5;
   padding: 2px;
   text-transform: uppercase;
 }
@@ -1366,6 +1389,10 @@ toolbar[mode="text"] #navigator-throbber[busy="true"] {
   list-style-image: url("chrome://global/skin/icons/loading_16.png");
 }
 
+#wrapper-throbber-box > #throbber-box > #navigator-throbber {
+  list-style-image: url("chrome://global/skin/icons/notloading_16.png");
+}
+
 toolbarbutton.chevron {
   list-style-image: url("chrome://global/skin/icons/chevron.png") !important;
 }
@@ -1376,7 +1403,7 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 }
 
 #nav-bar {
-  background-color: #9B9B9B;
+  background-color: #9e9e9e;
   border-top: none;
   border-bottom: 1px solid rgba(0,0,0,0.35);
   background-image: url("chrome://global/skin/toolbar/toolbar-background.gif");
@@ -1572,6 +1599,11 @@ tabbrowser > tabbox > tabpanels {
   cursor: default;
 }
 
+.tab-close-button:hover,
+.tabbrowser-tab[selected="true"] > .tab-close-button:hover {
+  list-style-image: url("chrome://global/skin/icons/closetab-hover.png");
+}
+
 .tab-close-button:hover:active,
 .tabbrowser-tab[selected="true"] > .tab-close-button:hover:active {
   list-style-image: url("chrome://global/skin/icons/closetab-active.png");
@@ -1593,21 +1625,31 @@ tabbrowser > tabbox > tabpanels {
 }
 
 .tabbrowser-arrowscrollbox > .scrollbutton-up {
-  background: url("chrome://browser/skin/tabbrowser/tab-arrow-start-bkgnd.png") top right no-repeat;
+  border-right: 2px solid;
+  -moz-border-right-colors: rgba(0,0,0,0.25) rgba(255,255,255,0.15);
   list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-start.png");
   -moz-image-region: rect(0px, 7px, 11px, 0px);
-  -moz-padding-start: 0;
-  -moz-padding-end: 2px; 
+  padding: 0;
   width: 16px;
   margin: 0;
 }
 
+.tabbrowser-arrowscrollbox > .scrollbutton-up:hover {
+  background-color: rgba(0,0,0,0.10);
+}
+
+.tabbrowser-arrowscrollbox > .scrollbutton-up:hover:active {
+  background-color: rgba(0,0,0,0.20);
+}
+
 .tabbrowser-arrowscrollbox > .scrollbutton-up[disabled="true"] {
   -moz-image-region: rect(0px, 28px, 11px, 21px);
+  background-color: transparent !important; 
 }
 
 .tabbrowser-arrowscrollbox .scrollbutton-down {
-  background: url("chrome://browser/skin/tabbrowser/tab-arrow-end-bkgnd.png") top left no-repeat;
+  border-left: 2px solid;
+  -moz-border-left-colors: rgba(0,0,0,0.25) rgba(255,255,255,0.15);
   list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-end.png");
   -moz-image-region: rect(0px, 44px, 11px, 37px);
   -moz-padding-start: 2px;
@@ -1616,8 +1658,17 @@ tabbrowser > tabbox > tabpanels {
   margin: 0;
 }
 
+.tabbrowser-arrowscrollbox .scrollbutton-down:hover {
+  background-color: rgba(0,0,0,0.10);
+}
+
+.tabbrowser-arrowscrollbox .scrollbutton-down:hover:active {
+  background-color: rgba(0,0,0,0.20);
+}
+
 .tabbrowser-arrowscrollbox .scrollbutton-down[disabled="true"] {
   -moz-image-region: rect(0px, 23px, 11px, 16px);
+  background-color: transparent !important;
 }
 
 
@@ -1659,8 +1710,8 @@ tabbrowser > tabbox > tabpanels {
 }
 
 .tabs-alltabs-box-animate {
-  margin: 2px 0px 3px 0px;
-  width: 16px;
+  margin: 1px 0px 0px 0px;
+  width: 25px;
   background-image: url("chrome://browser/skin/tabbrowser/alltabs-box-overflow-bkgnd-animate.png");
   background-repeat: no-repeat;
   opacity: 0.0;
@@ -1704,17 +1755,16 @@ tabpanels.plain {
 
 /* Personal toolbar */
 .toolbar-drop-indicator {
-  width: 9px;
-  height: 18px;
-  margin-bottom: -6px;
+  width: 7px;
+  height: 17px;
   position: relative;
-  background: url('chrome://browser/skin/places/toolbarDropMarker.png') 50% 50% no-repeat;
+  background: url('chrome://browser/skin/places/toolbarDropMarker.png') 40% 50% no-repeat;
 }
 
 .toolbar-drop-indicator-bar {
   visibility: hidden;
-  height: 18px;
-  margin-bottom: -18px;
+  height: 17px;
+  margin-bottom: -17px;
   position: relative;
 }
 
@@ -1722,13 +1772,8 @@ tabpanels.plain {
   visibility: visible;
 }
 
-toolbarbutton.bookmark-item[dragover="true"][open="true"] {
-  -moz-appearance: none;
-  background: Highlight !important;
-  color: HighlightText !important;
-}
-
 /* Bookmark drag and drop styles */
+
 .bookmark-item[dragover-into="true"] {
   background: Highlight !important;
   color: HighlightText !important;

browser/themes/pinstripe/browser/jar.mn

@@ -59,6 +59,7 @@ classic.jar:
   skin/classic/browser/monitor.png
   skin/classic/browser/monitor_16-10.png
   skin/classic/browser/wrench.png
+  skin/classic/browser/places/allBookmarks.png              (places/allBookmarks.png)
   skin/classic/browser/places/places.css                    (places/places.css)
 * skin/classic/browser/places/organizer.css                 (places/organizer.css)
   skin/classic/browser/places/query.png                     (places/query.png)
@@ -90,6 +91,7 @@ classic.jar:
   skin/classic/browser/places/searching_16.png              (places/searching_16.png)
   skin/classic/browser/places/starred48.png                 (places/starred48.png)
   skin/classic/browser/places/unstarred48.png               (places/unstarred48.png)
+  skin/classic/browser/places/unfiledBookmarks.png          (places/unfiledBookmarks.png)
   skin/classic/browser/places/twisty-open.gif               (places/twisty-open.gif)
   skin/classic/browser/places/twisty-closed.gif             (places/twisty-closed.gif)
   skin/classic/browser/places/tag.png                       (places/tag.png)
@@ -99,9 +101,11 @@ classic.jar:
   skin/classic/browser/places/expander-closed.png           (places/expander-closed.png)
   skin/classic/browser/places/expander-open-active.png      (places/expander-open-active.png)
   skin/classic/browser/places/expander-open.png             (places/expander-open.png)
+  skin/classic/browser/preferences/alwaysAsk.png            (preferences/alwaysAsk.png)
   skin/classic/browser/preferences/application.png          (preferences/application.png)
   skin/classic/browser/preferences/Options.png              (preferences/Options.png)
   skin/classic/browser/preferences/plugin.png               (preferences/plugin.png)
+  skin/classic/browser/preferences/saveFile.png             (preferences/saveFile.png)
   skin/classic/browser/preferences/preferences.css          (preferences/preferences.css)
   skin/classic/browser/preferences/applications.css         (preferences/applications.css)
   skin/classic/browser/tabbrowser/alltabs-box-bkgnd.png                  (tabbrowser/alltabs-box-bkgnd.png)
@@ -147,6 +151,7 @@ classic.jar:
   skin/classic/browser/urlbar/startcap-verified-end-focused.png          (urlbar/startcap-verified-end-focused.png)
   skin/classic/browser/urlbar/startcap-secure.png                        (urlbar/startcap-secure.png)
   skin/classic/browser/urlbar/startcap-active.png                        (urlbar/startcap-active.png)
+  skin/classic/browser/urlbar/startcap-active-focused.png                (urlbar/startcap-active-focused.png)
   skin/classic/browser/urlbar/startcap-secure-active.png                 (urlbar/startcap-secure-active.png)
   skin/classic/browser/urlbar/textfield-mid.png                          (urlbar/textfield-mid.png)
   skin/classic/browser/urlbar/textfield-mid-focused.png                  (urlbar/textfield-mid-focused.png)

browser/themes/pinstripe/browser/places/organizer.css

@@ -17,6 +17,20 @@
   border-color: transparent;
 }
 
+#placesList treechildren::-moz-tree-row(selected) {  
+  background-color: #6f81a9;
+  background-image: url("chrome://browser/skin/places/selected-gradient.png");
+  background-repeat: repeat-x;
+  background-position: bottom left;
+  border-top: 1px solid #979797;
+}
+
+#placesList treechildren::-moz-tree-row(selected,focus) {  
+  background-image: url("chrome://browser/skin/places/selected-focused-gradient.png");
+  background-color: #8a8a8a !important;
+  border-top: 1px solid #91a0c0;
+}
+
 #placesList treechildren::-moz-tree-row(History),
 #placesList treechildren::-moz-tree-row(history)  {
   background-color: blue;
@@ -36,6 +50,16 @@
   cursor: default;
 }
 
+#placesList treechildren::-moz-tree-separator {
+  border-top: 1px solid #505d6d;
+  margin: 0 10px;
+}
+
+#placesList treechildren::-moz-tree-cell-text(selected) {  
+  font-weight: bold !important;
+  color: #ffffff !important;
+}
+
 #placesToolbar {
   background-color: #999;
   border-bottom: 1px solid #404040;

browser/themes/pinstripe/browser/places/places.css

@@ -16,56 +16,44 @@
 #bookmarksPanel > hbox,
 #history-panel > hbox {
   -moz-appearance: none !important;
-  background-color: #d6dde5 !important;
+  background-color: #d4dde5 !important;
   border-top: none !important;
 }
 
-#bookmarks-view,
-#historyTree,
-#historyTree treechildren::-moz-tree-row, 
-#bookmarks-view treechildren::-moz-tree-row {
+tree.sidebar-placesTree,
+tree.sidebar-placesTree treechildren::-moz-tree-row {
   background-color: transparent;
   border-color: transparent;
-  -moz-margin-end: 0;
+  padding-bottom: 1px;
   -moz-appearance: none;
   margin: 0;
   border: none;
 }
 
-#historyTree treechildren::-moz-tree-row, 
-#bookmarks-view treechildren::-moz-tree-row {
-  padding-bottom: 1px;
-}
-
-#historyTree treechildren::-moz-tree-row(selected), 
-#bookmarks-view treechildren::-moz-tree-row(selected) {  
-  background-color: -moz-mac-secondaryhighlight !important;
+#bookmarks-view treechildren::-moz-tree-row(selected), 
+#historyTree treechildren::-moz-tree-row(selected) {  
+  background-color: #6f81a9;
   background-image: url("chrome://browser/skin/places/selected-gradient.png");
   background-repeat: repeat-x;
-  background-position: center left;
+  background-position: bottom left;
+  border-top: 1px solid #979797;
 }
 
-#historyTree treechildren::-moz-tree-separator,
-#bookmarks-view treechildren::-moz-tree-separator {
+tree.sidebar-placesTree treechildren::-moz-tree-separator {
   border-top: 1px solid #505d6d;
   margin: 0 10px;
 }
 
-
-#historyTree treechildren::-moz-tree-row(selected,focus),
 #bookmarks-view treechildren::-moz-tree-row(selected,focus),
-#placesList treechildren::-moz-tree-row(selected,focus) {  
+#historyTree treechildren::-moz-tree-row(selected,focus) {  
   background-image: url("chrome://browser/skin/places/selected-focused-gradient.png");
-  background-color: Highlight !important;
-  color: HighlightText !important;
-  border-top: 1px solid Highlight;
+  background-color: #8a8a8a !important;
+  border-top: 1px solid #91a0c0;
 }
 
-#historyTree treechildren::-moz-tree-cell-text(selected,focus), 
-#bookmarks-view treechildren::-moz-tree-cell-text(selected,focus),
-#placesList treechildren::-moz-tree-cell-text(selected,focus) {  
+tree.sidebar-placesTree treechildren::-moz-tree-cell-text(selected) {  
   font-weight: bold !important;
-  color: HighlightText !important;
+  color: #ffffff !important;
 }
 
 #bookmarksPanel > hbox > label,
@@ -75,21 +63,25 @@
 
 #viewButton {
   -moz-appearance: none;
-  margin: 0 2px !important;
-  padding: 2px 0 2px 7px !important;
-  background: url("chrome://global/skin/icons/round-button-leftcap.png") no-repeat center left !important;
-  border: none;
-}
-
-#viewButton .button-text {
-  margin: 0 !important;
-  padding: 2px 18px 0 1px !important;
-  background: url("chrome://global/skin/icons/round-button-dropmarker.png") no-repeat center right !important;
-  height: 19px;
+  border: 1px solid #7F7F7F;
+  -moz-border-radius: 10px;
+  background: url("chrome://global/skin/icons/white-gray-gradient.gif") #A09E9D repeat-x top center;
+  min-width: 0px;
+  min-height: 0px;
+  -moz-padding-start: 5px;
+  -moz-padding-end: 0px;
+  padding-top: 1px;
+  padding-bottom: 1px;
 }
 
 #viewButton .button-menu-dropmarker {
-  display: none;
+  list-style-image: url("chrome://global/skin/icons/menulist-dropmarker.png");
+}
+
+#viewButton:focus {
+  outline: 2px solid #4A8BC7;
+  outline-offset: -2px;
+  -moz-outline-radius: 10px;
 }
 
 page > hbox {
@@ -127,6 +119,10 @@ treechildren::-moz-tree-row(session-start) {
   border-top:1px dotted ThreeDShadow;
 }
 
+treechildren::-moz-tree-image(container, OrganizerQuery_AllBookmarks) {
+  list-style-image: url("chrome://browser/skin/places/allBookmarks.png");
+}
+
 treechildren::-moz-tree-image(container, livemark) {
   list-style-image: url("chrome://browser/skin/page-livemarks.png");
 }
@@ -139,6 +135,10 @@ treechildren::-moz-tree-image(container, OrganizerQuery_BookmarksMenu) {
   list-style-image: url("chrome://browser/skin/places/bookmarksMenu.png");
 }
 
+treechildren::-moz-tree-image(container, OrganizerQuery_UnfiledBookmarks) {
+  list-style-image: url("chrome://browser/skin/places/unfiledBookmarks.png");
+}
+
 /* query-nodes should be styled even if they're not expandable */
 treechildren::-moz-tree-image(query) {
   list-style-image: url("chrome://browser/skin/places/query.png");

browser/themes/pinstripe/browser/preferences/applications.css

@@ -63,12 +63,12 @@ richlistitem {
 
 richlistitem[appHandlerIcon="ask"],
 menuitem[appHandlerIcon="ask"] {
-  list-style-image: url("chrome://browser/skin/preferences/application.png");
+  list-style-image: url("chrome://browser/skin/preferences/alwaysAsk.png");
 }
 
 richlistitem[appHandlerIcon="save"],
 menuitem[appHandlerIcon="save"] {
-  list-style-image: url("chrome://browser/skin/preferences/application.png");
+  list-style-image: url("chrome://browser/skin/preferences/saveFile.png");
 }
 
 richlistitem[appHandlerIcon="feed"],

browser/themes/pinstripe/browser/searchbar.css

@@ -55,6 +55,11 @@
   background-image: url("chrome://browser/skin/urlbar/startcap-active.png") !important;
 }
 
+.searchbar-textbox[focused="true"] > .searchbar-engine-button:active,
+.searchbar-textbox[focused="true"] > .searchbar-engine-button[open="true"] {
+  background-image: url("chrome://browser/skin/urlbar/startcap-active-focused.png") !important;
+}
+
 .searchbar-engine-button > .button-box {
   -moz-appearance: none;
   margin-bottom: 1px;

toolkit/themes/pinstripe/global/findBar.css

@@ -26,12 +26,17 @@ findbar {
   background-color: transparent !important;
 }
 
+.findbar-closebutton:hover {
+  list-style-image: url("chrome://global/skin/icons/closetab-hover.png") !important;
+}
+
 .findbar-closebutton:hover:active {
   list-style-image: url("chrome://global/skin/icons/closetab-active.png") !important;
 }
 
-.findbar-container > toolbarbutton,
-.findbar-container > hbox > toolbarbutton {
+.findbar-find-next,
+.findbar-find-previous,
+.findbar-highlight {
   -moz-appearance: none;
   border: 1px solid #5F5F5F;
   -moz-border-radius: 10px;
@@ -57,7 +62,7 @@ findbar {
 }
 
 
-.findbar-container > .findbar-closebutton > .toolbarbutton-text {
+.findbar-closebutton > .toolbarbutton-text {
   display: none;  
 }
 
@@ -66,6 +71,7 @@ findbar {
    -moz-image-region: rect(0px 16px 16px 0px);
    -moz-appearance: none;
    -moz-margin-start: 7px;
+   padding-top: 2px;
 }
 
 .findbar-container > checkbox:hover:active {
@@ -88,6 +94,17 @@ findbar {
   margin: 1px 0 !important;
 }
 
+.findbar-container > checkbox > .checkbox-label-box > .checkbox-icon {
+  -moz-padding-start: 1px;
+  padding-bottom: 1px;
+}
+
+.findbar-container > checkbox:focus > .checkbox-label-box > .checkbox-icon {
+  outline: 2px solid #4F8EC9;
+  outline-offset: -2px;
+  -moz-outline-radius: 4px;
+}
+
 .findbar-textbox {
   -moz-binding: url("chrome://global/content/bindings/findbar.xml#findbar-textbox");
   -moz-appearance: none;

toolkit/themes/pinstripe/global/global.css

@@ -250,6 +250,28 @@ browser {
 	border-top: 1px solid #bebebe;
 }
 
+/* notification bar buttons */
+
+notification > button {
+	-moz-appearance: none;
+  background: url("chrome://global/skin/icons/white-gray-gradient.gif") transparent repeat-x center center;
+  -moz-background-clip: padding;
+  border: 1px solid;
+  border-bottom-width: 2px;
+  -moz-border-radius: 10px;
+  -moz-border-top-colors: rgba(0,0,0,0.5);
+  -moz-border-right-colors: rgba(0,0,0,0.5);
+  -moz-border-bottom-colors: rgba(255,255,255,0.35) rgba(0,0,0,0.5);
+  -moz-border-left-colors: rgba(0,0,0,0.5);
+  padding: 0 5px;
+  min-width: 79px;
+  min-height: 17px;
+}
+
+notification > button:hover:active {
+  background-image: url("chrome://global/skin/icons/white-gray-gradient-active.gif");
+}
+
 /* :::::: autoscroll popup ::::: */
 
 #autoscroller {

toolkit/themes/pinstripe/global/jar.mn

@@ -97,6 +97,7 @@ classic.jar:
 +  skin/classic/global/icons/button-gradient-active.png               (icons/button-gradient-active.png)
 +  skin/classic/global/icons/blacklist_favicon.png                    (icons/blacklist_favicon.png)
 +  skin/classic/global/icons/blacklist_large.png                      (icons/blacklist_large.png)
++  skin/classic/global/icons/blacklist_64.png                         (icons/blacklist_64.png)
 +  skin/classic/global/icons/chevron.png                              (icons/chevron.png)
 +  skin/classic/global/icons/close.gif                                (icons/close.gif)
 +  skin/classic/global/icons/checkbox.png                             (icons/checkbox.png)
@@ -162,6 +163,9 @@ classic.jar:
 +  skin/classic/global/icons/white-checkbox-active.png                (icons/white-checkbox-active.png)
 +  skin/classic/global/icons/white-checkbox-checked.png               (icons/white-checkbox-checked.png)
 +  skin/classic/global/icons/white-checkbox.png                       (icons/white-checkbox.png)
++  skin/classic/global/notification/critical-bar-background.png       (notification/critical-bar-background.png)
++  skin/classic/global/notification/info-bar-background.png           (notification/info-bar-background.png)
++  skin/classic/global/notification/warning-bar-background.png        (notification/warning-bar-background.png)
 +  skin/classic/global/menu/menu-arrow-dis.gif                        (menu/menu-arrow-dis.gif)
 +  skin/classic/global/menu/menu-arrow-hov.gif                        (menu/menu-arrow-hov.gif)
 +  skin/classic/global/menu/menu-arrow.gif                            (menu/menu-arrow.gif)

toolkit/themes/pinstripe/global/netError.css

@@ -124,7 +124,7 @@ body[dir="rtl"] #brand {
 }
 
 :root.blacklist #errorPageContainer {
-  background-image: url("chrome://global/skin/icons/blacklist_large.png");
+  background-image: url("chrome://global/skin/icons/blacklist_64.png");
   background-color: #722;
 }
 

toolkit/themes/pinstripe/global/notification.css

@@ -1,25 +1,28 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 notification {
-  min-height: 35px;
+  min-height: 24px;
 }
 
 notification[type="info"] {
-  color: #0f2c65;
-  background-color: #e0e7f9;
-  border: 1px solid #a8b8de;
+  color: rgba(255,255,255,0.95);
+  background: url("chrome://global/skin/notification/info-bar-background.png") #404040 repeat-x top left;
+  border-top: 1px solid #707070;
+  border-bottom: 1px solid #2a2a2a;
 }
 
 notification[type="warning"] {
-  color: #585620;
-  background-color: #fdf2ab;
-  border: 1px solid #a29330;
+  color: rgba(0,0,0,0.95);
+  background: url("chrome://global/skin/notification/warning-bar-background.png") #ffc703 repeat-x top left;
+  border-top: 1px solid #ffe970;
+  border-bottom: 1px solid #bf8a01;
 }
 
 notification[type="critical"] {
-  color: #611A16;
-  background-color: #e6aeac;
-  border: 1px solid #611A16;
+  color: rgba(255,255,255,0.95);
+  background: url("chrome://global/skin/notification/critical-bar-background.png") #980000 repeat-x top left;
+  border-top: 1px solid #e35959;
+  border-bottom: 1px solid #5d0000;
 }
 
 .messageImage {
@@ -29,9 +32,15 @@ notification[type="critical"] {
 }
 
 .messageText {
+  margin-top: 2px;
+  font-weight: bold;
   -moz-margin-start: 5px;
 }
 
+.notification-inner > button {
+  -moz-appearance: none !important;
+}
+
 .messageButton {
   margin: 0px 5px 0px 5px;
 }
@@ -42,7 +51,7 @@ notification[type="critical"] {
 
 .messageCloseButton {
   -moz-appearance: none;
-  padding-right: 4px;
+  -moz-padding-end: 4px;
   list-style-image: url("chrome://global/skin/icons/closetab.png") !important;
   border: none;
 }

toolkit/themes/pinstripe/global/toolbar.css

@@ -57,7 +57,7 @@ toolbarpalette {
   color: #000000;
   border-top: 1px solid rgba(255,255,255,0.45);
   border-bottom: 1px solid rgba(0,0,0,0.35);
-  background-color: #9C9C9C;
+  background-color: #9E9E9E;
 }
 
 menubar {