Bug 459457 - global.css cleanup: kill formatting.css, remove obsolete stuff, rtl fixes and more. r=neil
authorDão Gottwald <dao@mozilla.com>
Sun, 12 Oct 2008 15:25:51 +0200
changeset 20332 61021ed80a2e3475abc3aeea09e58e9de991dc7e
parent 20331 ee5135f3f7739eae82491aa3fa30e1d852fbc61b
child 20333 27efd8a373aaf5acf9991a156600004d3a951894
push id2812
push userdgottwald@mozilla.com
push dateSun, 12 Oct 2008 13:26:05 +0000
treeherdermozilla-central@61021ed80a2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersneil
bugs459457
milestone1.9.1b2pre
Bug 459457 - global.css cleanup: kill formatting.css, remove obsolete stuff, rtl fixes and more. r=neil
browser/themes/pinstripe/browser/places/places.css
toolkit/content/commonDialog.xul
toolkit/themes/gnomestripe/global/global.css
toolkit/themes/gnomestripe/global/groupbox.css
toolkit/themes/gnomestripe/global/notification.css
toolkit/themes/pinstripe/global/commonDialog.css
toolkit/themes/pinstripe/global/dialog.css
toolkit/themes/pinstripe/global/formatting.css
toolkit/themes/pinstripe/global/global.css
toolkit/themes/pinstripe/global/groupbox.css
toolkit/themes/pinstripe/global/jar.mn
toolkit/themes/pinstripe/global/notification.css
toolkit/themes/winstripe/global/commonDialog.css
toolkit/themes/winstripe/global/formatting.css
toolkit/themes/winstripe/global/global.css
toolkit/themes/winstripe/global/groupbox.css
toolkit/themes/winstripe/global/jar.mn
toolkit/themes/winstripe/global/notification.css
--- a/browser/themes/pinstripe/browser/places/places.css
+++ b/browser/themes/pinstripe/browser/places/places.css
@@ -39,16 +39,21 @@ tree.sidebar-placesTree treechildren::-m
   border-top: 1px solid #979797;
 }
 
 tree.sidebar-placesTree treechildren::-moz-tree-separator {
   border-top: 1px solid #505d6d;
   margin: 0 10px;
 }
 
+#historyTree,
+#bookmarks-view {
+  border-top: 1px solid #bebebe;
+}
+
 #bookmarks-view 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: #8a8a8a !important;
   border-top: 1px solid #91a0c0;
 }
 
 tree.sidebar-placesTree treechildren::-moz-tree-cell-text(selected) {  
--- a/toolkit/content/commonDialog.xul
+++ b/toolkit/content/commonDialog.xul
@@ -1,12 +1,13 @@
 <?xml version="1.0"?> 
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://global/content/commonDialog.css" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/commonDialog.css" type="text/css"?>
 
 <!DOCTYPE dialog SYSTEM "chrome://global/locale/commonDialog.dtd">
 
 <dialog id="commonDialog"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
         role="alert"
         onload="commonDialogOnLoad();"
         ondialogaccept="return commonDialogOnAccept();"
--- a/toolkit/themes/gnomestripe/global/global.css
+++ b/toolkit/themes/gnomestripe/global/global.css
@@ -37,18 +37,16 @@
 
 /* ===== global.css =====================================================
   == Styles that apply everywhere.
   ======================================================================= */
 
 /* all localizable skin settings shall live here */
 @import url("chrome://global/locale/intl.css");
 
-@import url("chrome://global/skin/formatting.css");
-
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: XBL bindings ::::: */
 
 checkbox {
   -moz-binding: url("chrome://global/content/bindings/checkbox.xml#checkbox-with-spacing");
 }
 
@@ -77,22 +75,22 @@ dialog,
 wizard,
 prefwindow {
   -moz-appearance: window;
   background-color: -moz-Dialog;
   color: -moz-DialogText;
   font: message-box;
 }
 
+/* deprecated */
 window.dialog {
-  padding: 8px 10px 10px 8px;
-}
-
-[wait-cursor] {
-  cursor: wait !important;
+  padding-top: 8px;
+  padding-bottom: 10px;
+  -moz-padding-start: 8px;
+  -moz-padding-end: 10px;
 }
 
 /* ::::: alert icons :::::*/
 
 .message-icon,
 .alert-icon,
 .error-icon,
 .question-icon,
@@ -153,22 +151,24 @@ statusbarpanel {
   border-bottom: 1px solid ThreeDShadow;
   padding: 0 4px;
 }
 
 .statusbar-resizerpanel {
   -moz-box-align: end;
   -moz-box-pack: end;
   -moz-appearance: resizerpanel;
-  padding: 0px;
+  padding: 0;
   border: none;
 }
 
-.statusbarpanel-iconic,  .statusbarpanel-iconic-text, .statusbarpanel-menu-iconic {
-  padding: 0px 1px 0px 1px;
+.statusbarpanel-iconic,
+.statusbarpanel-iconic-text,
+.statusbarpanel-menu-iconic {
+  padding: 0 1px;
 }
 
 resizer[dir="bottomright"] {
   -moz-appearance: resizer;
   cursor: se-resize;
 }
 
 /* XXXBlake yeah, shoot me -- these don't belong here.  I'll move them later. */
@@ -177,22 +177,135 @@ sidebarheader {
   height: 25px;
   background-color: -moz-Dialog;
 }
 
 sidebarheader > label {
   -moz-padding-start: 4px;
 }
 
-/* ::::: miscellaneous ::::: */
-
 .toolbar-focustarget {
   -moz-user-focus: ignore !important;
 }
 
+/* ::::: miscellaneous formatting ::::: */
+
+.inset {
+  border: 1px solid ThreeDShadow;
+  border-right-color: ThreeDHighlight;
+  border-bottom-color: ThreeDHighlight;
+  margin: 0 5px 5px;
+}
+  
+.outset {
+  border: 1px solid ThreeDShadow;
+  border-left-color: ThreeDHighlight;
+  border-top-color: ThreeDHighlight;
+}
+
+separator:not([orient="vertical"]) {
+  height: 1.5em;
+}
+separator[orient="vertical"] {
+  width: 1.5em;
+}
+
+separator.thin:not([orient="vertical"]) {
+  height: 0.5em;
+}  
+separator.thin[orient="vertical"] {
+  width: 0.5em;
+}
+
+separator.groove:not([orient="vertical"]) {
+  border-top: 1px solid ThreeDShadow;
+  border-bottom: 1px solid ThreeDHighlight;
+  height: 0;
+  margin-top: 0.4em;
+  margin-bottom: 0.4em;
+}
+separator.groove[orient="vertical"] {
+  border-left: 1px solid ThreeDShadow;
+  border-right: 1px solid ThreeDHighlight;
+  width: 0;
+  margin-left: 0.4em;
+  margin-right: 0.4em;
+}
+
+.small-margin {
+  margin: 1px 2px;
+}
+    
+.plain {
+  margin: 0 !important;
+  border: none;
+  padding: 0;
+}
+
+description,
+label {
+  cursor: default;
+  margin-top: 1px;
+  margin-bottom: 2px;
+  -moz-margin-start: 6px;
+  -moz-margin-end: 5px;
+}
+
+description {
+  margin-bottom: 4px;
+}
+
+label[disabled="true"] {
+  color: GrayText;
+}
+
+.header {
+  font-weight: bold;
+}
+
+.monospace {
+  font-family: monospace;
+}
+
+.indent {
+  -moz-margin-start: 23px;
+}
+
+.box-padded {
+  padding: 5px;
+}
+
+.spaced {
+  margin: 3px 5px 4px;
+}
+
+.wizard-box {
+  padding: 20px 44px 10px;
+}
+
+.text-link {
+  color: -moz-nativehyperlinktext;
+  text-decoration: underline;
+  border: 1px solid transparent;
+  cursor: pointer;
+}
+  
+.text-link:focus {
+  color: red;
+  border: 1px dotted -moz-DialogText;
+}
+  
+.text-link:hover:active {
+  color: red;
+}
+
+.text-link[visited="true"] {
+  color: purple;
+}
+
 /* :::::: autoscroll popup ::::: */
 
 #autoscroller {
   height: 28px;
   width: 28px;
   border: none;
   margin: -14px;
   padding: 0;
--- a/toolkit/themes/gnomestripe/global/groupbox.css
+++ b/toolkit/themes/gnomestripe/global/groupbox.css
@@ -51,8 +51,15 @@ groupbox {
 .groupbox-body {
   -moz-padding-start: 10px;
 }
 
 caption {
   margin-bottom: 2px;
   font-weight: bold;
 }
+
+.caption-text {
+  margin-top: 0;
+  margin-bottom: 0;
+  -moz-margin-start: 1px;
+  -moz-margin-end: 2px;
+}
--- a/toolkit/themes/gnomestripe/global/notification.css
+++ b/toolkit/themes/gnomestripe/global/notification.css
@@ -34,19 +34,15 @@ notification[type="warning"] .messageIma
 notification[type="critical"] .messageImage {
   list-style-image: url("chrome://global/skin/icons/error-16.png");
 }
 
 .messageText {
   -moz-margin-start: 5px;
 }
 
-.messageButton {
-  margin: 0px 5px 0px 5px;
-}
-
 .messageCloseButton {
   list-style-image: url("moz-icon://stock/gtk-close?size=menu");
 }
 
 .messageCloseButton > .toolbarbutton-icon {
   margin: 0px !important;
 }
new file mode 100644
--- /dev/null
+++ b/toolkit/themes/pinstripe/global/commonDialog.css
@@ -0,0 +1,27 @@
+#commonDialog {
+  line-height: 13px;
+}
+
+#infoContainer {
+  max-width: 33em;
+}
+
+#loginContainer {
+  padding-top: 10px;
+}
+
+#info\.icon {
+  -moz-margin-end: 14px;
+}
+
+#info\.title,
+#info\.header,
+#info\.body {
+  font: menu;
+  line-height: 16px;
+  margin-bottom: 6px;
+}
+
+.dialogTitle {
+  font-weight: bold;
+}
--- a/toolkit/themes/pinstripe/global/dialog.css
+++ b/toolkit/themes/pinstripe/global/dialog.css
@@ -58,16 +58,51 @@ dialog {
 }
 
 /* ::::: dialog buttons ::::: */
 
 .dialog-button {
   font: menu;
 }
 
+.dialog-button[dlgtype="help"] {
+  min-width: 1px;
+  padding: 0;
+  -moz-appearance: none;
+  -moz-box-align: start;
+  height: 24px;
+  width: 24px;
+  margin: 4px;
+}
+
+.dialog-button[dlgtype="help"][disabled] {
+  opacity: 0.5;
+}
+
+.dialog-button[dlgtype="help"]:focus {
+  outline: 2px solid -moz-mac-focusring;
+  outline-offset: -2px;
+  -moz-outline-radius: 100%;
+}
+
+.dialog-button[dlgtype="help"] > .button-box > .button-icon {
+  list-style-image: url("chrome://global/skin/icons/question-mark.png");
+  -moz-image-region: rect(0 24px 24px 0); 
+  padding: 0;
+  margin: 0;
+}
+
+.dialog-button[dlgtype="help"]:active > .button-box > .button-icon {
+  -moz-image-region: rect(0 48px 24px 24px); 
+}
+
+.dialog-button[dlgtype="help"] > .button-box > .button-text {
+  display: none;
+}
+
 /* ::::: dialog header ::::: */
 
 dialogheader {
   margin: 0px 5px 5px 5px;
   padding: 5px 8px;
 }
 
 .dialogheader-title {
@@ -97,19 +132,17 @@ dialogheader {
 .dialogheader-description {
 	font-weight: bold !important;
 }
 
 .dialogheader-title {
 	font-weight: bold !important;
 }
 
-#loginContainer {
-	padding-top: 10px;
-}
+/*XXX - belongs to toolkit/content/finddialog.xul: */
 
 #findDialog, #findDialog > menu, #findDialog > groupbox {
 	font: menu !important;
 }
 
-#dialog.caseSensitive {
+#dialog\.caseSensitive {
 	margin-top: 8px;
 }
deleted file mode 100644
--- a/toolkit/themes/pinstripe/global/formatting.css
+++ /dev/null
@@ -1,227 +0,0 @@
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/* inset areas */
-
-.inset
-  {
-    border-left           : 1px solid ThreeDShadow;
-    border-top            : 1px solid ThreeDShadow;
-    border-right          : 1px solid ThreeDHighlight;
-    border-bottom         : 1px solid ThreeDHighlight;
-    margin                : 0px 5px 5px 5px;
-  }
-  
-.box-inset {
-  margin: 2px 4px;
-  border: 2px solid;
-  -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
-  -moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
-  -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
-  -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
-  background-color: #EEEEEE;
-  color: -moz-DialogText;
-}  
-  
-/* formatting */
-.groove-top
-  {
-    border-top            : 2px groove ThreeDFace;  
-  }
-  
-.groove-right
-  {
-    border-right          : 2px groove ThreeDFace;
-  }
-  
-.groove-left
-  {
-    border-left           : 2px groove ThreeDFace;
-  }
-  
-.groove-bottom
-  {
-    border-bottom         : 2px groove ThreeDFace;
-  }
-  
-.outset
-  {
-    border-left           : 1px solid ThreeDHighlight;
-    border-top            : 1px solid ThreeDHighlight;
-    border-right          : 1px solid ThreeDShadow;
-    border-bottom         : 1px solid ThreeDShadow;
-  }
-  
-.outset-top-bottom
-  {
-    border-top            : 1px solid ThreeDHighlight;
-    border-bottom         : 1px solid ThreeDShadow;
-  }   
-
-
-  
-/** separator rules **/
-/* standard separators */
-  separator, separator[orient="horizontal"] 
-    {
-      height: 1.5em;
-    }
-  
-  separator[orient="vertical"] 
-    {
-      width: 1.5em;
-    }
-
-/* thinner separators (50% size) */
-  separator.thin, separator.thin[orient="horizontal"] 
-    {
-      height: 0.5em;
-    }
-  
-  separator.thin[orient="vertical"] 
-    {
-      width: 0.5em;
-    }
-
-/* groove separators (50% size) */
-  separator.groove,
-  separator.groove[orient="horizontal"] 
-    {
-      border-top: 1px solid #A3A3A3;
-      height: 0px;
-      margin-top: 0.4em;
-      margin-bottom: 0.4em;
-    }
-  
-  separator.groove[orient="vertical"] 
-    {
-      border-left: 1px solid #A3A3A3;
-      margin-left: 0.4em;
-      margin-right: 0.4em;
-    }
-  
-/* groove separators (0 padding, for dividing effects) */  
-  separator.groove-thin 
-    {
-      border-top: 1px solid #A3A3A3;
-      height: 0px;
-    }
-  
-  separator[orient="vertical"].groove-thin 
-    {
-      border-left: 1px solid #A3A3A3;
-    }
-
-/** text formatting rules **/
-/* label (with margins) */
-
-/** Reduced Margin for some UI **/
-  .small-margin
-    {
-      margin              : 1px 2px 1px 2px;
-    }
-    
-  .plain 
-    {
-      margin: 0px !important;
-      border: none;
-      padding: 0px;
-    }
-
-  label[disabled="true"] 
-    {
-      color                 : GrayText;
-    }    
-
-  description, label
-    {
-      cursor              : default;
-    }
-
-  label
-    {
-      margin              : 1px 5px 2px 6px;
-    }
-
-  .header 
-    {
-
-	margin-bottom: 6px;
-	font-weight: bold;
-    }
-
-  .larger-text 
-    {
-      font-size           : larger;
-    }
-
-  .smaller-text 
-    {
-      font-size           : smaller;
-    }
-   
-  .monospace
-    {
-      font-family         : monospace;
-    }
-    
-  .indent
-    {
-      margin-left         : 23px;
-    }
-
-  .box-padded
-    {
-      padding             : 5px;
-    }    
-
-  .spaced
-    {
-      margin              : 3px 5px 4px 5px;
-    }    
-
-  .wizard-box
-    {
-      padding             : 20px 44px 10px 44px;
-    }    
-
-  .caption-text
-    {
-      margin: 0px 2px 0px 1px !important;
-    }
-
-#commonDialog #info\.title,
-#commonDialog #info\.header,
-#commonDialog #info\.body {
-  font: menu;
-  line-height: 16px;
-  margin-bottom: 6px;
-}
-
-#commonDialog .dialogTitle {
-  font-weight: bold !important;
-}
-
-/* class for text with a 'link' appearance */
-  .text-link
-    {
-      color                 : -moz-nativehyperlinktext;
-      text-decoration       : underline;
-      border                : 1px solid transparent;
-      cursor                : pointer;
-    }
-  
-  .text-link:focus
-    {
-      color                 : red;
-      border                : 1px dotted -moz-DialogText;
-    }
-  
-  .text-link:hover:active
-    {
-      color                 : red;
-    } 
-
-  .text-link[visited="true"]
-    {
-      color                 : purple;
-    }
--- a/toolkit/themes/pinstripe/global/global.css
+++ b/toolkit/themes/pinstripe/global/global.css
@@ -38,54 +38,18 @@
 
 /* ===== global.css =====================================================
   == Styles that apply everywhere.
   ======================================================================= */
 
 /* all localizable skin settings shall live here */
 @import url("chrome://global/locale/intl.css");
 
-@import url("chrome://global/skin/formatting.css");
-
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-button[dlgtype="help"] {
-	min-width: 1px !important;
-	padding: 0px 0px 0px 0px !important;
-	-moz-appearance: none;
-	-moz-box-align: start !important;
-	height: 24px;
-	width: 24px;
-	margin: 4px;
-}
-
-button[dlgtype="help"][disabled] {
-  opacity: 0.5;
-}
-
-button[dlgtype="help"]:focus {
-  outline: 2px solid -moz-mac-focusring;
-  outline-offset: -2px;
-  -moz-outline-radius: 100%;
-}
-
-button[dlgtype="help"] > .button-box > .button-icon {
-  list-style-image: url("chrome://global/skin/icons/question-mark.png");
-  -moz-image-region: rect(0 24px 24px 0); 
-  padding: 0 !important;
-  margin: 0 !important;
-}
-
-button[dlgtype="help"]:active > .button-box > .button-icon {
-  -moz-image-region: rect(0 48px 24px 24px); 
-}
-
-button[dlgtype="help"] > .button-box > .button-text {
-  display: none !important;
-}
 /* ::::: XBL bindings ::::: */
 
 menulist > menupopup,
 .menulist-menupopup {
   -moz-binding: url("chrome://global/content/bindings/popup.xml#popup-scrollbars");
 }
 
 .menulist-compact {
@@ -111,40 +75,45 @@ prefwindow {
 
 prefwindow {
   font: -moz-dialog;
 }
 
 prefwindow .paneSelector {
   font: message-box;
 }
+
 prefwindow[type="child"] {
-  padding: 18px 20px 15px 18px !important;
+  padding-top: 18px;
+  padding-bottom: 15px;
+  -moz-padding-start: 18px;
+  -moz-padding-end: 20px;
 }
 
-
 /* deprecated */
-window.dialog { 
-  padding: 8px 10px 10px 8px;
-}
-
-[wait-cursor] { 
-  cursor: wait !important; 
+window.dialog {
+  padding-top: 8px;
+  padding-bottom: 10px;
+  -moz-padding-start: 8px;
+  -moz-padding-end: 10px;
 }
 
 /* ::::: alert icons :::::*/
 
-.message-icon,
+.message-icon {
+  display: none;
+}
+
 .alert-icon,
 .error-icon,
 .question-icon {
   width: 64px;
   height: 64px;
-  list-style-image: url("chrome://global/skin/icons/information-64.png");
-  margin: 6px 20px 6px 6px !important;
+  margin: 6px;
+  -moz-margin-end: 20px;
 }
 
 .alert-icon {
   list-style-image: url("chrome://global/skin/icons/warning-64.png");
 }
 
 .error-icon {
   list-style-image: url("chrome://global/skin/icons/error-64.png");
@@ -183,98 +152,153 @@ statusbarpanel {
   -moz-box-pack: center;
   padding: 0 4px;
 }
 
 .statusbarpanel-iconic {
   padding: 0px;
 }    
 
-/* ::::: miscellaneous ::::: */
+/* ::::: miscellaneous formatting ::::: */
+
+.inset {
+  border: 1px solid ThreeDShadow;
+  border-right-color: ThreeDHighlight;
+  border-bottom-color: ThreeDHighlight;
+  margin: 0 5px 5px;
+}
+  
+.outset {
+  border: 1px solid ThreeDShadow;
+  border-left-color: ThreeDHighlight;
+  border-top-color: ThreeDHighlight;
+}
+
+separator:not([orient="vertical"]) {
+  height: 1.5em;
+}
+separator[orient="vertical"] {
+  width: 1.5em;
+}
+
+separator.thin:not([orient="vertical"]) {
+  height: 0.5em;
+}  
+separator.thin[orient="vertical"] {
+  width: 0.5em;
+}
+
+separator.groove:not([orient="vertical"]) {
+  border-top: 1px solid #A3A3A3;
+  height: 0;
+  margin-top: 0.4em;
+  margin-bottom: 0.4em;
+}
+separator.groove[orient="vertical"] {
+  border-left: 1px solid #A3A3A3;
+  width: 0;
+  margin-left: 0.4em;
+  margin-right: 0.4em;
+}
+
+.small-margin {
+  margin: 1px 2px;
+}
+    
+.plain {
+  margin: 0 !important;
+  border: none;
+  padding: 0;
+}
+
+description,
+label {
+  cursor: default;
+}
+
+label {
+  margin-top: 1px;
+  margin-bottom: 2px;
+  -moz-margin-start: 6px;
+  -moz-margin-end: 5px;
+}
+
+label[disabled="true"] {
+  color: GrayText;
+}
+
+description {
+  margin-bottom: 4px;
+}
+
+.header {
+  margin-bottom: 6px;
+  font-weight: bold;
+}
+
+.monospace {
+  font-family: monospace;
+}
+
+.indent {
+  -moz-margin-start: 23px;
+}
+
+.box-padded {
+  padding: 5px;
+}
+
+.spaced {
+  margin: 3px 5px 4px;
+}
+
+.wizard-box {
+  padding: 20px 44px 10px;
+}
+
+.text-link {
+  color: -moz-nativehyperlinktext;
+  text-decoration: underline;
+  border: 1px solid transparent;
+  cursor: pointer;
+}
+  
+.text-link:focus {
+  color: red;
+  border: 1px dotted -moz-DialogText;
+}
+  
+.text-link:hover:active {
+  color: red;
+}
+
+.text-link[visited="true"] {
+  color: purple;
+}
 
 .toolbar-focustarget {
   -moz-user-focus: ignore !important;
 }
 
-#info.icon {
-	margin-right: 14px;
-}
-
-#commonDialog {
-	line-height: 13px;
-}
-
-#commonDialog #infoContainer {
-	max-width: 33em !important;
-}
+/* ::::: XXX - stuff that should live elsewhere ::::: */
 
-#header {
-	display: none !important;
-}
-
-#warn1 {
-	font: menu;
-	font-weight: bold;
-	line-height: 16pt;
-	padding-bottom: 10px;
-}
-
+/* embedding/components/ui/progressDlg/nsProgressDialog.xul */
 #ok, #cancel, #launch, #reveal, #pauseResume {
 	font: menu !important;
 }
 
-.message-icon {
-	display: none !important;
-}
-
+/* toolkit/content/widgets/optionsDialog.xml */
 #panelFrame {
-	margin-top: 2px;
-	padding-left: 10px;
-}
-
-description {
-	margin-bottom: 4px;
-}
-
-browser {
-    margin: 0px;
-    padding: 0px;
-    background-color: #FFFFFF;
-}
-
-/* miscellaneous stuff */
-
-#OCSPDialog {
-  font: message-box;
+  margin-top: 2px;
+  -moz-padding-start: 10px;
 }
 
-#historyTree, #bookmarks-view {
-	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");
+/* toolkit/mozapps/preferences/ocsp.xul */
+#OCSPDialog {
+  font: message-box;
 }
 
 /* :::::: autoscroll popup ::::: */
 
 #autoscroller {
   height: 28px;
   width: 28px;
   border: none;
--- a/toolkit/themes/pinstripe/global/groupbox.css
+++ b/toolkit/themes/pinstripe/global/groupbox.css
@@ -55,8 +55,15 @@ groupbox {
   margin: 0px;
 
 }
 
 caption {
   padding: 0px 2px 1px 4px !important;
   font: caption;
 }
+
+.caption-text {
+  margin-top: 0;
+  margin-bottom: 0;
+  -moz-margin-start: 1px;
+  -moz-margin-end: 2px;
+}
--- a/toolkit/themes/pinstripe/global/jar.mn
+++ b/toolkit/themes/pinstripe/global/jar.mn
@@ -8,22 +8,22 @@ classic.jar:
 +  skin/classic/global/about.css                                      (../../winstripe/global/about.css)
 +  skin/classic/global/appPicker.css                                  (../../winstripe/global/appPicker.css)
 +  skin/classic/global/arrow.css
 +  skin/classic/global/autocomplete.css
 +  skin/classic/global/button.css
 +  skin/classic/global/checkbox.css
 +  skin/classic/global/closetab.png
 +  skin/classic/global/colorpicker.css
++  skin/classic/global/commonDialog.css
 +  skin/classic/global/config.css
 +  skin/classic/global/customizeToolbar.css
 +  skin/classic/global/dialog.css
 +  skin/classic/global/dropmarker.css
 +  skin/classic/global/filepicker.css
-+  skin/classic/global/formatting.css
 +  skin/classic/global/findBar.css
 +  skin/classic/global/global.css
 +  skin/classic/global/groupbox.css
 +  skin/classic/global/linkTree.css
 +  skin/classic/global/listbox_highlight.png
 +  skin/classic/global/listbox.css
 +  skin/classic/global/menu.css
 +  skin/classic/global/menulist.css
--- a/toolkit/themes/pinstripe/global/notification.css
+++ b/toolkit/themes/pinstripe/global/notification.css
@@ -46,22 +46,34 @@ notification[type="critical"] .messageIm
 }
 
 .messageText {
   margin-top: 2px;
   font-weight: bold;
   -moz-margin-start: 5px;
 }
 
-.notification-inner > button {
-  -moz-appearance: none !important;
+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;
 }
 
-.messageButton {
-  margin: 0px 5px 0px 5px;
+button:hover:active {
+  background-image: url("chrome://global/skin/icons/white-gray-gradient-active.gif");
 }
 
 .notification-inner {
   border: 0 !important;
 }
 
 .messageCloseButton {
   -moz-appearance: none;
new file mode 100644
deleted file mode 100644
--- a/toolkit/themes/winstripe/global/formatting.css
+++ /dev/null
@@ -1,235 +0,0 @@
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/* inset areas */
-
-.inset
-  {
-    border-left           : 1px solid ThreeDShadow;
-    border-top            : 1px solid ThreeDShadow;
-    border-right          : 1px solid ThreeDHighlight;
-    border-bottom         : 1px solid ThreeDHighlight;
-    margin                : 0px 5px 5px 5px;
-  }
-  
-.box-inset {
-  margin: 2px 4px;
-  border: 2px solid;
-  -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
-  -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;
-}  
-  
-/* formatting */
-.groove-top
-  {
-    border-top            : 2px groove ThreeDFace;  
-  }
-  
-.groove-right
-  {
-    border-right          : 2px groove ThreeDFace;
-  }
-  
-.groove-left
-  {
-    border-left           : 2px groove ThreeDFace;
-  }
-  
-.groove-bottom
-  {
-    border-bottom         : 2px groove ThreeDFace;
-  }
-  
-.outset
-  {
-    border-left           : 1px solid ThreeDHighlight;
-    border-top            : 1px solid ThreeDHighlight;
-    border-right          : 1px solid ThreeDShadow;
-    border-bottom         : 1px solid ThreeDShadow;
-  }
-  
-.outset-top-bottom
-  {
-    border-top            : 1px solid ThreeDHighlight;
-    border-bottom         : 1px solid ThreeDShadow;
-  }   
-
-
-  
-/** separator rules **/
-/* standard separators */
-  separator, separator[orient="horizontal"] 
-    {
-      height: 1.5em;
-    }
-  
-  separator[orient="vertical"] 
-    {
-      width: 1.5em;
-    }
-
-/* thinner separators (50% size) */
-  separator.thin, separator.thin[orient="horizontal"] 
-    {
-      height: 0.5em;
-    }
-  
-  separator.thin[orient="vertical"] 
-    {
-      width: 0.5em;
-    }
-
-/* groove separators (50% size) */
-  separator.groove,
-  separator.groove[orient="horizontal"] 
-    {
-      border-top: 1px solid ThreeDShadow;
-      border-bottom: 1px solid ThreeDHighlight;
-      height: 0px;
-      margin-top: 0.4em;
-      margin-bottom: 0.4em;
-    }
-  
-  separator.groove[orient="vertical"] 
-    {
-      border-left: 1px solid ThreeDShadow;
-      border-right: 1px solid ThreeDHighlight;
-      -moz-margin-start: 0.4em;
-      -moz-margin-end: 0.4em;
-    }
-  
-/* groove separators (0 padding, for dividing effects) */  
-  separator.groove-thin 
-    {
-      border-top: 1px solid ThreeDShadow;
-      border-bottom: 1px solid ThreeDHighlight;
-      height: 0px;
-    }
-  
-  separator[orient="vertical"].groove-thin 
-    {
-      border-left: 1px solid ThreeDShadow;
-      border-right: 1px solid ThreeDHighlight;
-    }
-
-/** text formatting rules **/
-/* label (with margins) */
-
-/** Reduced Margin for some UI **/
-  .small-margin
-    {
-      margin              : 1px 2px 1px 2px;
-    }
-    
-  .plain 
-    {
-      margin: 0px !important;
-      border: none;
-      padding: 0px;
-    }
-
-  label[disabled="true"] 
-    {
-      color                 : GrayText;
-    }    
-
-  label[disabled="true"]:-moz-system-metric(windows-classic)
-    {
-      color                 : ThreeDShadow;
-      text-shadow           : 1px 1px ThreeDHighlight;
-    }
-
-  description, label
-    {
-      cursor              : default;
-    }
-    
-  description
-    {
-      margin              : 1px 5px 4px 5px;
-    }
-
-  label
-    {
-      margin-top: 1px;
-      margin-bottom: 2px;
-      -moz-margin-start: 6px;
-      -moz-margin-end: 5px;
-    }
-
-  .header 
-    {
-      font-weight         : bold;
-    }
-
-  .larger-text 
-    {
-      font-size           : larger;
-    }
-
-  .smaller-text 
-    {
-      font-size           : smaller;
-    }
-   
-  .monospace
-    {
-      font-family         : monospace;
-    }
-    
-  .indent
-    {
-      -moz-margin-start         : 23px;
-    }
-
-  .box-padded
-    {
-      padding             : 5px;
-    }    
-
-  .spaced
-    {
-      margin              : 3px 5px 4px 5px;
-    }    
-
-  .wizard-box
-    {
-      padding             : 20px 44px 10px 44px;
-    }    
-
-  .caption-text
-    {
-      margin-top: 0px !important;
-      margin-bottom: 0px !important;
-      -moz-margin-start: 1px !important;
-      -moz-margin-end: 2px !important;
-    }
-
-
-/* class for text with a 'link' appearance */
-  .text-link
-    {
-      color                 : -moz-nativehyperlinktext;
-      text-decoration       : underline;
-      border                : 1px solid transparent;
-      cursor                : pointer;
-    }
-  
-  .text-link:focus
-    {
-      color                 : red;
-      border                : 1px dotted -moz-DialogText;
-    }
-  
-  .text-link:hover:active
-    {
-      color                 : red;
-    } 
-
-  .text-link[visited="true"] 
-    {
-      color                 : purple;
-    }
--- a/toolkit/themes/winstripe/global/global.css
+++ b/toolkit/themes/winstripe/global/global.css
@@ -37,18 +37,16 @@
 
 /* ===== global.css =====================================================
   == Styles that apply everywhere.
   ======================================================================= */
 
 /* all localizable skin settings shall live here */
 @import url("chrome://global/locale/intl.css");
 
-@import url("chrome://global/skin/formatting.css");
-
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: XBL bindings ::::: */
 
 radio {
   -moz-binding: url("chrome://global/skin/globalBindings.xml#radio");
 }
 
@@ -73,27 +71,24 @@ dialog,
 wizard,
 prefwindow {
   -moz-appearance: window;
   background-color: -moz-Dialog;
   color: -moz-DialogText;
   font: message-box;
 }
 
+/* deprecated */
 window.dialog {
   padding-top: 8px;
   padding-bottom: 10px;
   -moz-padding-start: 8px;
   -moz-padding-end: 10px;
 }
 
-[wait-cursor] {
-  cursor: wait !important;
-}
-
 /* ::::: alert icons :::::*/
 
 .message-icon,
 .alert-icon,
 .error-icon,
 .question-icon {
   width: 32px;
   height: 32px;
@@ -147,22 +142,24 @@ statusbarpanel {
   border-bottom: 1px solid ThreeDShadow;
   padding: 0 4px;
 }
 
 .statusbar-resizerpanel {
   -moz-box-align: end;
   -moz-box-pack: end;
   -moz-appearance: resizerpanel;
-  padding: 0px;
+  padding: 0;
   border: none;
 }
 
-.statusbarpanel-iconic,  .statusbarpanel-iconic-text, .statusbarpanel-menu-iconic {
-  padding: 0px 1px 0px 1px;
+.statusbarpanel-iconic,
+.statusbarpanel-iconic-text,
+.statusbarpanel-menu-iconic {
+  padding: 0 1px;
 }
 
 resizer[dir="bottomright"] {
   -moz-appearance: resizer;
   cursor: se-resize;
 }
 
 window:not([active="true"]) menubar > menu {
@@ -178,22 +175,141 @@ sidebarheader {
   border-bottom: 1px solid ThreeDShadow;
   border-top: 1px solid ThreeDHighlight;
 }
 
 sidebarheader > label {
   -moz-padding-start: 4px;
 }
 
-/* ::::: miscellaneous ::::: */
-
 .toolbar-focustarget {
   -moz-user-focus: ignore !important;
 }
 
+/* ::::: miscellaneous formatting ::::: */
+
+.inset {
+  border: 1px solid ThreeDShadow;
+  border-right-color: ThreeDHighlight;
+  border-bottom-color: ThreeDHighlight;
+  margin: 0 5px 5px;
+}
+  
+.outset {
+  border: 1px solid ThreeDShadow;
+  border-left-color: ThreeDHighlight;
+  border-top-color: ThreeDHighlight;
+}
+
+/* separators */
+separator:not([orient="vertical"]) {
+  height: 1.5em;
+}
+separator[orient="vertical"] {
+  width: 1.5em;
+}
+
+separator.thin:not([orient="vertical"]) {
+  height: 0.5em;
+}  
+separator.thin[orient="vertical"] {
+  width: 0.5em;
+}
+
+separator.groove:not([orient="vertical"]) {
+  border-top: 1px solid ThreeDShadow;
+  border-bottom: 1px solid ThreeDHighlight;
+  height: 0;
+  margin-top: 0.4em;
+  margin-bottom: 0.4em;
+}
+separator.groove[orient="vertical"] {
+  border-left: 1px solid ThreeDShadow;
+  border-right: 1px solid ThreeDHighlight;
+  width: 0;
+  margin-left: 0.4em;
+  margin-right: 0.4em;
+}
+
+.small-margin {
+  margin: 1px 2px;
+}
+    
+.plain {
+  margin: 0 !important;
+  border: none;
+  padding: 0;
+}
+
+description,
+label {
+  cursor: default;
+  margin-top: 1px;
+  margin-bottom: 2px;
+  -moz-margin-start: 6px;
+  -moz-margin-end: 5px;
+}
+
+description {
+  margin-bottom: 4px;
+}
+
+label[disabled="true"] {
+  color: GrayText;
+}
+
+label[disabled="true"]:-moz-system-metric(windows-classic) {
+  color: ThreeDShadow;
+  text-shadow: 1px 1px ThreeDHighlight;
+}
+
+.header {
+  font-weight: bold;
+}
+
+.monospace {
+  font-family: monospace;
+}
+
+.indent {
+  -moz-margin-start: 23px;
+}
+
+.box-padded {
+  padding: 5px;
+}
+
+.spaced {
+  margin: 3px 5px 4px;
+}
+
+.wizard-box {
+  padding: 20px 44px 10px;
+}
+
+.text-link {
+  color: -moz-nativehyperlinktext;
+  text-decoration: underline;
+  border: 1px solid transparent;
+  cursor: pointer;
+}
+  
+.text-link:focus {
+  color: red;
+  border: 1px dotted -moz-DialogText;
+}
+  
+.text-link:hover:active {
+  color: red;
+}
+
+.text-link[visited="true"] {
+  color: purple;
+}
+
 /* :::::: autoscroll popup ::::: */
 
 #autoscroller {
   height: 28px;
   width: 28px;
   border: none;
   margin: -14px;
   padding: 0;
--- a/toolkit/themes/winstripe/global/groupbox.css
+++ b/toolkit/themes/winstripe/global/groupbox.css
@@ -67,8 +67,15 @@ caption {
   margin: 0px 6px 2px 6px;
   padding: 0px 3px;
   background-color: -moz-Dialog;
 }
 
 tabpanels caption {
   background-color: menu;
 }
+
+.caption-text {
+  margin-top: 0;
+  margin-bottom: 0;
+  -moz-margin-start: 1px;
+  -moz-margin-end: 2px;
+}
--- a/toolkit/themes/winstripe/global/jar.mn
+++ b/toolkit/themes/winstripe/global/jar.mn
@@ -5,25 +5,25 @@ classic.jar:
 # section at the bottom of this file
         skin/classic/global/about.css
         skin/classic/global/appPicker.css
         skin/classic/global/arrow.css
 *       skin/classic/global/autocomplete.css
         skin/classic/global/button.css
         skin/classic/global/checkbox.css
         skin/classic/global/colorpicker.css
+        skin/classic/global/commonDialog.css
 *       skin/classic/global/config.css
         skin/classic/global/customizeToolbar.css
         skin/classic/global/datetimepicker.css
         skin/classic/global/dialog.css
         skin/classic/global/dropmarker.css
         skin/classic/global/expander.css
         skin/classic/global/filepicker.css
         skin/classic/global/findBar.css
-        skin/classic/global/formatting.css
 *       skin/classic/global/global.css
         skin/classic/global/globalBindings.xml
         skin/classic/global/groupbox.css
         skin/classic/global/linkTree.css
         skin/classic/global/listbox.css
         skin/classic/global/menu.css
         skin/classic/global/menulist.css
         skin/classic/global/netError.css
@@ -171,25 +171,25 @@ classic.jar:
 % skin global classic/1.0 %skin/classic/aero/global/ os=WINNT osversion>=6
         skin/classic/aero/global/about.css
         skin/classic/aero/global/appPicker.css
         skin/classic/aero/global/arrow.css
 *       skin/classic/aero/global/autocomplete.css
         skin/classic/aero/global/button.css
         skin/classic/aero/global/checkbox.css
         skin/classic/aero/global/colorpicker.css
+        skin/classic/aero/global/commonDialog.css
 *       skin/classic/aero/global/config.css
         skin/classic/aero/global/customizeToolbar.css
         skin/classic/aero/global/datetimepicker.css
         skin/classic/aero/global/dialog.css
         skin/classic/aero/global/dropmarker.css
         skin/classic/aero/global/expander.css
         skin/classic/aero/global/filepicker.css
         skin/classic/aero/global/findBar.css
-        skin/classic/aero/global/formatting.css
 *       skin/classic/aero/global/global.css
         skin/classic/aero/global/globalBindings.xml
         skin/classic/aero/global/groupbox.css
         skin/classic/aero/global/linkTree.css
         skin/classic/aero/global/listbox.css
         skin/classic/aero/global/menu.css
 *       skin/classic/aero/global/menulist.css                            (menulist-aero.css)
         skin/classic/aero/global/netError.css
--- a/toolkit/themes/winstripe/global/notification.css
+++ b/toolkit/themes/winstripe/global/notification.css
@@ -34,20 +34,16 @@ notification[type="warning"] .messageIma
 notification[type="critical"] .messageImage {
   list-style-image: url("chrome://global/skin/icons/error-16.png");
 }
 
 .messageText {
   -moz-margin-start: 5px;
 }
 
-.messageButton {
-  margin: 0px 5px 0px 5px;
-}
-
 .messageCloseButton {
   list-style-image: url("chrome://global/skin/icons/close.png");
   -moz-appearance: none;
   -moz-image-region: rect(0px, 14px, 14px, 0px);
   padding: 4px 2px;
   border: none !important;
 }