improve mail header positioning, style net error buttons

diff --git a/EarlyBlue/global/button.css b/EarlyBlue/global/button.css
index 3940645007863d47147b08aa0261d7defe9ae644..66963006174445e7b98a805f84ea862052d29dab 100644 (file)
--- a/EarlyBlue/global/button.css
+++ b/EarlyBlue/global/button.css
@@ -36,11 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 /* ===== button.css =====================================================
-  == Styles used by the XUL button element.
+  == Styles used by the XUL (and XHTML in netError.xhtml) button element.
   ======================================================================= */
 
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
 /* :::::::::: button :::::::::: */
 
 button {
@@ -171,3 +169,10 @@ button[type="disclosure"] {
 button[type="disclosure"][open="true"] {
   list-style-image: url("chrome://global/skin/tree/twisty-open.gif");
 }
+
+/* ::::: xhtml buttons ::::: */
+
+button::-moz-focus-inner {
+  padding: 0px;
+  border: 0px none;
+}

diff --git a/EarlyBlue/global/netError.css b/EarlyBlue/global/netError.css
index 190554009e8fafb1b6d0d406986ca89f514aef8c..163d4bc249695d9637f9f389fd8d10e982b372a2 100644 (file)
--- a/EarlyBlue/global/netError.css
+++ b/EarlyBlue/global/netError.css
@@ -7,6 +7,8 @@
  *              Henrik Skupin  <mozilla@hskupin.info>
  */
 
+@import url("chrome://global/skin/button.css");
+
 html {
   background: #CCD0DD;
 }

diff --git a/EarlyBlue/install.rdf b/EarlyBlue/install.rdf
index 7d4f9dc618f17dd8968088c395eba761f78caf1f..ef220f1585d995e87974d8756a9f4975573b2899 100644 (file)
--- a/EarlyBlue/install.rdf
+++ b/EarlyBlue/install.rdf
@@ -12,7 +12,7 @@
       <Description>
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
         <em:minVersion>2.1a3pre</em:minVersion>
-        <em:maxVersion>2.1a3pre</em:maxVersion>
+        <em:maxVersion>2.1b1pre</em:maxVersion>
       </Description>
     </em:targetApplication>
 

diff --git a/EarlyBlue/messenger/messageHeader.css b/EarlyBlue/messenger/messageHeader.css
index 7135678f8f240942c9372995e0b6bb6c9a9ea1e2..8e69287809b617e2c3dcab4d6e0192f6944a1f62 100644 (file)
--- a/EarlyBlue/messenger/messageHeader.css
+++ b/EarlyBlue/messenger/messageHeader.css
@@ -48,6 +48,7 @@
 #collapsedHeaderView,
 #expandedHeaderView {
   min-width: 1px;
+  border-bottom: 1px solid #9999CC;
 }
 
 /* ::::: msg header buttons ::::: */
@@ -64,15 +65,18 @@
 
 /* ::::: msg header captions ::::: */
 
-#msgHeaderView {
-  border-left: none;
-  border-right: none;
+#expandedHeaders {
+  padding-bottom: 2px;
 }
 
-#collapsedHeaderView,
-#expandedHeaderView {
-  border-bottom: 1px solid #9999CC;
-  min-width: 1px;
+mail-headerfield,
+mail-toggle-headerfield,
+mail-emailheaderfield,
+mail-multi-emailHeaderField,
+mail-messageids-headerfield,
+mail-tagfield,
+mail-urlfield {
+  padding-top: 2px;
 }
 
 .headerNameBox {
@@ -82,27 +86,18 @@
 .headerName {
   margin: 0;
   -moz-margin-end: .25em;
-  min-height: 16px;
   font-weight: bold;
   text-align: right;
 }
 
 .headerValue {
-  margin: 0 0 3px;
+  margin: 0;
   min-width: 50px;
   white-space: normal;
   color: inherit;
   background-color: transparent;
 }
 
-.headerValueBox {
-  margin: 0 0 3px;
-}
-
-.headerValueBox > .headerValue {
-  margin: 0;
-}
-
 .headerValueBox[singleline="true"] {
   overflow: hidden;
 }
@@ -187,6 +182,10 @@
 
 /* ::::: collapsed view styles ::::: */
 
+#collapsedHeaderView {
+  padding-top: 1px;
+}
+
 #collapsedAttachmentBox {
   -moz-box-pack: center;
 }
@@ -209,20 +208,20 @@
 }
 
 .collapsedHeaderDisplayName {
-  margin-top: 2px;
-  margin-bottom: 2px;
+  padding: 0;
   -moz-margin-start: .55em;
   -moz-margin-end: .5em;
-  min-height: 16px;
   font-weight: bold;
 }
 
-.collapsedHeaderValue {
+.collapsedHeaderValue,
+#collapsedfromValue {
   background: transparent;
-  margin: 0;
+  padding: 0;
 }
 
 .collapsedAttachmentButton {
   list-style-image: url("chrome://messenger/skin/icons/message-mail-attach.gif");
+  margin: 0;
   -moz-margin-end: .5em;
 }

diff --git a/LCARStrek/global/button.css b/LCARStrek/global/button.css
index 6616c44f2ac7df2aafb79adbc8e8f30ac70a329b..801281e151b4de5479677dfce75654a1da3a7ed6 100644 (file)
--- a/LCARStrek/global/button.css
+++ b/LCARStrek/global/button.css
@@ -36,11 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 /* ===== button.css =====================================================
-  == Styles used by the XUL button element.
+  == Styles used by the XUL (and XHTML in netError.xhtml) button element.
   ======================================================================= */
 
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
 /* :::::::::: button :::::::::: */
 
 button {
@@ -184,3 +182,10 @@ button[type="disclosure"] {
 button[type="disclosure"][open="true"] {
   list-style-image: url("chrome://global/skin/tree/twisty-open.gif");
 }
+
+/* ::::: xhtml buttons ::::: */
+
+button::-moz-focus-inner {
+  padding: 0px;
+  border: 0px none;
+}

diff --git a/LCARStrek/global/netError.css b/LCARStrek/global/netError.css
index 5678a31ebfb1871b46589f2a28620e1fcb7147ed..d2465cafeba25f28ae743d6a8ba95b3b151a5d09 100644 (file)
--- a/LCARStrek/global/netError.css
+++ b/LCARStrek/global/netError.css
@@ -7,6 +7,8 @@
  *              Henrik Skupin  <mozilla@hskupin.info>
  */
 
+@import url("chrome://global/skin/button.css");
+
 html {
   background: #000000;
 }

diff --git a/LCARStrek/install.rdf b/LCARStrek/install.rdf
index 178db645c5076eaac37e3958ebfaa6737ae70df0..54d895253246f5d840c0b0d467d5e35d3c5b2441 100644 (file)
--- a/LCARStrek/install.rdf
+++ b/LCARStrek/install.rdf
@@ -12,7 +12,7 @@
       <Description>
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
         <em:minVersion>2.1a3pre</em:minVersion>
-        <em:maxVersion>2.1a3pre</em:maxVersion>
+        <em:maxVersion>2.1b1pre</em:maxVersion>
       </Description>
     </em:targetApplication>
 

diff --git a/LCARStrek/messenger/messageHeader.css b/LCARStrek/messenger/messageHeader.css
index e4cf6ceee1ebbc4679eabdc45d8c4456b983d9ee..3d1d5ceafdf7d1e517ec56d52c883a3f250cfba0 100644 (file)
--- a/LCARStrek/messenger/messageHeader.css
+++ b/LCARStrek/messenger/messageHeader.css
@@ -68,18 +68,19 @@
 
 /* ::::: msg header captions ::::: */
 
-#msgHeaderView {
-  border-left: none;
-  border-right: none;
+#expandedHeaders {
+  padding-bottom: 2px;
 }
 
-#collapsedHeaderView,
-#expandedHeaderView {
-  border-left: none;
-  border-right: none;
-/*  border-bottom: 1px solid #9999CC; */
-  min-width: 1px;
- }
+mail-headerfield,
+mail-toggle-headerfield,
+mail-emailheaderfield,
+mail-multi-emailHeaderField,
+mail-messageids-headerfield,
+mail-tagfield,
+mail-urlfield {
+  padding-top: 2px;
+}
 
 .headerNameBox {
   width: 7.7em;
@@ -88,27 +89,18 @@
 .headerName {
   margin: 0;
   -moz-margin-end: .25em;
-  min-height: 16px;
   font-weight: bold;
   text-align: right;
 }
 
 .headerValue {
-  margin: 0 0 3px;
+  margin: 0;
   min-width: 50px;
   white-space: normal;
   color: inherit;
   background-color: transparent;
 }
 
-.headerValueBox {
-  margin: 0 0 3px;
-}
-
-.headerValueBox > .headerValue {
-  margin: 0;
-}
-
 .headerValueBox[singleline="true"] {
   overflow: hidden;
 }
@@ -195,6 +187,11 @@
 
 /* ::::: collapsed view styles ::::: */
 
+#collapsedHeaderView {
+  padding-top: 2px;
+  padding-bottom: 2px;
+}
+
 #collapsedAttachmentBox {
   -moz-box-pack: center;
 }
@@ -222,22 +219,20 @@
 }
 
 .collapsedHeaderDisplayName {
-  margin-top: 2px;
-  margin-bottom: 2px;
+  margin: 0;
   -moz-margin-start: .55em;
   -moz-margin-end: .5em;
-  min-height: 12px;
   font-weight: bold;
 }
 
 .collapsedHeaderValue,
 #collapsedfromValue {
   background: transparent;
-  margin: 2px 0px !important;
+  padding: 0;
 }
 
 .collapsedAttachmentButton {
   list-style-image: url("chrome://messenger/skin/icons/message-mail-attach.gif");
+  margin: 0;
   -moz-margin-end: .5em;
-  margin-top: 1px;
 }