Bug 686427 - Remove trailing spaces from mail header string entities and adjust the padding to compensate. r+ui-r=bwinton
authorRichard Marti <richard.marti@gmail.com>
Sun, 05 May 2013 13:51:00 +0200
changeset 15744 2e455a3aafa8e3cca758c78141c45d8ba57f4f5f
parent 15743 ec86e36132dc50f6d14a8eefb4ce20a0d4dcd088
child 15745 99d7494dcc968f1c9288dd4c9161042b1baaa1e8
push id942
push userbugzilla@standard8.plus.com
push dateMon, 05 Aug 2013 19:15:38 +0000
treeherdercomm-beta@0e1a1c4a9f0c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs686427
Bug 686427 - Remove trailing spaces from mail header string entities and adjust the padding to compensate. r+ui-r=bwinton
mail/base/content/msgHdrViewOverlay.xul
mail/locales/en-US/chrome/messenger/msgHdrViewOverlay.dtd
mail/themes/linux/mail/messageHeader.css
mail/themes/osx/mail/messageHeader.css
mail/themes/windows/mail/messageHeader-aero.css
mail/themes/windows/mail/messageHeader.css
--- a/mail/base/content/msgHdrViewOverlay.xul
+++ b/mail/base/content/msgHdrViewOverlay.xul
@@ -380,17 +380,17 @@
             <columns id="expandedHeadersColumns">
               <column id="expandedHeadersNameColumn"/>
               <column id="expandedHeadersValueColumn" flex="1"/>
             </columns>
 
             <rows id="expandedHeaderRows">
               <row id="expandedfromRow">
                 <label id="expandedfromLabel" class="headerName"
-                       value="&fromField3.label;" control="expandedfromBox"/>
+                       value="&fromField4.label;" control="expandedfromBox"/>
                 <mail-multi-emailHeaderField id="expandedfromBox" flex="1"/>
               </row>
             </rows>
           </grid>
         </hbox>
 
         <hbox id="expandedHeadersBottomBox">
 
@@ -404,102 +404,102 @@
             </columns>
 
             <rows id="expandedHeader2Rows">
 
               <!-- Commonly used rows are pre-specified in the XUL to avoid the
                    performance hit of creating them dynamically. -->
               <row id="expandedsubjectRow">
                 <label id="expandedsubjectLabel" class="headerName"
-                       value="&subjectField3.label;"
+                       value="&subjectField4.label;"
                        control="expandedsubjectBox"/>
                 <mail-headerfield id="expandedsubjectBox" flex="1"/>
               </row>
               <row id="expandedorganizationRow" collapsed="true">
                 <label id="expandedorganizationLabel" class="headerName"
-                       value="&organizationField3.label;"
+                       value="&organizationField4.label;"
                        control="expandedorganizationBox"/>
                 <mail-headerfield id="expandedorganizationBox"/>
               </row>
               <row id="expandedsenderRow" collapsed="true">
                 <label id="expandedsenderLabel" class="headerName"
-                       value="&senderField3.label;" control="expandedsenderBox"/>
+                       value="&senderField4.label;" control="expandedsenderBox"/>
                 <mail-emailheaderfield id="expandedsenderBox"/>
               </row>
               <row id="expandedreply-toRow" collapsed="true">
                 <label id="expandedreply-toLabel" class="headerName"
-                       value="&replyToField3.label;"
+                       value="&replyToField4.label;"
                        control="expandedreply-toBox"/>
                 <mail-multi-emailHeaderField id="expandedreply-toBox"/>
               </row>
               <row id="expandedtoRow" collapsed="true">
                 <label id="expandedtoLabel" class="headerName"
-                       value="&toField3.label;" control="expandedtoBox"/>
+                       value="&toField4.label;" control="expandedtoBox"/>
                 <mail-multi-emailHeaderField id="expandedtoBox" flex="1"/>
               </row>
               <row id="expandedccRow" collapsed="true">
                 <label id="expandedccLabel" class="headerName"
-                       value="&ccField3.label;" control="expandedccBox"/>
+                       value="&ccField4.label;" control="expandedccBox"/>
                 <mail-multi-emailHeaderField id="expandedccBox" flex="1"/>
               </row>
               <row id="expandedbccRow" collapsed="true">
                 <label id="expandedbccLabel" class="headerName"
-                       value="&bccField3.label;" control="expandedbccBox"/>
+                       value="&bccField4.label;" control="expandedbccBox"/>
                 <mail-multi-emailHeaderField id="expandedbccBox"/>
               </row>
               <row id="expandednewsgroupsRow" collapsed="true">
                 <label id="expandednewsgroupsLabel" class="headerName"
-                       value="&newsgroupsField3.label;"
+                       value="&newsgroupsField4.label;"
                        control="expandednewsgroupsBox"/>
                 <mail-newsgroups-headerfield id="expandednewsgroupsBox"/>
               </row>
               <row id="expandedfollowup-toRow" collapsed="true">
                 <label id="expandedfollowup-toLabel" class="headerName"
-                       value="&followupToField3.label;"
+                       value="&followupToField4.label;"
                        control="expandedfollowup-toBox"/>
                 <mail-newsgroups-headerfield id="expandedfollowup-toBox"/>
               </row>
               <row id="expandeddateRow" collapsed="true">
                 <label id="expandeddateLabel" class="headerName"
-                       value="&dateField3.label;" control="expandeddateBox"/>
+                       value="&dateField4.label;" control="expandeddateBox"/>
                 <mail-headerfield id="expandeddateBox" flex="1"/>
               </row>
               <row id="expandedmessage-idRow" collapsed="true">
                 <label id="expandedmessage-idLabel" class="headerName"
-                       value="&messageIdField3.label;"
+                       value="&messageIdField4.label;"
                        control="expandedmessage-idBox"/>
                 <mail-messageids-headerfield id="expandedmessage-idBox"/>
               </row>
               <row id="expandedin-reply-toRow" collapsed="true">
                 <label id="expandedin-reply-toLabel" class="headerName"
-                       value="&inReplyToField3.label;"
+                       value="&inReplyToField4.label;"
                        control="expandedin-reply-toBox"/>
                 <mail-messageids-headerfield id="expandedin-reply-toBox"/>
               </row>
               <row id="expandedreferencesRow" collapsed="true">
                 <label id="expandedreferencesLabel" class="headerName"
-                       value="&referencesField3.label;"
+                       value="&referencesField4.label;"
                        control="expandedReferencesBox"/>
                 <mail-messageids-headerfield id="expandedreferencesBox"
                                              flex="1"/>
               </row>
               <row id="expandedtagsRow" collapsed="true">
                 <label id="expandedtagsLabel" class="headerName"
-                       value="&tagsHdr3.label;" control="expandedtagsBox"/>
+                       value="&tagsHdr4.label;" control="expandedtagsBox"/>
                 <mail-tagfield id="expandedtagsBox"/>
               </row>
               <row id="expandedcontent-baseRow" collapsed="true">
                 <label id="expandedcontent-baseLabel" class="headerName"
-                       value="&originalWebsite3.label;"
+                       value="&originalWebsite4.label;"
                        control="expandedcontent-baseBox"/>
                 <mail-urlfield id="expandedcontent-baseBox"/>
               </row>
               <row id="expandeduser-agentRow" collapsed="true">
                 <label id="expandeduser-agentLabel" class="headerName"
-                       value="&userAgentField3.label;"
+                       value="&userAgentField4.label;"
                        control="expandeduser-agentBox"/>
                 <mail-headerfield id="expandeduser-agentBox" flex="1"/>
               </row>
             </rows>
           </grid>
 
           <!-- perhaps this should be a customizable toolbar too -->
           <vbox id="otherActionsBox" align="end">
--- a/mail/locales/en-US/chrome/messenger/msgHdrViewOverlay.dtd
+++ b/mail/locales/en-US/chrome/messenger/msgHdrViewOverlay.dtd
@@ -1,30 +1,30 @@
 <!-- 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/. -->
 
-<!ENTITY toField3.label "To ">
-<!ENTITY fromField3.label "From ">
-<!ENTITY senderField3.label "Sender ">
-<!ENTITY organizationField3.label "Organization ">
-<!ENTITY replyToField3.label "Reply to ">
+<!ENTITY toField4.label "To">
+<!ENTITY fromField4.label "From">
+<!ENTITY senderField4.label "Sender">
+<!ENTITY organizationField4.label "Organization">
+<!ENTITY replyToField4.label "Reply to">
 
-<!ENTITY subjectField3.label "Subject ">
-<!ENTITY ccField3.label "Cc ">
-<!ENTITY bccField3.label "Bcc ">
-<!ENTITY newsgroupsField3.label "Newsgroups ">
-<!ENTITY followupToField3.label "Followup to ">
-<!ENTITY tagsHdr3.label "Tags ">
-<!ENTITY dateField3.label "Date ">
-<!ENTITY userAgentField3.label "User agent ">
-<!ENTITY referencesField3.label "References ">
-<!ENTITY messageIdField3.label "Message ID ">
-<!ENTITY inReplyToField3.label "In reply to ">
-<!ENTITY originalWebsite3.label "Website ">
+<!ENTITY subjectField4.label "Subject">
+<!ENTITY ccField4.label "Cc">
+<!ENTITY bccField4.label "Bcc">
+<!ENTITY newsgroupsField4.label "Newsgroups">
+<!ENTITY followupToField4.label "Followup to">
+<!ENTITY tagsHdr4.label "Tags">
+<!ENTITY dateField4.label "Date">
+<!ENTITY userAgentField4.label "User agent">
+<!ENTITY referencesField4.label "References">
+<!ENTITY messageIdField4.label "Message ID">
+<!ENTITY inReplyToField4.label "In reply to">
+<!ENTITY originalWebsite4.label "Website">
 
 <!ENTITY editMessageDescription.label "This is a draft message">
 <!ENTITY editMessageButton.label "Edit…">
 <!ENTITY hdrArchiveButton1.label "Archive">
 <!ENTITY hdrArchiveButton1.tooltip "Archive this message">
 <!ENTITY hdrSmartReplyButton1.label "Smart Reply">
 <!ENTITY hdrReplyButton1.label "Reply">
 <!ENTITY hdrReplyButton2.tooltip "Reply to the sender of this message">
--- a/mail/themes/linux/mail/messageHeader.css
+++ b/mail/themes/linux/mail/messageHeader.css
@@ -367,17 +367,17 @@ toolbarpaletteitem #hdrDummyReplyButton 
 }
 
 .headerName {
   color: #888a85; /* lower contrast */
   text-align: right;
   background-color: transparent;
   padding: 0px;
   margin-top: 0;
-  -moz-margin-end: 0;
+  -moz-margin-end: 3px;
 }
 
 .headerValueBox {
   overflow:visible;
   margin-bottom: 0 !important;
   padding-bottom: 0 !important;
 }
 
--- a/mail/themes/osx/mail/messageHeader.css
+++ b/mail/themes/osx/mail/messageHeader.css
@@ -512,17 +512,17 @@ toolbarpaletteitem #hdrDummyReplyButton 
 
 .headerName {
   color: #A1A1A1; /* lower contrast */
   font-weight: bold;
   text-align: right;
   background-color: transparent;
   padding: 0px;
   margin-top: 0;
-  -moz-margin-end: 0;
+  -moz-margin-end: 3px;
 }
 
 .headerValueBox {
   overflow: visible;
   margin-bottom: 0 !important;
   padding-bottom: 0 !important;
 }
 
--- a/mail/themes/windows/mail/messageHeader-aero.css
+++ b/mail/themes/windows/mail/messageHeader-aero.css
@@ -498,17 +498,17 @@ toolbarpaletteitem .msgHeaderView-button
 }
 
 .headerName {
   color: #888a85; /* lower contrast */
   text-align: right;
   background-color: transparent;
   padding: 0px;
   margin-top: 0;
-  -moz-margin-end: 0;
+  -moz-margin-end: 3px;
 }
 
 .headerValueBox {
   overflow:visible;
   margin-bottom: 0 !important;
   padding-bottom: 0 !important;
 }
 
--- a/mail/themes/windows/mail/messageHeader.css
+++ b/mail/themes/windows/mail/messageHeader.css
@@ -419,17 +419,17 @@ toolbarpaletteitem .msgHeaderView-button
 
 .headerName {
   color: windowtext;
   opacity: 0.5; /* lower contrast */
   text-align: right;
   background-color: transparent;
   padding: 0px;
   margin-top: 0;
-  -moz-margin-end: 0;
+  -moz-margin-end: 3px;
 }
 
 .headerValueBox {
   overflow:visible;
   margin-bottom: 0 !important;
   padding-bottom: 0 !important;
 }