Bug 654754 - Attachment pane cropped in composition window when using HTML mode with small window width; r=bwinton ui-r=andreasn
authorRichard Marti <richard.marti@gmail.com>
Thu, 19 May 2011 08:44:52 +0100
changeset 7791 f40b3d53a3858e7b4c1fd1f91b0cf93c6190e745
parent 7790 dfd0157bf4cf43a1227a6696e96a0fd5b9e5e397
child 7792 184b63b572e1b07cbfefbc60a3a118f66e1e04c5
push id1
push userbugzilla@standard8.plus.com
push dateFri, 20 May 2011 16:03:29 +0000
treeherdercomm-beta@9f2029d7b5ff [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbwinton, andreasn
bugs654754
Bug 654754 - Attachment pane cropped in composition window when using HTML mode with small window width; r=bwinton ui-r=andreasn
mail/components/compose/content/messengercompose.xul
mail/themes/gnomestripe/mail/compose/messengercompose.css
mail/themes/pinstripe/mail/compose/messengercompose.css
mail/themes/qute/mail/compose/messengercompose-aero.css
mail/themes/qute/mail/compose/messengercompose.css
--- a/mail/components/compose/content/messengercompose.xul
+++ b/mail/components/compose/content/messengercompose.xul
@@ -760,82 +760,79 @@
                    onkeypress="if (event.keyCode == 8 || event.keyCode == 46) RemoveSelectedAttachment();"
                    onclick="AttachmentBucketClicked(event);"
                    ondraggesture="nsDragAndDrop.startDrag(event, attachmentBucketDNDObserver);"/>
         </vbox>
       </hbox>
     </toolbar>   
 
     <!-- These toolbar items get filled out from the editorOverlay -->
-    <hbox id="FormatToolbar-box">
-      <hbox style="&headersSpace.style;"/>
-      <toolbar class="chromeclass-toolbar" id="FormatToolbar" persist="collapsed"
-               customizable="true" nowindowdrag="true">
-        <toolbaritem id="paragraph-select-container"/>
-        <toolbaritem id="font-face-select-container"/>
-        <toolbaritem id="color-buttons-container"
-                     disableoncustomize="true"/>
-        <toolbarbutton id="DecreaseFontSizeButton"/>
-        <toolbarbutton id="IncreaseFontSizeButton"/>
-        <toolbarseparator class="toolbarseparator-standard"/>
-        <toolbarbutton id="boldButton"/>
-        <toolbarbutton id="italicButton"/>
-        <toolbarbutton id="underlineButton"/>
-        <toolbarseparator class="toolbarseparator-standard"/>
-        <toolbarbutton id="ulButton"/>
-        <toolbarbutton id="olButton"/>
-        <toolbarbutton id="outdentButton"/>
-        <toolbarbutton id="indentButton"/>
-        <toolbarseparator class="toolbarseparator-standard"/>
-        <toolbarbutton id="AlignPopupButton"/>
-        <toolbarbutton id="InsertPopupButton"/>
-        <toolbarbutton id="smileButtonMenu"
-                       class="formatting-button"
-                       tooltiptext="&SmileButton.tooltip;"
-                       padwithspace="true"
-                       type="menu"
-                       observes="cmd_smiley">
-          <menupopup id="smilyPopup">
-            <menuitem id="smileySmile" class="menuitem-iconic" label="&smiley1Cmd.label;" 
-                      oncommand="doStatefulCommand('cmd_smiley', ':-)'  )"/>
-            <menuitem id="smileyFrown" class="menuitem-iconic" label="&smiley2Cmd.label;"
-                      oncommand="doStatefulCommand('cmd_smiley', ':-('  )"/>
-            <menuitem id="smileyWink" class="menuitem-iconic" label="&smiley3Cmd.label;"
-                      oncommand="doStatefulCommand('cmd_smiley', ';-)'  )"/>
-            <menuitem id="smileyTongue" class="menuitem-iconic" label="&smiley4Cmd.label;"
-                      oncommand="doStatefulCommand('cmd_smiley', ':-P'  )"/>
-            <menuitem id="smileyLaughing" class="menuitem-iconic" label="&smiley5Cmd.label;"
-                      oncommand="doStatefulCommand('cmd_smiley', ':-D'  )"/>
-            <menuitem id="smileyEmbarassed" class="menuitem-iconic" label="&smiley6Cmd.label;"
-                      oncommand="doStatefulCommand('cmd_smiley', ':-['  )"/>
-            <menuitem id="smileyUndecided" class="menuitem-iconic" label="&smiley7Cmd.label;"
-                      oncommand="doStatefulCommand('cmd_smiley', ':-\\' )"/>
-            <menuitem id="smileySurprise" class="menuitem-iconic" label="&smiley8Cmd.label;"
-                      oncommand="doStatefulCommand('cmd_smiley', '=-O' )"/>
-            <menuitem id="smileyKiss" class="menuitem-iconic" label="&smiley9Cmd.label;"
-                      oncommand="doStatefulCommand('cmd_smiley', ':-*' )"/>
-            <menuitem id="smileyYell" class="menuitem-iconic" label="&smiley10Cmd.label;"
-                      oncommand="doStatefulCommand('cmd_smiley', '>:o' )"/>
-            <menuitem id="smileyCool" class="menuitem-iconic" label="&smiley11Cmd.label;"
-                      oncommand="doStatefulCommand('cmd_smiley', '8-)' )"/>
-            <menuitem id="smileyMoney" class="menuitem-iconic" label="&smiley12Cmd.label;"
-                      oncommand="doStatefulCommand('cmd_smiley', ':-$' )"/>
-            <menuitem id="smileyFoot" class="menuitem-iconic" label="&smiley13Cmd.label;"
-                      oncommand="doStatefulCommand('cmd_smiley', ':-!' )"/>
-            <menuitem id="smileyInnocent" class="menuitem-iconic" label="&smiley14Cmd.label;"
-                      oncommand="doStatefulCommand('cmd_smiley', 'O:-)' )"/>
-            <menuitem id="smileyCry" class="menuitem-iconic" label="&smiley15Cmd.label;"
-                      oncommand="doStatefulCommand('cmd_smiley', ':\'(' )"/>
-            <menuitem id="smileySealed" class="menuitem-iconic" label="&smiley16Cmd.label;"
-                      oncommand="doStatefulCommand('cmd_smiley', ':-X' )"/>
-          </menupopup>
-        </toolbarbutton>
-        <spacer flex="1"/>
-      </toolbar>
-    </hbox>
+    <toolbar class="chromeclass-toolbar" id="FormatToolbar" persist="collapsed"
+             customizable="true" nowindowdrag="true">
+      <toolbaritem id="paragraph-select-container"/>
+      <toolbaritem id="font-face-select-container"/>
+      <toolbaritem id="color-buttons-container"
+                   disableoncustomize="true"/>
+      <toolbarbutton id="DecreaseFontSizeButton"/>
+      <toolbarbutton id="IncreaseFontSizeButton"/>
+      <toolbarseparator class="toolbarseparator-standard"/>
+      <toolbarbutton id="boldButton"/>
+      <toolbarbutton id="italicButton"/>
+      <toolbarbutton id="underlineButton"/>
+      <toolbarseparator class="toolbarseparator-standard"/>
+      <toolbarbutton id="ulButton"/>
+      <toolbarbutton id="olButton"/>
+      <toolbarbutton id="outdentButton"/>
+      <toolbarbutton id="indentButton"/>
+      <toolbarseparator class="toolbarseparator-standard"/>
+      <toolbarbutton id="AlignPopupButton"/>
+      <toolbarbutton id="InsertPopupButton"/>
+      <toolbarbutton id="smileButtonMenu"
+                     class="formatting-button"
+                     tooltiptext="&SmileButton.tooltip;"
+                     padwithspace="true"
+                     type="menu"
+                     observes="cmd_smiley">
+        <menupopup id="smilyPopup">
+          <menuitem id="smileySmile" class="menuitem-iconic" label="&smiley1Cmd.label;" 
+                    oncommand="doStatefulCommand('cmd_smiley', ':-)'  )"/>
+          <menuitem id="smileyFrown" class="menuitem-iconic" label="&smiley2Cmd.label;"
+                    oncommand="doStatefulCommand('cmd_smiley', ':-('  )"/>
+          <menuitem id="smileyWink" class="menuitem-iconic" label="&smiley3Cmd.label;"
+                    oncommand="doStatefulCommand('cmd_smiley', ';-)'  )"/>
+          <menuitem id="smileyTongue" class="menuitem-iconic" label="&smiley4Cmd.label;"
+                    oncommand="doStatefulCommand('cmd_smiley', ':-P'  )"/>
+          <menuitem id="smileyLaughing" class="menuitem-iconic" label="&smiley5Cmd.label;"
+                    oncommand="doStatefulCommand('cmd_smiley', ':-D'  )"/>
+          <menuitem id="smileyEmbarassed" class="menuitem-iconic" label="&smiley6Cmd.label;"
+                    oncommand="doStatefulCommand('cmd_smiley', ':-['  )"/>
+          <menuitem id="smileyUndecided" class="menuitem-iconic" label="&smiley7Cmd.label;"
+                    oncommand="doStatefulCommand('cmd_smiley', ':-\\' )"/>
+          <menuitem id="smileySurprise" class="menuitem-iconic" label="&smiley8Cmd.label;"
+                    oncommand="doStatefulCommand('cmd_smiley', '=-O' )"/>
+          <menuitem id="smileyKiss" class="menuitem-iconic" label="&smiley9Cmd.label;"
+                    oncommand="doStatefulCommand('cmd_smiley', ':-*' )"/>
+          <menuitem id="smileyYell" class="menuitem-iconic" label="&smiley10Cmd.label;"
+                    oncommand="doStatefulCommand('cmd_smiley', '>:o' )"/>
+          <menuitem id="smileyCool" class="menuitem-iconic" label="&smiley11Cmd.label;"
+                    oncommand="doStatefulCommand('cmd_smiley', '8-)' )"/>
+          <menuitem id="smileyMoney" class="menuitem-iconic" label="&smiley12Cmd.label;"
+                    oncommand="doStatefulCommand('cmd_smiley', ':-$' )"/>
+          <menuitem id="smileyFoot" class="menuitem-iconic" label="&smiley13Cmd.label;"
+                    oncommand="doStatefulCommand('cmd_smiley', ':-!' )"/>
+          <menuitem id="smileyInnocent" class="menuitem-iconic" label="&smiley14Cmd.label;"
+                    oncommand="doStatefulCommand('cmd_smiley', 'O:-)' )"/>
+          <menuitem id="smileyCry" class="menuitem-iconic" label="&smiley15Cmd.label;"
+                    oncommand="doStatefulCommand('cmd_smiley', ':\'(' )"/>
+          <menuitem id="smileySealed" class="menuitem-iconic" label="&smiley16Cmd.label;"
+                    oncommand="doStatefulCommand('cmd_smiley', ':-X' )"/>
+        </menupopup>
+      </toolbarbutton>
+      <spacer flex="1"/>
+    </toolbar>
   </toolbox>
 
   <splitter id="compose-toolbar-sizer" onmousedown="awSizerListen()"/>
 
   <!-- The mail message body frame -->
   <vbox id="appcontent" flex="1">
     <editor type="content-primary" id="content-frame" src="about:blank" name="browser.message.body" flex="1"
             context="msgComposeContext"/>
--- a/mail/themes/gnomestripe/mail/compose/messengercompose.css
+++ b/mail/themes/gnomestripe/mail/compose/messengercompose.css
@@ -338,24 +338,16 @@ toolbar[iconsize="small"] #paste-button[
 }
 
 #MsgHeadersToolbar {
   min-height: 132px;
 }
 
 /* ::::: format toolbar ::::: */
 
-#FormatToolbar-box{
-  -moz-appearance: toolbar;
-}
-
-#FormatToolbar {
-  -moz-appearance: none;
-}
-
 toolbarbutton.formatting-button {
   list-style-image: url("chrome://messenger/skin/messengercompose/format-buttons.png");
 }
 
 #FormatToolbar > toolbarbutton > .toolbarbutton-text {
   display: none;
 }
 
--- a/mail/themes/pinstripe/mail/compose/messengercompose.css
+++ b/mail/themes/pinstripe/mail/compose/messengercompose.css
@@ -495,18 +495,17 @@ treechildren::-moz-tree-image(remote-err
   text-align: start;
 }
 
 /* ::::: format toolbar ::::: */
 
 #FormatToolbar {
   border-bottom: none;
   background-image: none;
-  -moz-margin-start: 5px;
-  padding-top: 2px;
+  padding-top: 5px;
 }
 
 toolbarbutton.formatting-button {
   height: 26px;
   padding: 3px 0px 2px;
   margin: 0px;
   border-left: 0px;
   border-right: 0px;
--- a/mail/themes/qute/mail/compose/messengercompose-aero.css
+++ b/mail/themes/qute/mail/compose/messengercompose-aero.css
@@ -50,26 +50,24 @@
 /* :::: Toolbar :::: */
 
 #compose-toolbox {
   -moz-appearance: none;
   border-top: none;
   background-color: transparent;
 }
 
-toolbar:not(:-moz-lwtheme),
-#FormatToolbar-box:not(:-moz-lwtheme) {
+toolbar:not(:-moz-lwtheme) {
   -moz-appearance: none;
   border: none;
   background-color: -moz-Dialog;
 }
 
 @media all and (-moz-windows-default-theme) {
-  toolbar:not(:-moz-lwtheme),
-  #FormatToolbar-box:not(:-moz-lwtheme) {
+  toolbar:not(:-moz-lwtheme) {
     background-color: rgb(207, 219, 236);
   }
 }
 
 #compose-toolbox > toolbar:first-child:not(:-moz-lwtheme) {
   background-image: -moz-linear-gradient(rgba(255, 255, 255, .5),
                     rgba(255, 255, 255, .0));
 }
@@ -454,16 +452,20 @@ toolbox[labelalign="end"] > toolbar[mode
 .menulist-dropmarker {
   -moz-appearance: none;
   border:none;
   background-color: transparent;
 }
 
 /* ::::: format toolbar ::::: */
 
+#FormatToolbar {
+  padding-top: 3px;
+}
+
 toolbarbutton.formatting-button {
   list-style-image: url("chrome://messenger/skin/messengercompose/format-buttons.png");
 }
 
 #FormatToolbar > toolbarbutton > .toolbarbutton-text {
   display: none;
 }
 
--- a/mail/themes/qute/mail/compose/messengercompose.css
+++ b/mail/themes/qute/mail/compose/messengercompose.css
@@ -439,27 +439,20 @@ toolbar[iconsize="small"] #paste-button[
 }
 
 .aw-menulist > .menulist-label-box > .menulist-label {
   margin: 0 1px !important;
 }
 
 #MsgHeadersToolbar {
   min-height: 132px;
-  border-bottom-width: 0;
 }
 
 /* ::::: format toolbar ::::: */
 
-#FormatToolbar {
-  -moz-appearance: none;
-  border-top: none;
-  border-bottom: none;
-}
-
 toolbarbutton.formatting-button {
   list-style-image: url("chrome://messenger/skin/messengercompose/format-buttons.png");
 }
  
 #FormatToolbar > toolbarbutton > .toolbarbutton-text {
   display: none;
 }