Fix form controls and Windows/Unix classic skin to use new system colors -moz-FieldText, -moz-Dialog, and -moz-DialogText where appropriate to allow accurate representation of system colors on GTK.

Fix various CSS errors in themes. b=67448 r=hewitt@netscape.com sr=blizzard@mozilla.org
2001-04-17 02:54:21 +00:00 · 2001-04-17 02:54:21 +00:00 · 9db9333e20
--- a/layout/html/document/src/forms.css
+++ b/layout/html/document/src/forms.css
@ -60,9 +60,9 @@ fieldset {

 /* default inputs, text inputs, and selects */
 input {
-  background-color: -moz-field;
+  background-color: -moz-Field;
  border: 2px inset ThreeDFace;
-  color: WindowText;
+  color: -moz-FieldText;
  cursor: text;
  font: field;
  text-align: start;
@ -74,9 +74,9 @@ input {
 }

 textarea {
-  background-color: -moz-field;
+  background-color: -moz-Field;
  border: 2px inset ThreeDFace;
-  color: WindowText;
+  color: -moz-FieldText;
  cursor: text;
  font: field;
  margin: 1px 0 1px 0;
@ -96,11 +96,11 @@ textarea {

 select {
  font: list;
-  background-color: -moz-field;
+  background-color: -moz-Field;
  border: 2px inset ThreeDFace;
  margin: 0;
  vertical-align: bottom;
-  color: WindowText;
+  color: -moz-FieldText;
  white-space: nowrap;
  text-align: start; 
  cursor: default;
@ -227,7 +227,7 @@ input[type="image"][disabled] {
 }

 input[type="image"]:focus {
-  -moz-outline: 1px dotted WindowText;
+  -moz-outline: 1px dotted -moz-FieldText;
 }

 /* file selector */
@ -253,8 +253,8 @@ input[type="file"] > input[type="button"]:-moz-focus-inner
 /* radio buttons */
 input[type="radio"] {
  border: 2px inset ThreeDFace;
-  background-color: -moz-field;
-  color: WindowText;
+  background-color: -moz-Field;
+  color: -moz-FieldText;
  width: 12px;
  height: 12px;
  cursor: default;
@ -267,8 +267,8 @@ input[type="radio"] {
 /* check boxes */
 input[type="checkbox"] {
  border: 2px inset ThreeDFace;
-  background-color: -moz-field;
-  color: WindowText;
+  background-color: -moz-Field;
+  color: -moz-FieldText;
  width: 13px;
  height: 13px;
  cursor: default;
@ -304,7 +304,7 @@ input[type="radio"]:hover:active {
 }

 :-moz-radio {
-  background-color: WindowText;
+  background-color: -moz-FieldText;
  width: 4px;
  height: 4px;
  left: 6px;
--- a/layout/style/forms.css
+++ b/layout/style/forms.css
@ -60,9 +60,9 @@ fieldset {

 /* default inputs, text inputs, and selects */
 input {
-  background-color: -moz-field;
+  background-color: -moz-Field;
  border: 2px inset ThreeDFace;
-  color: WindowText;
+  color: -moz-FieldText;
  cursor: text;
  font: field;
  text-align: start;
@ -74,9 +74,9 @@ input {
 }

 textarea {
-  background-color: -moz-field;
+  background-color: -moz-Field;
  border: 2px inset ThreeDFace;
-  color: WindowText;
+  color: -moz-FieldText;
  cursor: text;
  font: field;
  margin: 1px 0 1px 0;
@ -96,11 +96,11 @@ textarea {

 select {
  font: list;
-  background-color: -moz-field;
+  background-color: -moz-Field;
  border: 2px inset ThreeDFace;
  margin: 0;
  vertical-align: bottom;
-  color: WindowText;
+  color: -moz-FieldText;
  white-space: nowrap;
  text-align: start; 
  cursor: default;
@ -227,7 +227,7 @@ input[type="image"][disabled] {
 }

 input[type="image"]:focus {
-  -moz-outline: 1px dotted WindowText;
+  -moz-outline: 1px dotted -moz-FieldText;
 }

 /* file selector */
@ -253,8 +253,8 @@ input[type="file"] > input[type="button"]:-moz-focus-inner
 /* radio buttons */
 input[type="radio"] {
  border: 2px inset ThreeDFace;
-  background-color: -moz-field;
-  color: WindowText;
+  background-color: -moz-Field;
+  color: -moz-FieldText;
  width: 12px;
  height: 12px;
  cursor: default;
@ -267,8 +267,8 @@ input[type="radio"] {
 /* check boxes */
 input[type="checkbox"] {
  border: 2px inset ThreeDFace;
-  background-color: -moz-field;
-  color: WindowText;
+  background-color: -moz-Field;
+  color: -moz-FieldText;
  width: 13px;
  height: 13px;
  cursor: default;
@ -304,7 +304,7 @@ input[type="radio"]:hover:active {
 }

 :-moz-radio {
-  background-color: WindowText;
+  background-color: -moz-FieldText;
  width: 4px;
  height: 4px;
  left: 6px;
--- a/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul
+++ b/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul
@ -100,9 +100,9 @@ Rights Reserved.
    <!-- Box with buttons on right edge of window -->
    <box id="rightColumnButtonBox" align="vertical">
      <box align="vertical" flex="50%">
-        <spring class="3rd-column-spring"/>
+        <spring class="third-column-spring"/>
        <button id="new" label="&newButton.label;" class="dialog" tooltip="aTooltip" tooltiptext="&addressPickerNewButton.tooltip;" oncommand="AbNewCard()"/> 
-        <spring class="3rd-column-spring"/>
+        <spring class="third-column-spring"/>
        <button id="edit" label="&editButton.label;" class="dialog" tooltip="aTooltip" tooltiptext="&addressPickerEditButton.tooltip;" oncommand="AbEditCard()"/> 
        <spring flex="100%"/>
      </box>
--- a/themes/classic/communicator/bookmarks/bookmarksToolbar.css
+++ b/themes/classic/communicator/bookmarks/bookmarksToolbar.css
@ -68,7 +68,7 @@
  .bookmark-item.button-toolbar[dragover-left="true"]
    {
      margin-left         : 0px;
-      border-left         : 2px solid ThreeDDarksShadow;
+      border-left         : 2px solid ThreeDDarkShadow;
    }

  .bookmark-item.button-toolbar[dragover-right="true"]
--- a/themes/classic/communicator/profile/profile.css
+++ b/themes/classic/communicator/profile/profile.css
@ -27,7 +27,7 @@
@import url(chrome://global/skin/global.css);

 window.dialog {
-  padding: none;
+  padding: 0;
 }

 .dimmed-highcontrast {
--- a/themes/classic/communicator/sidebar/win/sidebar.css
+++ b/themes/classic/communicator/sidebar/win/sidebar.css
@ -50,7 +50,7 @@
  { 
    /* This image still has to be added to the tree (8/8/00).  I'll do it after german's approval */
    list-style-image	    : url("chrome://global/skin/grippy-short-vert-after.gif");
-  	background-color	    : ThreeDFace;
+  	background-color	    : -moz-Dialog;
  	max-width			        : 32px;
  	height				        : 4px;
  }
--- a/themes/classic/communicator/win/box.css
+++ b/themes/classic/communicator/win/box.css
@ -7,7 +7,7 @@
    border-top            : 1px solid ThreeDShadow;
    border-bottom         : 1px solid ThreeDHighlight;
    border-right          : 1px solid ThreeDHighlight;
-    background-color      : -moz-field;
+    background-color      : -moz-Field;
    margin                : 0px;
  }
  
--- a/themes/classic/communicator/win/button.css
+++ b/themes/classic/communicator/win/button.css
@ -10,6 +10,7 @@
      margin              : 0px;
      border              : 1px solid transparent;
      background-color    : transparent;
+      color               : -moz-DialogText;
      -moz-user-focus     : ignore;
    }

@ -26,6 +27,8 @@
      vertical-align      : middle;
      text-align          : center;
      border              : 1px solid transparent;
+      color               : inherit;
+      background-color    : -moz-Dialog;
    }    
    
  .button-toolbar-1[disabled="true"],
@ -93,7 +96,8 @@
      border              : 1px solid transparent;
      min-width           : 0px;
      max-width           : 14em;
-      color               : WindowText;
+      color               : -moz-DialogText;
+      background-color    : -moz-Dialog;
      -moz-user-focus     : ignore;
    }

@ -119,7 +123,7 @@
      border-top          : 1px solid ThreeDShadow;
      border-right        : 1px solid ThreeDHighlight;
      border-bottom       : 1px solid ThreeDHighlight;
-      background-color	  : ThreeDFace;
+      background-color	  : -moz-Dialog;
      background-image    : none;
    }
    
@ -175,16 +179,18 @@
  .button-toolbar-4    
    {
      background-color    : transparent;
+      color               : -moz-DialogText;
      -moz-binding        : url("chrome://global/content/xulBindings.xml#buttonleft");
      min-width           : 0px;
      margin              : 0px;
      border              : 1px solid transparent;
-      color               : WindowText;
      -moz-user-focus     : ignore;
    }
    
  .button-toolbar-4 > .button-internal-box
    {
+      background-color    : -moz-Dialog;
+      color               : inherit;
      padding             : 0px;
      border              : 1px solid transparent;
      vertical-align      : middle;
@ -249,13 +255,14 @@
      margin                : 0px 0px 1px 3px !important;
      min-width             : 0px;
      background-color      : transparent;
-      color                 : WindowText;
+      color                 : -moz-DialogText;
      -moz-user-focus       : ignore;
    }  
    
  .button-toolbar-3 > .button-internal-box
    {
-      background-color      : ThreeDFace;
+      background-color      : -moz-Dialog;
+      color                 : inherit;
    }
    
  .button-toolbar-3, 
--- a/themes/classic/communicator/win/menubutton.css
+++ b/themes/classic/communicator/win/menubutton.css
@ -22,6 +22,8 @@
    margin                : 0px;
    padding               : 2px 7px 2px 6px;
    -moz-user-focus       : ignore !important;
+    background-color      : -moz-Dialog;
+    color                 : -moz-DialogText;
  }  

 .menubutton-dual-ex-button.left
@ -34,6 +36,8 @@
    margin                : 0px;
    padding               : 2px 7px 2px 6px;
    -moz-user-focus       : none !important;
+    background-color      : -moz-Dialog;
+    color                 : -moz-DialogText;
  }  

 /* dropmarker */
--- a/themes/classic/editor/mac/EditorDialog.css
+++ b/themes/classic/editor/mac/EditorDialog.css
@ -28,7 +28,7 @@

 /* The defaults are WAY to big! */
 titledbox {
-  margin:         2px 5px; 4px; 5px;
+  margin:         2px 5px /* 4px 5px */;
  padding-top:    2px;
  padding-bottom: 4px;
 }
@ -90,7 +90,7 @@ titledbox {
  width: 20px;
  height: 12px; 
  border: 1px inset #CCCCCC;
-  margin: 4px; 10px 4px 10px;
+  margin: 4px /* 10px 4px 10px */;
 }

 .color-well[default="true"] {
@ -312,7 +312,7 @@ treeitem.ae-selection[selected="true"] > treerow {
  background-color: #FFFFFF;
  font-weight: normal;
  border: none;
-  outline: none;
+  -moz-outline: none;
  margin: 0px;
  width: 100%;
 }
--- a/themes/classic/editor/win/EditorDialog.css
+++ b/themes/classic/editor/win/EditorDialog.css
@ -28,7 +28,7 @@

 /* The defaults are WAY to big! */
 titledbox {
-  margin:         2px 5px; 4px; 5px;
+  margin:         2px 5px /* 4px 5px */;
  padding-top:    2px;
  padding-bottom: 4px;
 }
@ -50,7 +50,7 @@ titledbox {
 }

 .middle {
-  vertical-align: middle:
+  vertical-align: middle;
 }

 .bold {
@ -90,7 +90,7 @@ titledbox {
  width: 20px;
  height: 12px; 
  border: 1px inset #CCCCCC;
-  margin: 4px; 10px 4px 10px;
+  margin: 4px /* 10px 4px 10px */;
 }

 .color-well[default="true"] {
@ -312,7 +312,7 @@ treeitem.ae-selection[selected="true"] > treerow {
  background-color: #FFFFFF;
  font-weight: normal;
  border: none;
-  outline: none;
+  -moz-outline: none;
  margin: 0px;
  width: 100%;
 }
--- a/themes/classic/global/win/box.css
+++ b/themes/classic/global/win/box.css
@ -1,7 +1,7 @@

 titledbox
  {
-    border                : 2px groove ThreeDFace;
+    border                : 2px groove -moz-Dialog;
    padding               : 7px !important;
    margin                : 5px;
  }
@ -10,7 +10,7 @@ label
  {
    margin                : 0px 40px 2px 6px;
    padding               : 0px 3px 0px 3px;
-    background-color      : ThreeDFace;
+    background-color      : -moz-Dialog;
  }

 .titledbox-body
@ -49,4 +49,4 @@ label
  row[autostretch="never"]
    {
      vertical-align      : middle;
-    }
+    }
--- a/themes/classic/global/win/checkbox.css
+++ b/themes/classic/global/win/checkbox.css
@ -14,8 +14,8 @@
      border-left         : 1px solid ThreeDShadow;
      border-right        : 1px solid ThreeDHighlight;
      border-bottom       : 1px solid ThreeDHighlight;
-      color               : ThreeDFace;
-      background-color    : -moz-field;
+      color               : -moz-FieldText;
+      background-color    : -moz-Field;
      margin              : 2px 2px 0px 0px;
      width               : 13px;
      height              : 13px;
@ -24,7 +24,7 @@

  .checkbox-checkmark-box-1[disabled="true"]
    {
-      background-color    : ThreeDFace;
+      background-color    : -moz-Dialog;
    }

  .checkbox-checkmark-box-2
@ -56,7 +56,7 @@

  checkbox:hover:active > .checkbox-internal-box > .checkbox-checkmark-box-1
    {
-      background-color    : ThreeDFace;
+      background-color    : -moz-Dialog;
    }

 /* text/icon frames */
--- a/themes/classic/global/win/console.css
+++ b/themes/classic/global/win/console.css
@ -23,8 +23,8 @@

 .console-box 
  {
-    background-color    : -moz-field;
-    color               : WindowText;
+    background-color    : -moz-Field;
+    color               : -moz-FieldText;
  }
 
 /* :::::::::: console rows :::::::::: */
@ -39,7 +39,7 @@
  {
    border-right        : 1px outset ThreeDFace;
    padding             : 5px;
-    background-color    : ThreeDFace;
+    background-color    : -moz-Dialog;
    vertical-align      : top !important;
  }

--- a/themes/classic/global/win/formatting.css
+++ b/themes/classic/global/win/formatting.css
@ -2,14 +2,14 @@

 .color-dialog
  {
-    background-color      : ThreeDFace;
-    color                 : windowtext;
+    background-color      : -moz-Dialog;
+    color                 : -moz-DialogText;
  }
  
 .color-window
  {
-    background-color      : window;
-    color                 : windowtext;
+    background-color      : Window;
+    color                 : WindowText;
  }

 /* inset areas */
--- a/themes/classic/global/win/global.css
+++ b/themes/classic/global/win/global.css
@ -40,8 +40,8 @@
 **/
  window 
    { 
-      background-color    : ThreeDFace;
-      color               : WindowText;
+      background-color    : -moz-Dialog;
+      color               : -moz-DialogText;
      padding             : 0px;
      font                : message-box;
      -moz-user-focus     : ignore;
@ -54,7 +54,7 @@
  
  window.dialog 
    { 
-      background-color    : ThreeDFace;
+      background-color    : -moz-Dialog;
      padding             : 8px 10px 10px 8px;
    }

@ -107,7 +107,7 @@
 */
  statusbar
    {
-      background-color    : ThreeDFace;
+      background-color    : -moz-Dialog;
      overflow            : hidden;
      border-left         : 1px solid ThreeDShadow;
      border-right        : 1px solid ThreeDHighlight;
@ -171,7 +171,7 @@
      border-top          : 1px solid ThreeDShadow;
      border-right        : 1px solid ThreeDHighlight;
      border-bottom       : 1px solid ThreeDHighlight;
-      background-color    : ThreeDFace;
+      background-color    : -moz-Dialog;
    }

  .progressmeter-statusbar 
@ -189,7 +189,7 @@

  .progressmeter-internal-box
    {
-      border              : 1px solid ThreeDFace;
+      border              : 1px solid -moz-Dialog;
      padding             : 1px;
    }
  
--- a/themes/classic/global/win/linkTree.css
+++ b/themes/classic/global/win/linkTree.css
@ -9,7 +9,7 @@ treeitem[selected="true"] > treerow
  {
    background            : transparent !important;
    border                : none !important;
-    color                 : WindowText !important;
+    color                 : -moz-FieldText !important;
  }
  
 treecell:hover
@ -25,4 +25,4 @@ treecell:hover:active
    color                 : red !important;
  } 
  
-  
+  
--- a/themes/classic/global/win/menulist.css
+++ b/themes/classic/global/win/menulist.css
@ -6,14 +6,14 @@
      border-top          : 1px solid ThreeDShadow;
      border-right        : 1px solid ThreeDHighlight;
      border-bottom       : 1px solid ThreeDHighlight;
-      background-color    : -moz-field;
-      color               : WindowText;
+      background-color    : -moz-Field;
+      color               : -moz-FieldText;
      margin              : 1px 5px 2px 5px;
    }
    
  menulist[disabled="true"]
    {
-      background-color    : ThreeDFace;
+      background-color    : -moz-Dialog;
      color               : GrayText;
    }
    
@ -32,8 +32,8 @@
    {
      border              : 1px solid transparent;
      margin              : 1px;
-      background-color    : -moz-field;
-      color               : WindowText;
+      background-color    : -moz-Field;
+      color               : -moz-FieldText;
    }     
    
  menulist:focus > .menulist-internal-box > .menulist-display-box
@ -57,7 +57,7 @@
      border-right        : 1px solid ThreeDDarkShadow;
      border-bottom       : 1px solid ThreeDDarkShadow;
      border-left         : 1px solid ThreeDFace;
-      background-color    : ThreeDFace;
+      background-color    : -moz-Dialog;
    }
  
  .menulist-dropmarker-box-2
@ -96,9 +96,9 @@
  .menulist-menupopup
    {
      -moz-binding        : url("chrome://global/skin/menulistBindings.xml#menulistpopup");
-      border              : 1px solid WindowText;
+      border              : 1px solid -moz-FieldText;
      min-width           : 0px;
-      background-color    : -moz-field;
+      background-color    : -moz-Field;
    }

  menulist > menupopup > menuitem,
@ -109,7 +109,7 @@
      min-width           : 0px;  /* should be in content*/
      max-width           : none; /* should be in content*/
      font                : message-box;
-      color               : WindowText;
+      color               : -moz-FieldText;
    }

  menulist > menupopup > menuitem > .menu-iconic-accel,
@ -156,7 +156,7 @@
      border-right        : 1px solid ThreeDDarkShadow;
      border-bottom       : 1px solid ThreeDDarkShadow;
      border-left         : 1px solid ThreeDHighlight;
-      background-color    : ThreeDFace;
+      background-color    : -moz-Dialog;
      -moz-user-focus     : normal;  
    }    
    
@ -218,4 +218,4 @@ menulist[editable="true"]:focus > .menulist-internal-box > .menulist-display-box
    border                : none !important;
  }

-    
+    
--- a/themes/classic/global/win/outliner.css
+++ b/themes/classic/global/win/outliner.css
@ -7,8 +7,8 @@
 **/

 outliner {
-  background-color: -moz-field;
-  color: WindowText;
+  background-color: -moz-Field;
+  color: -moz-FieldText;
 }

 outliner.inset {
@ -28,7 +28,7 @@ outlinerbody:-moz-outliner-row {
 }

 outlinerbody:-moz-outliner-row(selected) {
-  background-color: ThreeDFace;
+  background-color: -moz-Dialog;
 }

 outliner:focus > outlinerbody:-moz-outliner-row(selected, focus) {
@ -50,7 +50,7 @@ outlinerbody:-moz-outliner-cell-text {
 }

 outlinerbody:-moz-outliner-cell-text(selected) {
-  color: ButtonText;
+  color: -moz-DialogText;
 }

 outlinerbody:-moz-outliner-cell-text(selected, focus) {
@ -70,8 +70,8 @@ outlinercol {
  border-top: 1px solid ThreeDHighlight;
  border-right: 1px solid ThreeDDarkShadow;
  border-bottom : 1px solid ThreeDDarkShadow;
-  background-color: ThreeDFace;
-  color: ButtonText;
+  background-color: -moz-Dialog;
+  color: -moz-DialogText;
 }

 .outlinercol-box,
--- a/themes/classic/global/win/radio.css
+++ b/themes/classic/global/win/radio.css
@ -14,7 +14,7 @@
      border-left         : 1px solid ThreeDShadow;
      border-right        : 1px solid ThreeDHighlight;
      border-bottom       : 1px solid ThreeDHighlight;
-      background-color    : -moz-field;
+      background-color    : -moz-Field;
      -moz-border-radius  : 50%;
      margin              : 2px 2px 0px 0px;
      width               : 12px;
@ -23,7 +23,7 @@

  .radio-checkmark-box-1[disabled="true"]
    {
-      background-color    : ThreeDFace;
+      background-color    : -moz-Dialog;
    }

  .radio-checkmark-box-2
@ -56,7 +56,7 @@

  radio:hover:active > .radio-internal-box > .radio-checkmark-box-1
    {
-      background-color    : ThreeDFace;
+      background-color    : -moz-Dialog;
    }

 /* text/icon frames */
--- a/themes/classic/global/win/scrollbars.css
+++ b/themes/classic/global/win/scrollbars.css
@ -16,7 +16,7 @@ thumb
    border-top            : 1px solid ThreeDLightShadow;
    border-right          : 1px solid ThreeDDarkShadow;
    border-bottom         : 1px solid ThreeDDarkShadow;
-    background-color      : ThreeDFace;
+    background-color      : -moz-Dialog;
  }

 .thumb-box
@ -44,7 +44,7 @@ scrollbarbutton
    border-top            : 1px solid ThreeDLightShadow;
    border-right          : 1px solid ThreeDDarkShadow;
    border-bottom         : 1px solid ThreeDDarkShadow;
-    background-color      : ThreeDFace;
+    background-color      : -moz-Dialog;
  }

 .scrollbarbutton-box
--- a/themes/classic/global/win/splitter.css
+++ b/themes/classic/global/win/splitter.css
@ -9,7 +9,7 @@
  splitter 
    {
      cursor                : e-resize;
-      background-color      : ThreeDFace;
+      background-color      : -moz-Dialog;
      vertical-align        : middle;
      text-align	    	: center;
    }
@ -49,7 +49,7 @@
  splitter[state="dragging"],
  splitter:hover:active
    {
-      background-color      : ThreeDFace;
+      background-color      : -moz-Dialog;
      background-image      : url("chrome://global/skin/splitter-drag-bg.gif");
    }
  
--- a/themes/classic/global/win/tabcontrol.css
+++ b/themes/classic/global/win/tabcontrol.css
@ -85,7 +85,7 @@ tabcontrol[orient="horizontal"] > tabpanel + tabbox > .tabbox-spring {
   
 tab {
  border: none;
-  color: ButtonText;
+  color: -moz-DialogText;
  -moz-user-focus: normal;
 }

@ -95,7 +95,7 @@ tab > .tab-box > .tab-text {
 }

 tab:focus > .tab-box > .tab-text {
-  border: 1px dotted ButtonText;
+  border: 1px dotted -moz-DialogText;
 }

 .tab-box {
--- a/themes/classic/global/win/textfield.css
+++ b/themes/classic/global/win/textfield.css
@ -13,14 +13,14 @@
      border-bottom       : 1px solid ThreeDHighlight;
      border-left         : 1px solid ThreeDShadow;
      padding             : 0px;
-      background-color    : -moz-field;
-      color               : WindowText;
+      background-color    : -moz-Field;
+      color               : -moz-FieldText;
      cursor              : text;
    }
    
  textbox[readonly="true"]
    {
-      background-color    : ThreeDFace;
+      background-color    : -moz-Dialog;
    }
  
 /* internal frame */
@ -48,7 +48,7 @@
  textbox[disabled="true"] 
    {
      cursor              : default !important;
-      background-color    : ThreeDFace;
+      background-color    : -moz-Dialog;
      color               : GrayText;
    } 
    
--- a/themes/classic/global/win/toolbar.css
+++ b/themes/classic/global/win/toolbar.css
@ -1,6 +1,6 @@
 toolbox
  {
-    background-color      : ThreeDFace;
+    background-color      : -moz-Dialog;
    border-left           : 1px solid ThreeDShadow;
    border-top            : 1px solid ThreeDShadow;
    border-right          : 1px solid ThreeDHighlight;
@ -8,7 +8,7 @@ toolbox

 toolbar
  {
-    background-color      : ThreeDFace;
+    background-color      : -moz-Dialog;
    /*
     * DON'T DELETE.  Removes disappearance of scrollbars in content
     * pane when window is made smaller.
--- a/themes/classic/global/win/tree.css
+++ b/themes/classic/global/win/tree.css
@ -12,8 +12,8 @@ tree
    border-right          : 1px solid ThreeDHighlight;                          
    border-bottom         : 1px solid ThreeDHighlight;                          
    border-left           : 1px solid ThreeDShadow; 
-    background-color      : -moz-field;
-    color                 : WindowText;    
+    background-color      : -moz-Field;
+    color                 : -moz-FieldText;    
  }

 .tree-container-treerows[dragover="true"][dragdroptree="true"]
@ -42,8 +42,8 @@ tree.inset

 treeitem[selected="true"] > treerow
  {
-    color                 : ButtonText;
-    background-color      : ThreeDFace;
+    color                 : -moz-DialogText;
+    background-color      : -moz-Dialog;
  }

 treeitem 
@ -97,8 +97,8 @@ tree:focus > treechildren treeitem[selected="true"][current="true"] > treerow
    border-right          : 1px solid ThreeDDarkShadow !important;
    border-bottom         : 1px solid ThreeDDarkShadow !important;
    padding               : 0px;
-    background-color      : ThreeDFace;
-    color                 : ButtonText;
+    background-color      : -moz-Dialog;
+    color                 : -moz-DialogText;
  }

 .treecell-header-box,
--- a/themes/classic/messenger/addressbook/mac/addressbook.css
+++ b/themes/classic/messenger/addressbook/mac/addressbook.css
@ -363,7 +363,7 @@ treeitem[empty="true"] > treerow > treecell > .tree-cell-twisty {
  padding-right  : 0px;
 }

-.3rd-column-spring {  /* Vertical Springs between 3rd column buttons */
+.third-column-spring {  /* Vertical Springs between 3rd column buttons */
  height      : 10px;
 }

--- a/themes/classic/messenger/addressbook/win/addressbook.css
+++ b/themes/classic/messenger/addressbook/win/addressbook.css
@ -323,7 +323,7 @@ tree > treehead > treerow {
 	padding-right	: 0px;
 }

-.3rd-column-spring {  /* Vertical Springs between 3rd column buttons */
+.third-column-spring {  /* Vertical Springs between 3rd column buttons */
 	height			: 10px;
 }

--- a/themes/classic/messenger/win/messenger.css
+++ b/themes/classic/messenger/win/messenger.css
@ -26,7 +26,7 @@

 [hide] 
  {
-    display               : none;
+      display               : none;
  } 

 /**
--- a/themes/classic/messenger/win/msgAccountCentral.css
+++ b/themes/classic/messenger/win/msgAccountCentral.css
@ -28,7 +28,7 @@
 #acctCentralHeaderRow
 {
  background-color:lightgrey;
-  font-weightt:bold;
+  font-weight:bold;
  font-size:20px;
  margin:5px 5px 5px 5px;
  margin-left: 5px;
--- a/themes/classic/navigator/win/navigator.css
+++ b/themes/classic/navigator/win/navigator.css
@ -22,7 +22,7 @@
 #ubhist 
  {
    margin                : 0px;
-    background-color      : ThreeDFace;
+    background-color      : -moz-Dialog;
    list-style-image      : url("chrome://global/skin/scroll-down.gif");
  }

--- a/themes/modern/editor/EditorDialog.css
+++ b/themes/modern/editor/EditorDialog.css
@ -50,7 +50,7 @@
 }

 .middle {
-  vertical-align: middle:
+  vertical-align: middle;
 }

 .bold {
--- a/themes/modern/messenger/addressbook/addressbook.css
+++ b/themes/modern/messenger/addressbook/addressbook.css
@ -334,7 +334,7 @@ tree {
  padding-right: 0px;
 }

-.3rd-column-spring {
+.third-column-spring {
  height: 10px;
 }

--- a/themes/modern/messenger/messenger.css
+++ b/themes/modern/messenger/messenger.css
@ -548,7 +548,7 @@ searchterm {
 /* ::::: miscellany :::::: */

 [hide] {
-   display: none;
+  display: none;
 }

 dummy.usesMailWidgets {