Landing Qute as default theme.

browser/base/jar.mn

@@ -14,7 +14,7 @@ browser.jar:
 *       content/browser/openLocation.js               (content/openLocation.js)
 *       content/browser/pageReport.xul                (content/pageReport.xul)
 *       content/browser/pageReport.js                 (content/pageReport.js)
-*       content/browser/pageReportFirstTime.xul       (content/pageReportFirstTime.xul)   
+*       content/browser/pageReportFirstTime.xul       (content/pageReportFirstTime.xul)
         content/browser/search.xml                    (content/search.xml)
         content/browser/printPreviewBindings.xml      (content/printPreviewBindings.xml)
 *       content/browser/contentAreaUtils.js           (content/contentAreaUtils.js)
@@ -22,45 +22,25 @@ browser.jar:
 *       content/browser/pageInfo.xul                  (content/pageInfo.xul)
 
 classic.jar:
-        skin/classic/browser/browser.css              (skin/browser.css)
-        skin/classic/browser/contents.rdf             (skin/contents.rdf)
-        skin/classic/browser/info-small.png           (skin/info-small.png)
-        skin/classic/browser/back-large.png           (skin/back-large.png)
-        skin/classic/browser/forward-large.png        (skin/forward-large.png)
-        skin/classic/browser/back-forward-small.png   (skin/back-forward-small.png)
-        skin/classic/browser/stop-large.png           (skin/stop-large.png)
-        skin/classic/browser/stop-small.png           (skin/stop-small.png)
-        skin/classic/browser/reload-large.png         (skin/reload-large.png)
-        skin/classic/browser/reload-small.png         (skin/reload-small.png)
-        skin/classic/browser/home-large.png           (skin/home-large.png)
-        skin/classic/browser/home-small.png           (skin/home-small.png)
-        skin/classic/browser/print-large.png          (skin/print-large.png)
-        skin/classic/browser/print-small.png          (skin/print-small.png)
-        skin/classic/browser/throbber-stopped.gif     (skin/throbber-stopped.gif)
-        skin/classic/browser/throbber.gif             (skin/throbber.gif)
-        skin/classic/browser/throbber-small-stopped.gif     (skin/throbber-small-stopped.gif)
-        skin/classic/browser/throbber-small.gif             (skin/throbber-small.gif)
-        skin/classic/browser/bookmarks-large.png      (skin/bookmarks-large.png)
-        skin/classic/browser/bookmarks-small.png      (skin/bookmarks-small.png)
-        skin/classic/browser/downloads-large.png      (skin/downloads-large.png)
-        skin/classic/browser/downloads-small.png      (skin/downloads-small.png)
-        skin/classic/browser/history-large.png        (skin/history-large.png)
-        skin/classic/browser/history-small.png        (skin/history-small.png)
-        skin/classic/browser/newtab-large.png         (skin/newtab-large.png)
-        skin/classic/browser/newtab-small.png         (skin/newtab-small.png)
-        skin/classic/browser/newwindow-large.png      (skin/newwindow-large.png)
-        skin/classic/browser/newwindow-small.png      (skin/newwindow-small.png)
-        skin/classic/browser/search-large.png         (skin/search-large.png)
-        skin/classic/browser/go-large.png             (skin/go-large.png)
-        skin/classic/browser/bookmarks-menuicons.png  (skin/bookmarks-menuicons.png)
-        skin/classic/browser/dropmarker.png           (skin/dropmarker.png)
-        skin/classic/browser/close.png                (skin/close.png)
         skin/classic/browser/browser.xml              (skin/browser.xml)
-        skin/classic/browser/lock-broken.gif          (skin/lock-broken.gif)
+        skin/classic/browser/Bookmarks-folder.png     (skin/Bookmarks-folder.png)
+        skin/classic/browser/Close-tab.png            (skin/Close-tab.png)
+        skin/classic/browser/Go.png                   (skin/Go.png)
+        skin/classic/browser/Info.png                 (skin/Info.png)
+        skin/classic/browser/Search-bar.png           (skin/Search-bar.png)
+        skin/classic/browser/Secure.png               (skin/Secure.png)
+        skin/classic/browser/Security-broken.png      (skin/Security-broken.png)
+        skin/classic/browser/Throbber-small.png       (skin/Throbber-small.png)
+        skin/classic/browser/Throbber.png             (skin/Throbber.png)
+        skin/classic/browser/Toolbar-small.png        (skin/Toolbar-small.png)
+        skin/classic/browser/Toolbar.png              (skin/Toolbar.png)
+        skin/classic/browser/bookmarks-menuicons.png  (skin/bookmarks-menuicons.png)
+        skin/classic/browser/browser.css              (skin/browser.css)
+        skin/classic/browser/browser.xml              (skin/browser.xml)
+        skin/classic/browser/contents.rdf             (skin/contents.rdf)
+        skin/classic/browser/downloads/downloadmanager.css (skin/downloads/downloadmanager.css)
         skin/classic/browser/lock-insecure.gif        (skin/lock-insecure.gif)
         skin/classic/browser/lock-mixed.gif           (skin/lock-mixed.gif)
-        skin/classic/browser/lock-secure.gif          (skin/lock-secure.gif)
-        skin/classic/browser/search-bar.png           (skin/search-bar.png)
 
 en-US.jar:
         locale/en-US/browser/contents.rdf             (locale/contents.rdf)

toolkit/Makefile.in

@@ -45,8 +45,9 @@ include $(DEPTH)/config/autoconf.mk
 DIRS	= xre components skin/win
 
 # skin/unix contains css rules that more closely match gtk widgets
-ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
-DIRS	+= skin/unix
-endif
+### killing this for now until we know how qute looks on linux
+# ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
+# DIRS	+= skin/unix
+# endif
 
 include $(topsrcdir)/config/rules.mk

toolkit/skin/win/browser.css

@@ -1,12 +1,6 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-.tabbrowser-strip {
-  padding-bottom: 3px;
-  border-bottom: 2px solid;
-  -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow;
-}
-
 tabpanels {
   -moz-appearance: none;
 }
@@ -25,12 +19,12 @@ tabpanels {
   margin-right: 3px;
   width: 16px;
   height: 16px;
-  list-style-image: url("chrome://global/skin/icons/folder-item.png"); 
-  -moz-image-region: rect(0px 16px 16px 0px);
+  list-style-image: url("chrome://global/skin/icons/Folder-item.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
 }
 
 tab[busy] > .tab-icon {
-  list-style-image: url("chrome://global/skin/icons/loading-anim.gif");
+  -moz-image-region: rect(16px, 16px, 32px, 0px);
 }
 
 tab[selected="true"] {

toolkit/skin/win/console.css

@@ -31,7 +31,7 @@
   background-color: -moz-Field;
   color: -moz-FieldText;
 }
- 
+
 /* ::::: console rows ::::: */
 
 .console-row {
@@ -58,7 +58,7 @@
   font-size: larger;
 }
 
-.console-dots, 
+.console-dots,
 .console-caret {
   height: 9px;
 }
@@ -76,7 +76,7 @@
 
 .console-row[type="message"] {
   font-family: monospace;
-} 
+}
 
 /* ..... selected state ..... */
 
@@ -86,22 +86,25 @@
 
 .console-row-code[selected="true"],
 .console-row-content[selected="true"] > .console-row-file > .console-error-source > .text-link {
-  color: inherit !important;  
+  color: inherit !important;
 }
 
 /* ::::: icons ::::: */
 
 .console-row[type="error"],
-.console-row[type="exception"] {
-  list-style-image: url("chrome://global/skin/icons/alert-error.gif");
+.console-row[type="exception"],
+toolbarbutton[observes="Console:modeErrors"] {
+  list-style-image: url("chrome://global/skin/icons/Error.png");
 }
 
-.console-row[type="warning"] {
-  list-style-image: url("chrome://global/skin/icons/alert-exclam.gif");
+.console-row[type="warning"],
+toolbarbutton[observes="Console:modeWarnings"] {
+  list-style-image: url("chrome://global/skin/icons/Warning.png");
 }
 
-.console-row[type="message"] {
-  list-style-image: url("chrome://global/skin/icons/alert-message.gif");
+.console-row[type="message"],
+toolbarbutton[observes="Console:modeMessages"] {
+  list-style-image: url("chrome://global/skin/icons/Message.png");
 }
 
 /* ::::: toolbars ::::: */

toolkit/skin/win/contents.rdf

@@ -13,9 +13,9 @@
         chrome:displayName="Classic"
         chrome:accessKey="C"
         chrome:author="mozilla.org"
-        chrome:description="This theme simulates the familiar appearance of previous Netscape versions for the Windows operating system."
+        chrome:description="This theme is the default browser theme.  It attempts to use your system colors."
         chrome:name="classic/1.0"
-        chrome:image="preview.gif">
+        chrome:image="Preview.png">
     <chrome:packages>
       <RDF:Seq about="urn:mozilla:skin:classic/1.0:packages">
         <RDF:li resource="urn:mozilla:skin:classic/1.0:global"/>

toolkit/skin/win/global.css

@@ -52,19 +52,19 @@ menulist > menupopup,
 window,
 page,
 dialog,
-wizard { 
+wizard {
   background-color: -moz-Dialog;
   color: -moz-DialogText;
   font: message-box;
 }
 
 /* deprecated */
-window.dialog { 
+window.dialog {
   padding: 8px 10px 10px 8px;
 }
 
-[wait-cursor] { 
-  cursor: wait !important; 
+[wait-cursor] {
+  cursor: wait !important;
 }
 
 /* ::::: alert icons :::::*/
@@ -78,19 +78,19 @@ window.dialog {
 }
 
 .message-icon {
-  list-style-image: url("chrome://global/skin/icons/alert-message.gif");
+  list-style-image: url("chrome://global/skin/icons/Message.png");
 }
 
 .alert-icon {
-  list-style-image: url("chrome://global/skin/icons/alert-exclam.gif");
+  list-style-image: url("chrome://global/skin/icons/Warning.png");
 }
 
 .error-icon {
-  list-style-image: url("chrome://global/skin/icons/alert-error.gif");
+  list-style-image: url("chrome://global/skin/icons/Error.png");
 }
 
 .question-icon {
-  list-style-image: url("chrome://global/skin/icons/alert-question.gif");
+  list-style-image: url("chrome://global/skin/icons/Question.png");
 }
 
 /* ::::: iframe ::::: */
@@ -140,10 +140,11 @@ statusbarpanel {
 
 /* XXXBlake yeah, shoot me -- these don't belong here.  I'll move them later. */
 
-sidebarheader {  
+sidebarheader {
   height: 25px;
   background-color: -moz-Dialog;
   -moz-appearance: toolbox;
+  border-right: 1px solid ThreeDShadow;
   border-bottom: 1px solid ThreeDShadow;
   border-top: 1px solid ThreeDHighlight;
 }

toolkit/skin/win/groupbox.css

@@ -31,11 +31,8 @@
 
 groupbox {
   margin: 5px;
-  border: 2px solid;
-  -moz-border-top-colors: ThreeDShadow ThreeDHighlight;
-  -moz-border-right-colors: ThreeDHighlight ThreeDShadow;
-  -moz-border-bottom-colors: ThreeDHighlight ThreeDShadow;
-  -moz-border-left-colors: ThreeDShadow ThreeDHighlight;
+  border: 1px solid ThreeDShadow;
+  -moz-border-radius: 5px;
   padding: 5px;
 }
 
@@ -46,5 +43,5 @@ groupbox {
 caption {
   margin: 0px 6px 2px 6px;
   padding: 0px 3px;
-  background-color: -moz-Dialog; 
+  background-color: -moz-Dialog;
 }

toolkit/skin/win/jar.mn

@@ -23,7 +23,7 @@ classic.jar:
 +  skin/classic/global/splitter.css
 +  skin/classic/global/tabbox.css
 +  skin/classic/global/textbox.css
-+ skin/classic/global/toolbarbutton.css
++  skin/classic/global/toolbarbutton.css
 +  skin/classic/global/tree.css
 +  skin/classic/global/wizard.css
 +  skin/classic/global/wizardOverlay.css
@@ -31,31 +31,63 @@ classic.jar:
 +  skin/classic/global/menu.css
 +  skin/classic/global/toolbar.css
 +  skin/classic/global/globalBindings.xml
-+  skin/classic/global/preview.gif
-+  skin/classic/global/icons/alert-exclam.gif                  (icons/alert-exclam.gif)
-+  skin/classic/global/icons/alert-error.gif                   (icons/alert-error.gif)
-+  skin/classic/global/icons/alert-message.gif                 (icons/alert-message.gif)
-+  skin/classic/global/icons/alert-question.gif                (icons/alert-question.gif)
-+  skin/classic/global/icons/folder-item.png                   (icons/folder-item.png)
-+  skin/classic/global/icons/loading-anim.gif                  (icons/loading-anim.gif)
-+  skin/classic/global/checkbox/cbox-check.gif                 (checkbox/cbox-check.gif)
-+  skin/classic/global/checkbox/cbox-check-dis.gif             (checkbox/cbox-check-dis.gif)
-+  skin/classic/global/radio/radio-check-dis.gif               (radio/radio-check-dis.gif)
-+  skin/classic/global/radio/radio-check.gif                   (radio/radio-check.gif)
-+  skin/classic/global/menu/menu-check-hover.gif               (menu/menu-check-hover.gif)
-+  skin/classic/global/menu/menu-arrow-disabled.gif            (menu/menu-arrow-disabled.gif)
-+  skin/classic/global/menu/menu-arrow-hover.gif               (menu/menu-arrow-hover.gif)
-+  skin/classic/global/menu/menu-check.gif                     (menu/menu-check.gif)
-+  skin/classic/global/menu/menu-check-disabled.gif            (menu/menu-check-disabled.gif)
-+  skin/classic/global/menu/menu-arrow.gif                     (menu/menu-arrow.gif)
-+  skin/classic/global/menu/menu-radio.gif                     (menu/menu-radio.gif)
-+  skin/classic/global/menu/menu-radio-disabled.gif            (menu/menu-radio-disabled.gif)
-+  skin/classic/global/menu/menu-radio-hover.gif               (menu/menu-radio-hover.gif)
-+  skin/classic/global/scrollbar/slider.gif                    (scrollbar/slider.gif)
-+  skin/classic/global/tree/twisty-open.gif                    (tree/twisty-open.gif)
-+  skin/classic/global/tree/twisty-clsd.gif                    (tree/twisty-clsd.gif)
-+  skin/classic/global/progressmeter/progressmeter-busy.gif    (progressmeter/progressmeter-busy.gif)
-+  skin/classic/global/toolbar/spacer-lft.gif                  (toolbar/spacer-lft.gif)
-+  skin/classic/global/toolbar.gif                  (toolbar/spacer-mid.gif)
-+  skin/classic/global/toolbar/spacer-rit.gif                  (toolbar/spacer-rit.gif)
-+  skin/classic/global/toolbar/chevron.gif                     (toolbar/chevron.gif)
++  skin/classic/global/Preview.png
++  skin/classic/global/toolbar.gif
++  skin/classic/global/arrow/arrow-dn-dis.gif            (arrow/arrow-dn-dis.gif)
++  skin/classic/global/arrow/arrow-dn-hov.gif            (arrow/arrow-dn-hov.gif)
++  skin/classic/global/arrow/arrow-dn-sharp.gif          (arrow/arrow-dn-sharp.gif)
++  skin/classic/global/arrow/arrow-dn.gif                (arrow/arrow-dn.gif)
++  skin/classic/global/arrow/arrow-lft-dis.gif           (arrow/arrow-lft-dis.gif)
++  skin/classic/global/arrow/arrow-lft-hov.gif           (arrow/arrow-lft-hov.gif)
++  skin/classic/global/arrow/arrow-lft-sharp-end.gif     (arrow/arrow-lft-sharp-end.gif)
++  skin/classic/global/arrow/arrow-lft-sharp.gif         (arrow/arrow-lft-sharp.gif)
++  skin/classic/global/arrow/arrow-lft.gif               (arrow/arrow-lft.gif)
++  skin/classic/global/arrow/arrow-rit-dis.gif           (arrow/arrow-rit-dis.gif)
++  skin/classic/global/arrow/arrow-rit-hov.gif           (arrow/arrow-rit-hov.gif)
++  skin/classic/global/arrow/arrow-rit-sharp-end.gif     (arrow/arrow-rit-sharp-end.gif)
++  skin/classic/global/arrow/arrow-rit-sharp.gif         (arrow/arrow-rit-sharp.gif)
++  skin/classic/global/arrow/arrow-rit.gif               (arrow/arrow-rit.gif)
++  skin/classic/global/arrow/arrow-up-dis.gif            (arrow/arrow-up-dis.gif)
++  skin/classic/global/arrow/arrow-up-hov.gif            (arrow/arrow-up-hov.gif)
++  skin/classic/global/arrow/arrow-up-sharp.gif          (arrow/arrow-up-sharp.gif)
++  skin/classic/global/arrow/arrow-up.gif                (arrow/arrow-up.gif)
++  skin/classic/global/checkbox/cbox-check.gif           (checkbox/cbox-check.gif)
++  skin/classic/global/checkbox/cbox-check-dis.gif       (checkbox/cbox-check-dis.gif)
++  skin/classic/global/console/console-error-caret.gif   (console/console-error-caret.gif)
++  skin/classic/global/console/console-error-dash.gif    (console/console-error-dash.gif)
++  skin/classic/global/filepicker/blank.gif              (filepicker/blank.gif)
++  skin/classic/global/filepicker/dir-closed.gif         (filepicker/dir-closed.gif)
++  skin/classic/global/filepicker/dir-open.gif           (filepicker/dir-open.gif)
++  skin/classic/global/filepicker/folder-home.gif        (filepicker/folder-home.gif)
++  skin/classic/global/filepicker/folder-new.gif         (filepicker/folder-new.gif)
++  skin/classic/global/filepicker/folder-up.gif          (filepicker/folder-up.gif)
++  skin/classic/global/icons/Error.png                   (icons/Error.png)
++  skin/classic/global/icons/Folder-item.png             (icons/Folder-item.png)
++  skin/classic/global/icons/Message.png                 (icons/Message.png)
++  skin/classic/global/icons/Question.png                (icons/Question.png)
++  skin/classic/global/icons/Warning.png                 (icons/Warning.png)
++  skin/classic/global/icons/close-button.gif            (icons/close-button.gif)
++  skin/classic/global/menu/Menu-arrow-disabled.png      (menu/Menu-arrow-disabled.png)
++  skin/classic/global/menu/Menu-arrow-hover.png         (menu/Menu-arrow-hover.png)
++  skin/classic/global/menu/Menu-arrow.png               (menu/Menu-arrow.png)
++  skin/classic/global/menu/menu-check-disabled.gif      (menu/menu-check-disabled.gif)
++  skin/classic/global/menu/menu-check-hover.gif         (menu/menu-check-hover.gif)
++  skin/classic/global/menu/menu-check.gif               (menu/menu-check.gif)
++  skin/classic/global/menu/menu-radio-disabled.gif      (menu/menu-radio-disabled.gif)
++  skin/classic/global/menu/menu-radio-hover.gif         (menu/menu-radio-hover.gif)
++  skin/classic/global/menu/menu-radio.gif               (menu/menu-radio.gif)
++  skin/classic/global/progressmeter/progressmeter-busy.gif (progressmeter/progressmeter-busy.gif)
++  skin/classic/global/radio/radio-check.gif             (radio/radio-check.gif)
++  skin/classic/global/radio/radio-check-dis.gif         (radio/radio-check-dis.gif)
++  skin/classic/global/scrollbar/slider.gif              (scrollbar/slider.gif)
++  skin/classic/global/toolbar/Bookmarks-toolbar.png     (toolbar/Bookmarks-toolbar.png)
++  skin/classic/global/toolbar/Lighten.png               (toolbar/Lighten.png)
++  skin/classic/global/toolbar/chevron.gif               (toolbar/chevron.gif)
++  skin/classic/global/toolbar/spacer-lft.gif            (toolbar/spacer-lft.gif)
++  skin/classic/global/toolbar/spacer-rit.gif            (toolbar/spacer-rit.gif)
++  skin/classic/global/tree/columnpicker.gif             (tree/columnpicker.gif)
++  skin/classic/global/tree/sort-asc.gif                 (tree/sort-asc.gif)
++  skin/classic/global/tree/sort-dsc.gif                 (tree/sort-dsc.gif)
++  skin/classic/global/tree/twisty-clsd.gif              (tree/twisty-clsd.gif)
++  skin/classic/global/tree/twisty-open.gif              (tree/twisty-open.gif)
+

toolkit/skin/win/menu.css

@@ -30,7 +30,7 @@
 
 /* ::::: menu/menuitem ::::: */
 
-menu, 
+menu,
 menuitem {
   -moz-box-align: center;
   color: MenuText;
@@ -40,8 +40,8 @@ menuitem {
 
 menuitem[default="true"] {
   font-weight: bold;
-}  
-  
+}
+
 menu[disabled="true"], menuitem[disabled="true"],
 menu[_moz-menuactive="true"][disabled="true"],
 menuitem[_moz-menuactive="true"][disabled="true"] {
@@ -50,7 +50,7 @@ menuitem[_moz-menuactive="true"][disabled="true"] {
 
 /* ..... internal content .... */
 
-.menu-text, 
+.menu-text,
 .menu-iconic-left,
 .menu-iconic-text {
   margin: 0px 2px 0px 0px !important;
@@ -78,15 +78,15 @@ menuitem[_moz-menuactive="true"][disabled="true"] {
 .menu-right {
   margin: 0px 0px 0px 6px;
   width: 8px;
-  list-style-image: url("chrome://global/skin/menu/menu-arrow.gif");
+  list-style-image: url("chrome://global/skin/menu/Menu-arrow.png");
 }
 
 .menu-right[_moz-menuactive="true"] {
-  list-style-image: url("chrome://global/skin/menu/menu-arrow-hover.gif");
+  list-style-image: url("chrome://global/skin/menu/Menu-arrow-hover.png");
 }
 
 .menu-right[disabled="true"] {
-  list-style-image: url("chrome://global/skin/menu/menu-arrow-disabled.gif") !important;
+  list-style-image: url("chrome://global/skin/menu/Menu-arrow-disabled.png") !important;
 }
 
 /* ::::: menu/menuitems in menubar ::::: */
@@ -97,22 +97,9 @@ menubar > menu {
   margin: 1px 0px 1px 0px;
 }
 
-menubar > menu[disabled="true"] {
-  border: 1px solid transparent !important;
-}
-
 menubar > menu[_moz-menuactive="true"] {
-  border-top: 1px solid ThreeDHighlight;
-  border-right: 1px solid ThreeDShadow;
-  border-bottom: 1px solid ThreeDShadow;
-  border-left: 1px solid ThreeDHighlight;
-}
-
-menubar > menu[_moz-menuactive="true"][open="true"]  {
-  border-top: 1px solid ThreeDShadow;
-  border-right: 1px solid ThreeDHighlight;
-  border-bottom: 1px solid ThreeDHighlight;
-  border-left: 1px solid ThreeDShadow;
+  background-color: Highlight;
+  color: HighlightText;
 }
 
 /* ..... internal content .... */
@@ -157,18 +144,18 @@ menulist > menupopup > menu {
   font: message-box;
   color: -moz-FieldText;
 }
-    
+
 .menulist-menupopup > menuitem > .menu-iconic-left,
 menulist > menupopup > menuitem > .menu-iconic-left,
 .menulist-menupopup > menu > .menu-iconic-left,
 menulist > menupopup > menu > .menu-iconic-left {
   display: none;
 }
-    
+
 menulist > menupopup > menuitem[_moz-menuactive="true"] {
   border: 1px dotted #F5DB95;
 }
- 
+
 /* ::::: checkbox menuitem ::::: */
 
 menuitem[checked="true"] {

toolkit/skin/win/menulist.css

@@ -119,7 +119,6 @@ html|*.menulist-editable-input {
   padding: 0px !important;
   background: inherit;
   font: inherit;
-  -moz-appearance: none !important;
 }
 
 /* ::::: compact menulists ::::: */

toolkit/skin/win/popup.css

@@ -31,12 +31,8 @@
 
 menupopup,
 popup {
-  border: 2px solid;
-  -moz-border-top-colors: ThreeDLightShadow ThreeDHighlight;
-  -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
-  -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow;
-  -moz-border-left-colors: ThreeDLightShadow ThreeDHighlight;
-  padding: 1px;
+  border: 1px solid ThreeDShadow;
+  padding: 2px;
   min-width: 1px;
   background-color: Menu;
 }
@@ -62,7 +58,7 @@ tooltip[titletip="true"] {
   margin: -2px 0px 0px -3px;
   max-width: none;
 }
-  
+
 /* rules for popups associated with menulists */
 
 menulist > menupopup,

toolkit/skin/win/splitter.css

@@ -33,11 +33,6 @@ splitter {
   -moz-box-align: center;
   -moz-box-pack: center;
   cursor: e-resize;
-  border: 2px solid;
-  -moz-border-top-colors: ThreeDHighlight ThreeDLightShadow;
-  -moz-border-right-colors: transparent;
-  -moz-border-bottom-colors: ThreeDShadow ThreeDLightShadow;
-  -moz-border-left-colors: ThreeDShadow ThreeDHighlight;
   min-width: 5px;
   background-color: ThreeDFace;
 }
@@ -46,75 +41,11 @@ splitter {
 
 splitter[orient="vertical"] {
   cursor: n-resize;
-  -moz-border-top-colors: ThreeDDarkShadow ThreeDHighlight;
-  -moz-border-right-colors: ThreeDShadow ThreeDLightShadow;
-  -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow;
-  -moz-border-left-colors: ThreeDHighlight ThreeDLightShadow;
   min-height: 8px;
 }
 
 /* ::::: splitter grippy ::::: */
-  
+
 grippy {
-  cursor: pointer;
-  border-top: 1px solid ThreeDShadow;
-  border-bottom: 1px solid ThreeDShadow;
-  min-width: 4px;
-  min-height: 115px;
-  background-color: transparent;
-  background-repeat: no-repeat;
+  display: none;
 }
-
-grippy:hover {
-  background-color: #CCCCFF;
-}
-
-splitter[orient="vertical"] > grippy {
-  border-top: none;
-  border-right: 1px solid ThreeDShadow;
-  border-bottom: none;
-  border-left: 1px solid ThreeDShadow;;
-  min-width: 115px;
-  min-height: 4px;
-}
-  
-/* ..... normal state ..... */
-
-/* vertical grippies */
-splitter[collapse="before"] > grippy {
-  background-image: url("chrome://global/skin/splitter/grip-vrt-before.gif");
-}
-
-splitter[collapse="after"] > grippy {
-  background-image: url("chrome://global/skin/splitter/grip-vrt-after.gif");
-}
-
-/* horizontal grippies */
-splitter[collapse="before"][orient="vertical"] > grippy {
-  background-image: url("chrome://global/skin/splitter/grip-hrz-before.gif");
-}  
-
-splitter[collapse="after"][orient="vertical"] > grippy {
-  background-image: url("chrome://global/skin/splitter/grip-hrz-after.gif");
-}  
-  
-/* ..... collapsed state ..... */
-
-/* vertical grippies */
-splitter[collapse="before"][state="collapsed"] > grippy {
-  background-image: url("chrome://global/skin/splitter/grip-vrt-after.gif");
-}
-
-splitter[collapse="after"][state="collapsed"] > grippy {
-  background-image: url("chrome://global/skin/splitter/grip-vrt-before.gif");
-}
-
-/* horizontal grippies */
-splitter[collapse="before"][state="collapsed"][orient="vertical"] > grippy {
-  background-image: url("chrome://global/skin/splitter/grip-hrz-after.gif");
-}  
-
-splitter[collapse="after"][state="collapsed"][orient="vertical"] > grippy {
-  background-image: url("chrome://global/skin/splitter/grip-hrz-before.gif");
-}  
-

toolkit/skin/win/toolbar.css

@@ -35,8 +35,8 @@ toolbox {
   border-left: 1px solid ThreeDShadow;
   border-top: 1px solid ThreeDShadow;
   border-right: 1px solid ThreeDHighlight;
-}
-
+} 
+  
 /* ::::: toolbar & menubar ::::: */
 
 toolbar,
@@ -47,13 +47,12 @@ menubar {
   border-top: 1px solid ThreeDHighlight;
   border-right: 1px solid ThreeDShadow;
   border-bottom: 1px solid ThreeDShadow;
-}  
+}
 
 /* ::::: toolbar decorations ::::: */
 
 toolbarseparator {
-  margin : 2px 0.2em 2px 0.2em;
-  border-right : 1px solid ThreeDHighlight; 
+  margin : 2px 0.2em 0 0.2em;
   border-left : 1px solid ThreeDShadow;
   width : 2px;
 }

toolkit/skin/win/toolbarbutton.css

@@ -34,12 +34,8 @@ toolbarbutton {
   -moz-box-align: center;
   -moz-box-pack: center;
   margin: 0;
-  border: 2px solid;
-  -moz-border-top-colors: transparent;
-  -moz-border-right-colors: transparent;
-  -moz-border-bottom-colors: transparent;
-  -moz-border-left-colors: transparent;
-  padding: 2px;
+  border: 1px outset transparent;
+  padding: 3px;
   background-color: transparent;
   color: -moz-DialogText;
 }
@@ -55,47 +51,34 @@ toolbarbutton {
 
 toolbarbutton:hover,
 toolbarbutton[buttonover="true"] {
-  -moz-border-top-colors: ThreeDDarkShadow ThreeDHighlight;
-  -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
-  -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow;
-  -moz-border-left-colors: ThreeDDarkShadow ThreeDHighlight;
-  color: #0000FF;
-} 
-    
+  border-color: ThreeDFace;
+}
+
 toolbarbutton:hover:active,
 toolbarbutton[open="true"] {
-  -moz-border-top-colors: ThreeDDarkShadow ThreeDShadow;
-  -moz-border-right-colors: ThreeDDarkShadow ThreeDHighlight;
-  -moz-border-bottom-colors: ThreeDDarkShadow ThreeDHighlight;
-  -moz-border-left-colors: ThreeDDarkShadow ThreeDShadow;
-  padding: 3px 1px 1px 3px;
-  color: #0000FF;
+  border-style: inset;
+  padding: 4px 2px 2px 4px;
 }
 
 toolbarbutton[disabled="true"],
 toolbarbutton[disabled="true"]:hover,
-toolbarbutton[disabled="true"]:hover:active
+toolbarbutton[disabled="true"]:hover:active,
 toolbarbutton[disabled="true"][open="true"] {
-  -moz-border-top-colors: transparent;
-  -moz-border-right-colors: transparent;
-  -moz-border-bottom-colors: transparent;
-  -moz-border-left-colors: transparent;
-  padding: 2px;
+  border-color: transparent;
+  padding: 3px;
   color: GrayText;
 }
 
 /* ..... checked state ..... */
 
 toolbarbutton[checked="true"] {
-  -moz-border-top-colors: ThreeDLightShadow ThreeDShadow !important;
-  -moz-border-right-colors: ThreeDLightShadow ThreeDHighlight !important;
-  -moz-border-bottom-colors: ThreeDLightShadow ThreeDHighlight !important;
-  -moz-border-left-colors: ThreeDLightShadow ThreeDShadow !important;
-  padding: 2px !important;
-  background-color: ThreeDHighlight !important;
+  border-style: inset !important;
+  border-color: ThreeDFace !important;
+  padding: 4px 2px 2px 4px !important;
+  background-image: url("chrome://global/skin/toolbar/Lighten.png");
   color: ButtonText !important;
 }
-    
+
 /* ::::: toolbarbutton menu ::::: */
 
 .toolbarbutton-menu-dropmarker {
@@ -110,6 +93,7 @@ toolbarbutton[checked="true"] {
 
 toolbarbutton[type="menu-button"] {
   -moz-box-align: stretch;
+  -moz-appearance: none;
 }
 
 toolbarbutton[type="menu-button"],
@@ -119,7 +103,7 @@ toolbarbutton[type="menu-button"][open="true"],
 toolbarbutton[type="menu-button"][disabled="true"],
 toolbarbutton[type="menu-button"][disabled="true"]:hover,
 toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
-  border: 1px solid;
+  border-style: none;
   padding: 0;
 }
 
@@ -130,40 +114,7 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
 
 .toolbarbutton-menubutton-button,
 .toolbarbutton-menubutton-dropmarker {
-  border: 1px solid;
-  -moz-border-top-colors: transparent;
-  -moz-border-right-colors: transparent;
-  -moz-border-bottom-colors: transparent;
-  -moz-border-left-colors: transparent;
-}
-
-.toolbarbutton-menubutton-button[disabled="true"],
-.toolbarbutton-menubutton-dropmarker[disabled="true"] {
-  -moz-border-top-colors: transparent !important;
-  -moz-border-right-colors: transparent !important;
-  -moz-border-bottom-colors: transparent !important;
-  -moz-border-left-colors: transparent !important;
-}
-
-toolbarbutton[type="menu-button"]:hover > .toolbarbutton-menubutton-button,
-toolbarbutton[type="menu-button"][buttonover="true"] > .toolbarbutton-menubutton-button,
-toolbarbutton[type="menu-button"]:hover > .toolbarbutton-menubutton-dropmarker,
-toolbarbutton[type="menu-button"][buttonover="true"] > .toolbarbutton-menubutton-dropmarker,
-toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-button {
-  -moz-border-top-colors: ThreeDHighlight;
-  -moz-border-right-colors: ThreeDShadow;
-  -moz-border-bottom-colors: ThreeDShadow;
-  -moz-border-left-colors: ThreeDHighlight;
-}
-
-toolbarbutton[type="menu-button"][buttondown="true"] > .toolbarbutton-menubutton-button,
-toolbarbutton[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
-toolbarbutton[type="menu-button"][buttondown="true"] > .toolbarbutton-menubutton-dropmarker,
-toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker {
-  -moz-border-top-colors: ThreeDShadow;
-  -moz-border-right-colors: ThreeDHighlight;
-  -moz-border-bottom-colors: ThreeDHighlight;
-  -moz-border-left-colors: ThreeDShadow;
+  border: 1px outset transparent;
 }
 
 /* .......... dropmarker .......... */
@@ -184,3 +135,70 @@ toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropm
 toolbarbutton[type="menu-button"][buttondown="true"] > .toolbarbutton-menubutton-dropmarker {
   padding: 1px 0 0 0;
 }
+
+/* Bookmarks manager */
+
+#bookmark-window toolbarbutton {
+  list-style-image: url("chrome://global/skin/toolbar/Bookmarks-toolbar.png");
+  -moz-box-orient: vertical;
+}
+
+toolbarbutton#newfolder {
+  -moz-image-region: rect(0px, 32px, 32px, 0px);
+}
+toolbarbutton#newfolder:hover {
+  -moz-image-region: rect(32px, 32px, 64px, 0px);
+}
+toolbarbutton#newfolder[disabled="true"] {
+  -moz-image-region: rect(64px, 32px, 96px, 0px);
+}
+
+toolbarbutton#newseparator {
+  -moz-image-region: rect(0px, 64px, 32px, 32px);
+}
+toolbarbutton#newseparator:hover {
+  -moz-image-region: rect(32px, 64px, 64px, 32px);
+}
+toolbarbutton#newseparator[disabled="true"] {
+  -moz-image-region: rect(64px, 64px, 96px, 32px);
+}
+
+toolbarbutton#moveBookmark {
+  -moz-image-region: rect(0px, 96px, 32px, 64px);
+}
+toolbarbutton#moveBookmark:hover {
+  -moz-image-region: rect(32px, 96px, 64px, 64px);
+}
+toolbarbutton#moveBookmark[disabled="true"] {
+  -moz-image-region: rect(64px, 96px, 96px, 64px);
+}
+
+toolbarbutton#properties {
+  -moz-image-region: rect(0px, 128px, 32px, 96px);
+}
+toolbarbutton#properties:hover {
+  -moz-image-region: rect(32px, 128px, 64px, 96px);
+}
+toolbarbutton#properties[disabled="true"] {
+  -moz-image-region: rect(64px, 128px, 96px, 96px);
+}
+
+toolbarbutton#rename {
+  -moz-image-region: rect(0px, 160px, 32px, 128px);
+}
+toolbarbutton#rename:hover {
+  -moz-image-region: rect(32px, 160px, 64px, 128px);
+}
+toolbarbutton#rename[disabled="true"] {
+  -moz-image-region: rect(64px, 160px, 96px, 128px);
+}
+
+toolbarbutton#delete {
+  -moz-image-region: rect(0px, 192px, 32px, 160px);
+}
+toolbarbutton#delete:hover {
+  -moz-image-region: rect(32px, 192px, 64px, 160px);
+}
+toolbarbutton#delete[disabled="true"] {
+  -moz-image-region: rect(64px, 192px, 96px, 160px);
+}

toolkit/skin/win/tree.css

@@ -36,8 +36,8 @@ tree {
   -moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
   -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
   -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
-  background-color: -moz-Field;
-  color: -moz-FieldText;
+  background-color: Window;
+  color: WindowText;
   -moz-appearance: listbox;
 }
 
@@ -137,7 +137,7 @@ treechildren:-moz-tree-cell-text(progressmeter) {
 /* ::::: tree columns ::::: */
 
 treecol,
-treecolpicker { 
+treecolpicker {
   -moz-appearance: treeheadercell;
   -moz-box-align: center;
   -moz-box-pack: center;
@@ -266,29 +266,16 @@ treechildren:-moz-tree-image(Name) {
 
 treechildren:-moz-tree-image(Name) {
   margin: 0px 2px;
-  list-style-image: url("chrome://global/skin/icons/folder-item.png") !important;
-  -moz-image-region: rect(0px 16px 16px 0px);
-}
-
-treechildren:-moz-tree-image(Name) {
-  -moz-image-region: rect(0px 32px 16px 16px);
-}
-
-treechildren:-moz-tree-image(Name) {
-  -moz-image-region: rect(0px 48px 16px 32px);
+  list-style-image: url("chrome://global/skin/icons/Folder-item.png") !important;
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
 }
 
 treechildren:-moz-tree-image(Name, container) {
-  list-style-image: url("chrome://global/skin/icons/folder-item.png") !important;
-  -moz-image-region: rect(16px 16px 32px 0px);
-}
-
-treechildren:-moz-tree-image(Name, container) {
-  -moz-image-region: rect(16px 32px 32px 16px);
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
 
 treechildren:-moz-tree-image(Name, open) {
-  -moz-image-region: rect(16px 48px 32px 32px);
+  -moz-image-region: rect(16px, 32px, 32px, 16px);
 }
 
 treechildren:-moz-tree-twisty(group, hidetwisty) {