Bug 1413075 - Compose window header fields tweaks on Linux. r=alta88
authorRichard Marti <richard.marti@gmail.com>
Sat, 04 Nov 2017 11:03:55 +0100
changeset 29332 d75cff1a1a524c7499dd01bd8d8e1fd1b16eef36
parent 29331 88393c26b4210a43142076cc1e95e41e6dee5d14
child 29333 ab5f127c30be0571626bdd2abbb6c7560d2ba0bb
push id2068
push userclokep@gmail.com
push dateMon, 13 Nov 2017 19:02:14 +0000
treeherdercomm-beta@9c7e7ce8672b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersalta88
bugs1413075
Bug 1413075 - Compose window header fields tweaks on Linux. r=alta88
mail/components/compose/content/messengercompose.xul
mail/themes/linux/mail/compose/messengercompose.css
mail/themes/linux/mail/messenger.css
--- a/mail/components/compose/content/messengercompose.xul
+++ b/mail/components/compose/content/messengercompose.xul
@@ -919,17 +919,17 @@
     <toolbar id="MsgHeadersToolbar" persist="collapsed" flex="1"
              customizable="true" nowindowdrag="true"
              ondragover="nsDragAndDrop.dragOver(event, envelopeDragObserver);"
              ondrop="nsDragAndDrop.drop(event, envelopeDragObserver);"
              ondragexit="nsDragAndDrop.dragExit(event, envelopeDragObserver);">
       <hbox id="msgheaderstoolbar-box" flex="1">
         <vbox flex="1" id="addresses-box">
           <hbox id="top-gradient-box">
-            <hbox align="center" pack="end" style="&headersSpace.style;">
+            <hbox id="identityLabel-box" align="center" pack="end" style="&headersSpace.style;">
               <label id="identityLabel" value="&fromAddr.label;"
                      accesskey="&fromAddr.accesskey;" control="msgIdentity"/>
             </hbox>
             <menulist id="msgIdentity" type="description" flex="1"
                       disableautoselect="true" onkeypress="fromKeyPress(event);"
                       oncommand="LoadIdentity(false);" disableonsend="true">
               <menupopup id="msgIdentityPopup"/>
             </menulist>
@@ -984,17 +984,17 @@
             </hbox>
             <textbox id="msgSubject" flex="1" class="toolbar" disableonsend="true" spellcheck="true"
                      oninput="gContentChanged=true;SetComposeWindowTitle();"
                      onkeypress="subjectKeyPress(event);" />
           </hbox>
         </vbox>
         <splitter id="attachmentbucket-sizer" collapsed="true" collapse="after"/>
         <vbox id="attachments-box" collapsed="true" persist="width">
-          <hbox>
+          <hbox id="attachments-header-box" align="center">
             <label id="attachmentBucketCount" control="attachmentBucket"
                    crop="right" accesskey="&attachments.accesskey;" flex="1"/>
             <label id="attachmentBucketSize"/>
           </hbox>
           <attachmentlist orient="vertical" id="attachmentBucket"
                           disableonsend="true"
                           seltype="multiple" flex="1" height="0"
                           context="msgComposeAttachmentListContext"
--- a/mail/themes/linux/mail/compose/messengercompose.css
+++ b/mail/themes/linux/mail/compose/messengercompose.css
@@ -171,22 +171,30 @@ menulist:-moz-locale-dir(rtl) > .menulis
 }
 
 /* ::::: special toolbar colors ::::: */
 
 #attachmentbucket-sizer {
   border-top: none;
 }
 
-#attachments-box {
-  padding-top: 5px;
+#attachments-header-box {
+  height: 24px;
+  margin-top: 1px;
+}
+
+#attachmentBucketCount {
+  margin-top: 0;
+  margin-bottom: 0;
 }
 
 #attachmentBucketSize {
   color: GrayText;
+  margin-top: 0;
+  margin-bottom: 0;
   padding-inline-end: 1px;
 }
 
 /* ::::: attachment reminder ::::: */
 
 #attachmentNotificationBox b {
   font-weight: bold;
 }
@@ -210,47 +218,41 @@ menulist:-moz-locale-dir(rtl) > .menulis
 /* XXX I should really have a selector rule here to select just .listcell-icon objects underneath the attachmentList listbox */
 
 .listcell-icon {
   margin-inline-start: 2px;
   margin-top: 2px;
 }
 
 #subjectLabel {
-  margin-inline-end: 7px;
+  margin-inline-end: 6px;
   padding-bottom: 1px;
 }
 
 #subject-box {
   margin-inline-start: -2px;
 }
 
 #msgSubject {
   -moz-appearance: none;
   margin-top: 0;
   margin-inline-start: 6px;
   margin-inline-end: 5px;
   background-color: inherit;
-  border: 2px solid transparent;
-  -moz-border-top-colors: none;
-  -moz-border-left-colors: none;
-  -moz-border-right-colors: none;
-  -moz-border-bottom-colors: ThreeDShadow ThreeDHighlight;
-  padding: 2px;
+  border: 1px solid transparent;
+  border-bottom-color: var(--toolbarbutton-hover-bordercolor);
+  padding: 4px 2px;
   padding-inline-start: 5px !important;
   transition: border .2s, background-color .2s;
 }
 
 #msgSubject:hover,
 #msgSubject[focused="true"] {
   background-color: -moz-field;
-  -moz-border-top-colors: ThreeDShadow ThreeDHighlight;
-  -moz-border-right-colors: ThreeDShadow ThreeDHighlight;
-  -moz-border-bottom-colors: ThreeDShadow ThreeDHighlight;
-  -moz-border-left-colors: ThreeDShadow ThreeDHighlight;
+  border-color: var(--toolbarbutton-hover-bordercolor);
 }
 
 /* ::::: autocomplete icons ::::: */
 
 treechildren::-moz-tree-image(local-abook) {
   margin-inline-start: 3px;
   margin-inline-end: 2px;
   list-style-image: url("chrome://messenger/skin/addressbook/icons/addrbook.png");
@@ -299,41 +301,36 @@ treechildren::-moz-tree-image(subscribed
 .addressingWidgetItem,
 .dummy-row {
   background-color: transparent !important;
   color: inherit !important;
 }
 
 .textbox-addressingWidget,
 .dummy-row-cell:not(:first-child) {
-  padding: 2px !important;
-  border: solid 2px transparent !important;
-  -moz-border-top-colors: none !important;
-  -moz-border-left-colors: none !important;
-  -moz-border-right-colors: none !important;
-  -moz-border-bottom-colors: ThreeDShadow ThreeDHighlight !important;
+  padding: 4px 2px !important;
+  border: solid 1px transparent !important;
+  border-bottom-color: var(--toolbarbutton-hover-bordercolor) !important;
   transition: border .2s, background-color .2s;
  }
 
 .addressingWidgetCell:first-child,
 .dummy-row-cell:first-child {
   border-bottom-color: transparent;
 }
 
 .textbox-addressingWidget[focused="true"],
 .textbox-addressingWidget:hover {
   background-color: -moz-field;
-  -moz-border-top-colors: ThreeDShadow ThreeDHighlight !important;
-  -moz-border-right-colors: ThreeDShadow ThreeDHighlight !important;
-  -moz-border-bottom-colors: ThreeDShadow ThreeDHighlight !important;
-  -moz-border-left-colors: ThreeDShadow ThreeDHighlight !important;
+  border-color: var(--toolbarbutton-hover-bordercolor) !important;
 }
 
 .aw-menulist {
   -moz-binding: url("chrome://messenger/content/messengercompose/menulistCompactBindings.xml#menulist-compact");
+  font: inherit;
   margin: 0;
   margin-inline-start: 5px;
   margin-inline-end: 7px;
   padding-inline-end: 0;
   outline: 1px solid transparent;
   outline-offset: -3px;
 }
 
@@ -397,40 +394,45 @@ treechildren::-moz-tree-image(subscribed
 #MsgHeadersToolbar {
   -moz-appearance: none !important;
   color: WindowText;
   text-shadow: none;
   background-image: url("chrome://messenger/skin/messengercompose/linux-noise.png");
   padding-top: 3px;
 }
 
+#identityLabel-box {
+  margin-top: 1px;
+}
+
+#identityLabel {
+  margin-bottom: 1px;
+  margin-inline-end: 8px
+}
+
 #msgIdentity {
   -moz-appearance: none;
   -moz-box-align: center;
   margin-right: 5px;
   margin-bottom: 0;
   padding-top: 1px;
   padding-bottom: 1px;
   padding-inline-start: 2px;
   background: transparent;
-  height: 22px;
-  line-height: 1;
-  border: 2px solid transparent;
-  -moz-border-bottom-colors: ThreeDShadow ThreeDHighlight;
+  font: inherit;
+  border: 1px solid transparent;
+  border-bottom-color: var(--toolbarbutton-hover-bordercolor);
   transition: border .2s, background-color .2s;
 }
 
 #msgIdentity:hover,
 #msgIdentity:focus,
 #msgIdentity[focused="true"] {
   background-color: -moz-field;
-  -moz-border-top-colors: ThreeDShadow ThreeDHighlight;
-  -moz-border-right-colors: ThreeDShadow ThreeDHighlight;
-  -moz-border-bottom-colors: ThreeDShadow ThreeDHighlight;
-  -moz-border-left-colors: ThreeDShadow ThreeDHighlight;
+  border-color: var(--toolbarbutton-hover-bordercolor);
 }
 
 #msgIdentity > .menulist-editable-box {
   -moz-appearance: none;
   padding-top: 0;
   padding-bottom: 0;
   padding-inline-start: 3px;
   padding-inline-end: 12px;
--- a/mail/themes/linux/mail/messenger.css
+++ b/mail/themes/linux/mail/messenger.css
@@ -51,17 +51,19 @@
 toolbar[brighttext] {
   --toolbarbutton-icon-fill-attention: #45a1ff;
 }
 
 #header-view-toolbar[brighttext],
 #ab-toolbox > toolbar[brighttext],
 .mail-toolbox > toolbar[brighttext],
 #event-toolbox > toolbar[brighttext],
-#compose-toolbox > toolbar[brighttext] {
+#compose-toolbox > toolbar[brighttext],
+#headers-box > toolbar[brighttext],
+#FormatToolbox > toolbar[brighttext]  {
   --toolbarbutton-text-color: #fff;
   --toolbarbutton-hover-background: rgba(255, 255, 255, .25);
   --toolbarbutton-hover-bordercolor: rgba(255, 255, 255, .5);
   --toolbarbutton-header-bordercolor: rgba(255, 255, 255, .25);
 
   --toolbarbutton-active-background: rgba(255, 255, 255, .4);
   --toolbarbutton-active-bordercolor: rgba(255, 255, 255, .7);
   --toolbarbutton-active-boxshadow: 0 0 0 1px rgba(255, 255, 255, .4) inset;