Bug 1556122 - Restore the inline-toolbox class on some <vbox id="*-toolbox">. r=mkmelin
authorRichard Marti <richard.marti@gmail.com>
Sat, 01 Jun 2019 13:17:31 +0200
changeset 35740 199071a3bf1634a4b79a0471eaf64ea27d0b1717
parent 35739 28e2abca59382f70c626b826d5304468676cd3cb
child 35741 5d14d6540a92fba46b3aa40959baae535a5eedac
push id392
push userclokep@gmail.com
push dateMon, 02 Sep 2019 20:17:19 +0000
reviewersmkmelin
bugs1556122
Bug 1556122 - Restore the inline-toolbox class on some <vbox id="*-toolbox">. r=mkmelin
calendar/base/themes/common/calendar-task-view.css
calendar/base/themes/linux/calendar-task-view.css
calendar/base/themes/windows/calendar-task-view.css
calendar/lightning/content/imip-bar-overlay.xul
mail/base/content/msgAttachmentView.inc.xul
mail/base/content/msgHdrView.inc.xul
--- a/calendar/base/themes/common/calendar-task-view.css
+++ b/calendar/base/themes/common/calendar-task-view.css
@@ -125,47 +125,16 @@
 }
 
 #unifinder-todo-tree > .calendar-task-tree {
     margin-bottom: 3px;
 }
 
 /* ::::: task actions toolbar ::::: */
 
-#task-actions-toolbar toolbarpaletteitem toolbarseparator,
-#task-actions-toolbar toolbarseparator {
-    height: 26px;
-}
-
-#task-actions-toolbar toolbarspacer {
-    height: 20px;
-}
-
-window[toolboxId="task-actions-toolbox"] #wrapper-spring {
-    display: none;
-}
-
-window[toolboxId="task-actions-toolbox"] #smallicons,
-window[toolboxId="task-actions-toolbox"] button[icon="add"] {
-    display: none;
-}
-
-window[toolboxId="task-actions-toolbox"] #modelist menuitem:first-child {
-    display: none;
-}
-
-#task-actions-toolbox[doCustomization] {
-    background: grey;
-}
-
-#task-actions-toolbox[doCustomization] #task-actions-toolbar {
-    min-width: 100px;
-    min-height: 24px;
-}
-
 #calendar-add-task-button {
     margin-inline-start: 5px;
     list-style-image: url(chrome://calendar-common/skin/icons/newtask.svg);
     -moz-image-region: rect(0 16px 16px 0);
     -moz-context-properties: fill, fill-opacity;
     fill: currentColor;
     fill-opacity: var(--toolbarbutton-icon-fill-opacity);
 }
--- a/calendar/base/themes/linux/calendar-task-view.css
+++ b/calendar/base/themes/linux/calendar-task-view.css
@@ -39,20 +39,11 @@
 }
 
 #task-text-filter-field {
     margin: 5px;
 }
 
 /* ::::: task actions toolbar ::::: */
 
-#task-actions-toolbox {
-    -moz-appearance: none;
-}
-
-#task-actions-toolbar {
-    min-height: 0;
-    padding: 0;
-}
-
 #calendar-add-task-button[disabled="true"] {
     fill-opacity: 0.4;
 }
--- a/calendar/base/themes/windows/calendar-task-view.css
+++ b/calendar/base/themes/windows/calendar-task-view.css
@@ -32,25 +32,16 @@
 }
 
 #task-text-filter-field .textbox-search-icons {
     margin-bottom: -1px;
 }
 
 /* ::::: task actions toolbar ::::: */
 
-#task-actions-toolbox {
-    -moz-appearance: none;
-}
-
-#task-actions-toolbar {
-    min-height: 0;
-    padding: 0;
-}
-
 #calendar-add-task-button[disabled="true"] {
     fill-opacity: 0.4;
 }
 
 #view-task-edit-field,
 #task-text-filter-field {
     width: 15em;
 }
--- a/calendar/lightning/content/imip-bar-overlay.xul
+++ b/calendar/lightning/content/imip-bar-overlay.xul
@@ -56,17 +56,17 @@
              -    * bubbling up of events from menuitems to toolbarbutton must be prevented
              -      by adding a trailing "if (event.target.id == this.id) " to the respective
              -      ltnImipBar.executeAction(...)
              -    * toolbarbutton's oncommand should end with the first menuitem's oncommand
              -      to not break automated conforming
              -      e.g. "if (event.target.id == this.id) ltnImipBar.executeAction('ACCEPTED');"
              -      and "ltnImipBar.executeAction('ACCEPTED');"
              //-->
-          <vbox id="imip-view-toolbox">
+          <vbox id="imip-view-toolbox" class="inline-toolbox">
             <hbox id="imip-view-toolbar">
 
               <!-- show event/invitation details -->
               <toolbarbutton id="imipDetailsButton"
                              label="&lightning.imipbar.btnDetails.label;"
                              tooltiptext="&lightning.imipbar.btnDetails.tooltiptext;"
                              class="toolbarbutton-1 msgHeaderView-button imipDetailsButton"
                              oncommand="ltnImipBar.executeAction('X-SHOWDETAILS')"
--- a/mail/base/content/msgAttachmentView.inc.xul
+++ b/mail/base/content/msgAttachmentView.inc.xul
@@ -22,17 +22,17 @@
                                    ondragstart="nsDragAndDrop.startDrag(event, attachmentNameDNDObserver);"/>
                             <label id="attachmentSize"/>
                           </hbox>
                           <!-- Use a very large flex value here so that attachmentCount doesn't take
                                up more space than necessary, but still crops itself if there's not
                                enough space. -->
                           <spacer flex="9999"/>
 
-                          <vbox id="attachment-view-toolbox">
+                          <vbox id="attachment-view-toolbox" class="inline-toolbox">
                             <hbox id="attachment-view-toolbar"
                                   context="attachment-toolbar-context-menu">
                               <toolbaritem id="attachmentSaveAll"
                                            title="&saveAllAttachmentsButton1.label;">
                                 <toolbarbutton is="toolbarbutton-menu-button" id="attachmentSaveAllSingle"
                                                type="menu-button"
                                                class="toolbarbutton-1 msgHeaderView-button"
                                                label="&saveAttachmentButton1.label;"
--- a/mail/base/content/msgHdrView.inc.xul
+++ b/mail/base/content/msgHdrView.inc.xul
@@ -13,17 +13,17 @@
                             <vbox id="expandedHeadersBox" flex="1">
 
                               <!-- This hbox has display:block set to imbue it with the HTML layout
                                    model. This lets us float the message header toolbar to the right
                                    so we don't waste space when the From field and the toolbar could
                                    fit alongside each other. -->
                               <hbox id="expandedHeadersTopBox" flex="1">
 
-                                <vbox id="header-view-toolbox">
+                                <vbox id="header-view-toolbox" class="inline-toolbox">
                                   <hbox id="header-view-toolbar">
                                     <!-- XXXdmose need to move these commands to a controller, either
                                          on the header view, the message pane, or the default
                                          controller -->
 
                                     <!-- XXXdmose need to audit our shortcut/a11y setup and make sure
                                          these buttons are doing the right thing -->