Bug 916478 - Make our css more efficient and remove some obsolete style rules. r+sr=Neil, a=Ratty for CLOSED TREE landing.
authorstefanh@inbox.com
Sun, 15 Sep 2013 18:33:51 +0200
changeset 13047 58c86e8a42fb702ceea674a6ee10a3c7ca7621f3
parent 13046 d26eff2ae9e0c9e9d6c77e7e8dadd8a6c84e173c
child 13048 40c0e9b4ab21317198e1fddc8e70701c66306a33
push id9501
push userstefanh@inbox.com
push dateSun, 15 Sep 2013 16:34:04 +0000
treeherdercomm-central@58c86e8a42fb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersRatty
bugs916478
Bug 916478 - Make our css more efficient and remove some obsolete style rules. r+sr=Neil, a=Ratty for CLOSED TREE landing.
suite/mailnews/addrbook/abEditListDialog.xul
suite/mailnews/addrbook/abMailListDialog.xul
suite/mailnews/mailViewList.xul
suite/mailnews/msgPrintEngine.xul
suite/mailnews/msgSelectOffline.xul
suite/themes/classic/communicator/aboutSyncTabs.css
suite/themes/classic/communicator/communicator.css
suite/themes/classic/communicator/profile/profile.css
suite/themes/classic/communicator/sidebar/preview.css
suite/themes/classic/communicator/smileys.css
suite/themes/classic/communicator/sync/syncCommon.css
suite/themes/classic/editor/EditorDialog.css
suite/themes/classic/mac/communicator/communicator.css
suite/themes/classic/messenger/dialogs.css
suite/themes/classic/messenger/messageBody.css
suite/themes/modern/communicator/aboutSyncTabs.css
suite/themes/modern/communicator/profile/profile.css
suite/themes/modern/communicator/smileys.css
suite/themes/modern/communicator/sync/syncCommon.css
suite/themes/modern/editor/EditorDialog.css
suite/themes/modern/messenger/dialogs.css
suite/themes/modern/messenger/messageBody.css
--- a/suite/mailnews/addrbook/abEditListDialog.xul
+++ b/suite/mailnews/addrbook/abEditListDialog.xul
@@ -1,15 +1,13 @@
 <?xml version="1.0"?> 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://messenger/skin/dialogs.css" type="text/css"?>
-
 <?xul-overlay href="chrome://messenger/content/addressbook/abListOverlay.xul"?>
 
 <!DOCTYPE dialog SYSTEM "chrome://messenger/locale/addressbook/abMailListDialog.dtd">
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         id="ablistWindow"
         title="&mailListWindow.title;"
--- a/suite/mailnews/addrbook/abMailListDialog.xul
+++ b/suite/mailnews/addrbook/abMailListDialog.xul
@@ -1,15 +1,13 @@
 <?xml version="1.0"?> 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://messenger/skin/dialogs.css" type="text/css"?>
-
 <?xul-overlay href="chrome://messenger/content/addressbook/abListOverlay.xul"?>
 
 <!DOCTYPE dialog SYSTEM "chrome://messenger/locale/addressbook/abMailListDialog.dtd">
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     id="ablistWindow"
     title="&mailListWindow.title;"
     ondialogaccept="return MailListOKButton();"
--- a/suite/mailnews/mailViewList.xul
+++ b/suite/mailnews/mailViewList.xul
@@ -1,17 +1,16 @@
 <?xml version="1.0"?>
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xul-overlay href="chrome://communicator/content/platformCommunicatorOverlay.xul"?>
 
-<?xml-stylesheet href="chrome://messenger/skin/dialogs.css" type="text/css"?>
 <!-- Mac needs dialog.css to correctly style the moved Help button -->
 <?xml-stylesheet href="chrome://global/skin/dialog.css" type="text/css"?>
 
 <!DOCTYPE dialog [
 <!ENTITY % mailViewLisDTD SYSTEM "chrome://messenger/locale/mailViewList.dtd">
 %mailViewLisDTD;
 <!ENTITY % FilterListDialogDTD SYSTEM "chrome://messenger/locale/FilterListDialog.dtd">
 %FilterListDialogDTD;
--- a/suite/mailnews/msgPrintEngine.xul
+++ b/suite/mailnews/msgPrintEngine.xul
@@ -1,15 +1,13 @@
 <?xml version="1.0"?> 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://messenger/skin/dialogs.css" type="text/css"?>
-
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 
 <window id="printEngineWin"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="OnLoadPrintEngine()"
         width="750"
         height="500"
         screenX="10" screenY="10"
--- a/suite/mailnews/msgSelectOffline.xul
+++ b/suite/mailnews/msgSelectOffline.xul
@@ -1,17 +1,16 @@
 <?xml version="1.0"?>
 
 <!--
 
  This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://messenger/skin/dialogs.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/folderPane.css" type="text/css"?>
 
 <!DOCTYPE dialog SYSTEM "chrome://messenger/locale/msgSynchronize.dtd" >
 <dialog	xmlns:nc="http://home.netscape.com/NC-rdf#"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         id="select-offline" 
         title="&MsgSelect.label;"
--- a/suite/themes/classic/communicator/aboutSyncTabs.css
+++ b/suite/themes/classic/communicator/aboutSyncTabs.css
@@ -54,20 +54,22 @@ richlistitem[type="client"] {
   -moz-margin-start: 2em;
   margin-top: 2px;
   margin-bottom: 3px;
   width: 42em;
   border-radius: 6px;
   background-color: transparent;
   -moz-user-focus: ignore !important;
 }
-richlistitem.mobile[type="client"] {
+
+.mobile[type="client"] {
   list-style-image: url("chrome://communicator/skin/sync/sync-mobileIcon.png");
 }
-richlistitem.desktop[type="client"] {
+
+.desktop[type="client"] {
   list-style-image: url("chrome://communicator/skin/sync/sync-desktopIcon.png");
 }
 
 .title,
 .clientName {
   font-size: 1.1em;
 }
 
--- a/suite/themes/classic/communicator/communicator.css
+++ b/suite/themes/classic/communicator/communicator.css
@@ -37,16 +37,22 @@
 }
 
 /* ::::: spell checker ::::: */
 
 .spell-suggestion {
   font-weight: bold;
 }
 
+/* ::::: error messages,::::: */
+
+description.error {
+  color: #FF0000;
+}
+
 /* ::::: directional button icons ::::: */
 
 .up {
   min-width: 0px;
   list-style-image: url("chrome://global/skin/arrow/arrow-up.gif");
 }
 
 .up[disabled="true"] {
--- a/suite/themes/classic/communicator/profile/profile.css
+++ b/suite/themes/classic/communicator/profile/profile.css
@@ -3,50 +3,25 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 @import url("chrome://global/skin/global.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-window.dialog {
-  padding: 0;
-}
-
 treechildren::-moz-tree-image {
   -moz-margin-end: 2px;
   list-style-image: url("chrome://communicator/skin/profile/profileicon-large.gif");
 }
 
 treechildren::-moz-tree-image(rowMigrate-no) {
   list-style-image: url("chrome://communicator/skin/profile/migrate.gif");
 }
 
 /* profile selection dialog */
-html#intro {
+#intro {
   width: 17em;
 }
 
-box#managebuttons > button {
+#managebuttons > button {
   min-width: 8em;
 }
-
-/* display area */
-box#contentarea {
-  border-top: 2px groove #CCCCCC;
-  border-bottom: 2px groove #CCCCCC;
-  padding: 7px;
-}
-
-/* top border on status area */
-box#wizardButtons {
-  padding-top: 1px;
-  padding-bottom: 1px;
-}
-
-box.selection {
-  margin-top: 4px;
-}
-
-description.error {
-  color: #FF0000;
-}
--- a/suite/themes/classic/communicator/sidebar/preview.css
+++ b/suite/themes/classic/communicator/sidebar/preview.css
@@ -4,17 +4,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /*
    Style rules specific to the Preview dialog.
 */
 
-iframe#previewframe {
+#previewframe {
  min-width: 10px;
  min-height: 10px;
  width: 162px;
  height: 300px;
  border: none;
  margin: 0px;
 }
 
--- a/suite/themes/classic/communicator/smileys.css
+++ b/suite/themes/classic/communicator/smileys.css
@@ -6,129 +6,127 @@
    == Style rules to bind smiley image types generated by editor and the mozTxtToHTMLConv
    == into skinnable images.
    ========================================================================== */
 
 @namespace url("http://www.w3.org/1999/xhtml");
 
 /* ::::: we also represent smilies inside of spans ::::: */
 
-span.moz-smiley-s1,
-span.moz-smiley-s2,
-span.moz-smiley-s3,
-span.moz-smiley-s4,
-span.moz-smiley-s5,
-span.moz-smiley-s6,
-span.moz-smiley-s7,
-span.moz-smiley-s8,
-span.moz-smiley-s9,
-span.moz-smiley-s10,
-span.moz-smiley-s11,
-span.moz-smiley-s12,
-span.moz-smiley-s13,
-span.moz-smiley-s14,
-span.moz-smiley-s15,
-span.moz-smiley-s16
-{
+.moz-smiley-s1,
+.moz-smiley-s2,
+.moz-smiley-s3,
+.moz-smiley-s4,
+.moz-smiley-s5,
+.moz-smiley-s6,
+.moz-smiley-s7,
+.moz-smiley-s8,
+.moz-smiley-s9,
+.moz-smiley-s10,
+.moz-smiley-s11,
+.moz-smiley-s12,
+.moz-smiley-s13,
+.moz-smiley-s14,
+.moz-smiley-s15,
+.moz-smiley-s16 {
   display: inline-block;
   vertical-align: middle;
   -moz-user-select: all;
 }
 
-span.moz-smiley-s1 > span,
-span.moz-smiley-s2 > span,
-span.moz-smiley-s3 > span,
-span.moz-smiley-s4 > span,
-span.moz-smiley-s5 > span,
-span.moz-smiley-s6 > span,
-span.moz-smiley-s7 > span,
-span.moz-smiley-s8 > span,
-span.moz-smiley-s9 > span,
-span.moz-smiley-s10 > span,
-span.moz-smiley-s11 > span,
-span.moz-smiley-s12 > span,
-span.moz-smiley-s13 > span,
-span.moz-smiley-s14 > span,
-span.moz-smiley-s15 > span,
-span.moz-smiley-s16 > span
-{
-    display: none;
+.moz-smiley-s1 > span,
+.moz-smiley-s2 > span,
+.moz-smiley-s3 > span,
+.moz-smiley-s4 > span,
+.moz-smiley-s5 > span,
+.moz-smiley-s6 > span,
+.moz-smiley-s7 > span,
+.moz-smiley-s8 > span,
+.moz-smiley-s9 > span,
+.moz-smiley-s10 > span,
+.moz-smiley-s11 > span,
+.moz-smiley-s12 > span,
+.moz-smiley-s13 > span,
+.moz-smiley-s14 > span,
+.moz-smiley-s15 > span,
+.moz-smiley-s16 > span {
+  display: none;
 }
 
 /* smile */
-span.moz-smiley-s1:before {
+.moz-smiley-s1:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-smile.png");
 }
 
 /* frown */
-span.moz-smiley-s2:before {
+.moz-smiley-s2:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-frown.png");
 }
 
 /* wink */
-span.moz-smiley-s3:before {
+.moz-smiley-s3:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-wink.png");
 }
 
 /* tongue */
-span.moz-smiley-s4:before {
+.moz-smiley-s4:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-tongue.png");
 }
 
 /* laughing */
-span.moz-smiley-s5:before {
+.moz-smiley-s5:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-laughing.png");
 }
 
 /* embarrassed */
-span.moz-smiley-s6:before {
+.moz-smiley-s6:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-embarrassed.png");
 }
 
 /* undecided */
-span.moz-smiley-s7:before {
+.moz-smiley-s7:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-undecided.png");
 }
 
 /* surprise */
-span.moz-smiley-s8:before {
+.moz-smiley-s8:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-surprise.png");
 }
 
 /* kiss */
-span.moz-smiley-s9:before {
+.moz-smiley-s9:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-kiss.png");
 }
 
 /* yell */
-span.moz-smiley-s10:before {
+.moz-smiley-s10:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-yell.png");
 }
 
 /* cool */
-span.moz-smiley-s11:before {
+.moz-smiley-s11:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-cool.png");
 }
 
 /* money */
-span.moz-smiley-s12:before {
+.moz-smiley-s12:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-money.png");
 }
 
 /* foot */
-span.moz-smiley-s13:before {
+.moz-smiley-s13:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-foot.png");
 }
 
 /* innocent */
-span.moz-smiley-s14:before {
+.moz-smiley-s14:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-innocent.png");
 }
 
 /* cry */
-span.moz-smiley-s15:before {
+.moz-smiley-s15:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-cry.png");
 }
 
 /* sealed */
-span.moz-smiley-s16:before {
+.moz-smiley-s16:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-sealed.png");
 }
--- a/suite/themes/classic/communicator/sync/syncCommon.css
+++ b/suite/themes/classic/communicator/sync/syncCommon.css
@@ -27,23 +27,19 @@
 
 /* .data is only used by syncGenericChange.xul, but it seems unnecessary to have
    a separate stylesheet for it. */
 .data {
   font-size: 90%;
   font-weight: bold;
 }
 
-dialog#change-dialog {
+#change-dialog {
   width: 40em;
 }
 
-image#syncIcon {
-  list-style-image: url("chrome://communicator/skin/sync/sync-32.png");
-}
-
 #introText {
   margin-top: 2px;
 }
 
 #feedback {
   height: 2em;
 }
--- a/suite/themes/classic/editor/EditorDialog.css
+++ b/suite/themes/classic/editor/EditorDialog.css
@@ -7,20 +7,16 @@
 .MinWidth5em {
   min-width: 5em;
 }
 
 .MinWidth10em {
   min-width: 10em;
 }
 
-.MinWidth15em {
-  min-width: 15em;
-}
-
 .MinWidth20em {
   min-width: 20em;
 }
 
 .bold {
   font-weight: bold;
 }
 
@@ -240,17 +236,17 @@
    viewers. */
 
 
 #tagLabel {
   font-weight: bold;
 }
 
 /* styles for an attribute tree-table */
-tree.AttributesTree {
+.AttributesTree {
   min-width : 200px;
   min-height: 200px;
 }
 
 /* ::::: select edit dialog ::::: */
 
 #SelectTreeChildren::-moz-tree-cell(SelectSelCol, checked-true) {
   background: url("chrome://global/skin/checkbox/cbox-check.gif") 50% 50% no-repeat;
--- a/suite/themes/classic/mac/communicator/communicator.css
+++ b/suite/themes/classic/mac/communicator/communicator.css
@@ -52,16 +52,22 @@ grippy {
 }
 
 /* ::::: spell checker ::::: */
 
 .spell-suggestion {
   font-weight: bold;
 }
 
+/* ::::: error messages ::::: */
+
+description.error {
+  color: #FF0000;
+}
+
 /* ::::: directional button icons ::::: */
 
 .up {
   min-width: 0px;
   list-style-image: url("chrome://global/skin/arrow/arrow-up.gif");
 }
 
 .up[disabled="true"] {
--- a/suite/themes/classic/messenger/dialogs.css
+++ b/suite/themes/classic/messenger/dialogs.css
@@ -5,33 +5,10 @@
 /* ===== dialogs.css ====================================================
   == Styles used by the general dialogs in Messenger.
   ======================================================================= */
 
 @import url("chrome://messenger/skin/");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/* ::::: button-like menus ::::: */
- 
-menu.push {
-  border: 1px outset ThreeDFace;
-  padding: 2px;
-  margin: 2px;
-  background-color: inherit;
-  background-image: inherit;
-}
+/* ::::: styles for messenger dialogs ::::: */
 
-menu.push:hover:active,
-menu.push[open="true"] {
-  border-style: inset;
-  padding-top: 3px;
-  padding-bottom: 1px;
-  -moz-padding-start: 3px;
-  -moz-padding-end: 1px;
-}
-
-menu.push[disabled="true"],
-menu.push[disabled="true"]:hover,
-menu.push[disabled="true"]:hover:active {
-  color: GrayText;
-}
-
--- a/suite/themes/classic/messenger/messageBody.css
+++ b/suite/themes/classic/messenger/messageBody.css
@@ -16,17 +16,17 @@
   background-color: #EFEFEF;
 }
 
 .header-part2,
 .header-part3 {
   background-color: #DEDEDE;
 }
 
-div.headerdisplayname {
+.headerdisplayname {
   display: inline;
   font-weight: bold;
   white-space: pre;
 }
 
 /* ::::: message text, incl. quotes ::::: */
 
 .moz-text-flowed blockquote {
@@ -63,21 +63,21 @@ div.headerdisplayname {
   border-width: medium;
   border-color: gray;
 }
 
 .moz-text-plain[graphical-quote="true"] .moz-txt-citetags {
   display: none;
 }
 
-span.moz-txt-underscore {
+.moz-txt-underscore {
   text-decoration: underline;
 }
 
-span.moz-txt-formfeed {
+.moz-txt-formfeed {
   display: block;
   height: 100%;
 }
 
 /* ::::: signature ::::: */
 
 .moz-txt-sig,
 .moz-signature {
--- a/suite/themes/modern/communicator/aboutSyncTabs.css
+++ b/suite/themes/modern/communicator/aboutSyncTabs.css
@@ -49,20 +49,22 @@ richlistitem[type="client"] {
   -moz-margin-start: 2em;
   margin-top: 2px;
   margin-bottom: 3px;
   width: 42em;
   border-radius: 6px;
   background-color: transparent;
   -moz-user-focus: ignore !important;
 }
-richlistitem.mobile[type="client"] {
+
+.mobile[type="client"] {
   list-style-image: url("chrome://communicator/skin/sync/sync-mobileIcon.png");
 }
-richlistitem.desktop[type="client"] {
+
+.desktop[type="client"] {
   list-style-image: url("chrome://communicator/skin/sync/sync-desktopIcon.png");
 }
 
 .title,
 .clientName {
   font-size: 1.1em;
 }
 
--- a/suite/themes/modern/communicator/profile/profile.css
+++ b/suite/themes/modern/communicator/profile/profile.css
@@ -24,15 +24,11 @@ treechildren::-moz-tree-image(rowMigrate
 #intro {
   width: 17em;
 }
 
 #managebuttons > button {
   min-width: 8em;
 }
 
-box.selection {
-  margin-top: 4px;
-}
-
 #finishtext {
   margin-top: -20px;
 }
--- a/suite/themes/modern/communicator/smileys.css
+++ b/suite/themes/modern/communicator/smileys.css
@@ -6,129 +6,127 @@
    == Style rules to bind smiley image types generated by editor and the mozTxtToHTMLConv
    == into skinnable images.
    ========================================================================== */
 
 @namespace url("http://www.w3.org/1999/xhtml");
 
 /* ::::: we also represent smilies inside of spans ::::: */
 
-span.moz-smiley-s1,
-span.moz-smiley-s2,
-span.moz-smiley-s3,
-span.moz-smiley-s4,
-span.moz-smiley-s5,
-span.moz-smiley-s6,
-span.moz-smiley-s7,
-span.moz-smiley-s8,
-span.moz-smiley-s9,
-span.moz-smiley-s10,
-span.moz-smiley-s11,
-span.moz-smiley-s12,
-span.moz-smiley-s13,
-span.moz-smiley-s14,
-span.moz-smiley-s15,
-span.moz-smiley-s16
-{
+.moz-smiley-s1,
+.moz-smiley-s2,
+.moz-smiley-s3,
+.moz-smiley-s4,
+.moz-smiley-s5,
+.moz-smiley-s6,
+.moz-smiley-s7,
+.moz-smiley-s8,
+.moz-smiley-s9,
+.moz-smiley-s10,
+.moz-smiley-s11,
+.moz-smiley-s12,
+.moz-smiley-s13,
+.moz-smiley-s14,
+.moz-smiley-s15,
+.moz-smiley-s16 {
   display: inline-block;
   vertical-align: middle;
   -moz-user-select: all;
 }
 
-span.moz-smiley-s1 > span,
-span.moz-smiley-s2 > span,
-span.moz-smiley-s3 > span,
-span.moz-smiley-s4 > span,
-span.moz-smiley-s5 > span,
-span.moz-smiley-s6 > span,
-span.moz-smiley-s7 > span,
-span.moz-smiley-s8 > span,
-span.moz-smiley-s9 > span,
-span.moz-smiley-s10 > span,
-span.moz-smiley-s11 > span,
-span.moz-smiley-s12 > span,
-span.moz-smiley-s13 > span,
-span.moz-smiley-s14 > span,
-span.moz-smiley-s15 > span,
-span.moz-smiley-s16 > span
-{
+.moz-smiley-s1 > span,
+.moz-smiley-s2 > span,
+.moz-smiley-s3 > span,
+.moz-smiley-s4 > span,
+.moz-smiley-s5 > span,
+.moz-smiley-s6 > span,
+.moz-smiley-s7 > span,
+.moz-smiley-s8 > span,
+.moz-smiley-s9 > span,
+.moz-smiley-s10 > span,
+.moz-smiley-s11 > span,
+.moz-smiley-s12 > span,
+.moz-smiley-s13 > span,
+.moz-smiley-s14 > span,
+.moz-smiley-s15 > span,
+.moz-smiley-s16 > span {
     display: none;
 }
 
 /* smile */
-span.moz-smiley-s1:before {
+.moz-smiley-s1:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-smile.png");
 }
 
 /* frown */
-span.moz-smiley-s2:before {
+.moz-smiley-s2:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-frown.png");
 }
 
 /* wink */
-span.moz-smiley-s3:before {
+.moz-smiley-s3:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-wink.png");
 }
 
 /* tongue */
-span.moz-smiley-s4:before {
+.moz-smiley-s4:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-tongue.png");
 }
 
 /* laughing */
-span.moz-smiley-s5:before {
+.moz-smiley-s5:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-laughing.png");
 }
 
 /* embarrassed */
-span.moz-smiley-s6:before {
+.moz-smiley-s6:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-embarrassed.png");
 }
 
 /* undecided */
-span.moz-smiley-s7:before {
+.moz-smiley-s7:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-undecided.png");
 }
 
 /* surprise */
-span.moz-smiley-s8:before {
+.moz-smiley-s8:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-surprise.png");
 }
 
 /* kiss */
-span.moz-smiley-s9:before {
+.moz-smiley-s9:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-kiss.png");
 }
 
 /* yell */
-span.moz-smiley-s10:before {
+.moz-smiley-s10:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-yell.png");
 }
 
 /* cool */
-span.moz-smiley-s11:before {
+.moz-smiley-s11:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-cool.png");
 }
 
 /* money */
-span.moz-smiley-s12:before {
+.moz-smiley-s12:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-money.png");
 }
 
 /* foot */
-span.moz-smiley-s13:before {
+.moz-smiley-s13:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-foot.png");
 }
 
 /* innocent */
-span.moz-smiley-s14:before {
+.moz-smiley-s14:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-innocent.png");
 }
 
 /* cry */
-span.moz-smiley-s15:before {
+.moz-smiley-s15:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-cry.png");
 }
 
 /* sealed */
-span.moz-smiley-s16:before {
+.moz-smiley-s16:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-sealed.png");
 }
--- a/suite/themes/modern/communicator/sync/syncCommon.css
+++ b/suite/themes/modern/communicator/sync/syncCommon.css
@@ -23,23 +23,19 @@
 
 /* .data is only used by syncGenericChange.xul, but it seems unnecessary to have
    a separate stylesheet for it. */
 .data {
   font-size: 90%;
   font-weight: bold;
 }
 
-dialog#change-dialog {
+#change-dialog {
   width: 40em;
 }
 
-image#syncIcon {
-  list-style-image: url("chrome://communicator/skin/sync/sync-32.png");
-}
-
 #introText {
   margin-top: 2px;
 }
 
 #feedback {
   height: 2em;
 }
--- a/suite/themes/modern/editor/EditorDialog.css
+++ b/suite/themes/modern/editor/EditorDialog.css
@@ -13,20 +13,16 @@
 .MinWidth5em {
   min-width: 5em;
 }
 
 .MinWidth10em {
   min-width: 10em;
 }
 
-.MinWidth15em {
-  min-width: 15em;
-}
-
 .MinWidth20em {
   min-width: 20em;
 }
 
 .bold {
   font-weight: bold;
 }
 
@@ -135,24 +131,16 @@
 
 /* The defaults are WAY to big! */
 groupbox {
   margin: 2px 5px 4px;
   padding-top: 2px;
   padding-bottom: 4px;
 }
 
-/* temporary -- we need a simple box-based list defined in XBL */
-tree.list {
-  /* same as in menulist.css */
-  margin: 1px 5px 2px;
-  border: 1px inset #B4C3D4;
-  /* use rows="#" in XUL to define height */
-}
-
 /* ::::: color picker button ::::: */
 
 .color-button {
   /* override larger default values */
   min-width: 0px;
   margin: 2px;
 }
 
--- a/suite/themes/modern/messenger/dialogs.css
+++ b/suite/themes/modern/messenger/dialogs.css
@@ -5,55 +5,23 @@
 /* ===== dialogs.css ====================================================
   == Styles used by the general dialogs in Messenger.
   ======================================================================= */
 
 @import url("chrome://messenger/skin/");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/* ::::: button-like menus ::::: */
-
-menu.push {
-  margin: 2px;
-  border: 1px outset #B4C3D4;
-  padding: 2px;
-  background: transparent;
-}
-
-menu.push:hover:active,
-menu.push[open] {
-  border-style: inset;
-  padding-top: 3px;
-  padding-bottom: 1px;
-  -moz-padding-start: 3px;
-  -moz-padding-end: 1px;
-}
-
-menu.push[disabled="true"],
-menu.push[disabled="true"]:hover,
-menu.push[disabled="true"]:hover:active {
-  border: 1px solid #85959E;
-  color: #85959E;
-}
-
 /* ::::: fieldMapImport.xul ::::: */
 
-treecell.importsampledata {
+.importsampledata {
   border-left: 3px solid #C2D0D0;
   -moz-padding-start: 10px;
 }
 
-#fieldList-box {
-  margin: 1.5em 3em;
-  border: 1px inset white;
-  width: 32em;
-  height: 300px;
-}
-
 /* ::::: importDialog.xul ::::: */
 
 #progressStatus {
   margin: 1em 0px 0px;
 }
 
 #progressMeter {
   margin-top: 1em;
--- a/suite/themes/modern/messenger/messageBody.css
+++ b/suite/themes/modern/messenger/messageBody.css
@@ -16,17 +16,17 @@
   background-color: #EFEFEF;
 }
 
 .header-part2,
 .header-part3 {
   background-color: #DEDEDE;
 }
 
-div.headerdisplayname {
+.headerdisplayname {
   display: inline;
   font-weight: bold;
   white-space: pre;
 }
 
 /* ::::: message text, incl. quotes ::::: */
 
 .moz-text-flowed blockquote {
@@ -63,21 +63,21 @@ div.headerdisplayname {
   border-width: medium;
   border-color: gray;
 }
 
 .moz-text-plain[graphical-quote="true"] .moz-txt-citetags {
   display: none;
 }
 
-span.moz-txt-underscore {
+.moz-txt-underscore {
   text-decoration: underline;
 }
 
-span.moz-txt-formfeed {
+.moz-txt-formfeed {
   display: block;
   height: 100%;
 }
 
 /* ::::: signature ::::: */
 
 .moz-txt-sig,
 .moz-signature {