Bug 1532595 - Fix display of textareas in calendar. r=Paenglab
authorGeoff Lankow <geoff@darktrojan.net>
Fri, 15 Mar 2019 16:25:27 +1300
changeset 26102 11f46ea9ea725e9ca1734c99653de83b18d68e3f
parent 26101 6560ce144a7188797f666c4acbe456d2ab30d3d2
child 26103 583bb771fcb62d1ef6f91e2a5dee6ce195aa85b0
push id15671
push usermozilla@jorgk.com
push dateFri, 15 Mar 2019 22:11:03 +0000
treeherdercomm-central@11f46ea9ea72 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersPaenglab
bugs1532595
Bug 1532595 - Fix display of textareas in calendar. r=Paenglab
calendar/base/content/calendar-task-view.xul
calendar/base/content/dialogs/calendar-summary-dialog.xul
calendar/base/themes/common/calendar-task-view.css
calendar/base/themes/common/dialogs/calendar-event-dialog.css
calendar/lightning/content/lightning-item-iframe.xul
--- a/calendar/base/content/calendar-task-view.xul
+++ b/calendar/base/content/calendar-task-view.xul
@@ -224,17 +224,17 @@
                          class="task-details-name"/>
                   <label id="calendar-task-details-repeat"
                          crop="end"
                          class="task-details-value"/>
                 </row>
               </rows>
             </grid>
           </hbox>
-          <hbox flex="1">
+          <hbox id="calendar-task-details-description-wrapper" flex="1">
             <html:textarea id="calendar-task-details-description"/>
           </hbox>
           <hbox id="calendar-task-details-attachment-row"
                align="top"
                hidden="true">
             <hbox pack="end">
               <label value="&calendar.task-details.attachments.label;"
                      class="task-details-name"/>
--- a/calendar/base/content/dialogs/calendar-summary-dialog.xul
+++ b/calendar/base/content/dialogs/calendar-summary-dialog.xul
@@ -352,19 +352,19 @@
   <!-- Description -->
   <box id="item-description-box" hidden="true" orient="vertical" flex="1">
     <spacer class="default-spacer"/>
     <hbox id="item-description-caption" class="calendar-caption" align="center">
       <label value="&read.only.description.label;"
              control="item-description" class="header"/>
       <separator class="groove" flex="1"/>
     </hbox>
-    <box orient="horizontal" flex="1">
+    <hbox id="item-description-wrapper" flex="1">
       <html:textarea id="item-description" rows="6" flex="1"/>
-    </box>
+    </hbox>
   </box>
 
   <!-- URL link -->
   <box id="event-grid-link-row" hidden="true" orient="vertical">
     <spacer class="default-spacer"/>
     <hbox id="event-grid-link-caption" class="calendar-caption" align="center">
       <label value="&read.only.link.label;"
              control="url-link" class="header"/>
--- a/calendar/base/themes/common/calendar-task-view.css
+++ b/calendar/base/themes/common/calendar-task-view.css
@@ -40,20 +40,23 @@
     border-color: var(--sidebar-border-color, hsla(0,0%,60%,.4));
 }
 
 :root[lwt-tree-brighttext] #task-addition-box,
 :root[lwt-tree-brighttext] #calendar-task-details-container {
     border-color: var(--sidebar-border-color, rgba(249,249,250,.2));
 }
 
+#calendar-task-details-description-wrapper {
+    display: flex;
+}
+
 #calendar-task-details-description {
-    -moz-appearance: textfield;
-    border: 1px solid;
-    margin: 0;
+    width: 100%;
+    box-sizing: border-box;
     font-family: serif;
     font-size: 16px;
 }
 
 .task-details-name {
     text-align: right;
     color: windowtext;
     opacity: 0.5; /* lower contrast */
--- a/calendar/base/themes/common/dialogs/calendar-event-dialog.css
+++ b/calendar/base/themes/common/dialogs/calendar-event-dialog.css
@@ -160,16 +160,26 @@ label.label {
 #event-grid-tabbox {
     margin: 5px 0;
 }
 
 #event-grid-tabbox #notify-options {
     padding: 0px 9px;
 }
 
+#event-grid-tabpanel-description {
+    display: flex;
+}
+
+#event-grid-tabpanel-description > #item-description {
+    width: 100%;
+    box-sizing: border-box;
+    min-height: 7em;
+}
+
 /*--------------------------------------------------------------------
  *   Event dialog keep duration button
  *-------------------------------------------------------------------*/
 
 #keepduration-button {
     list-style-image: url(chrome://calendar-common/skin/chain-unlock.svg);
     padding-top: 3px;
     padding-bottom: 3px;
@@ -644,19 +654,27 @@ freebusy-day > box {
 }
 
 #calendar-summary-dialog .item-attachment-cell-label,
 #calendar-event-summary-dialog .item-attachment-cell-label,
 #calendar-task-summary-dialog .item-attachment-cell-label {
     margin-left: 3px;
 }
 
+#calendar-summary-dialog #item-description-wrapper,
+#calendar-event-summary-dialog #item-description-wrapper,
+#calendar-task-summary-dialog #item-description-wrapper {
+    display: flex;
+}
+
 #calendar-summary-dialog #item-description,
 #calendar-event-summary-dialog #item-description,
 #calendar-task-summary-dialog #item-description {
+    width: 100%;
+    box-sizing: border-box;
     min-height: 54px;
 }
 
 #calendar-summary-dialog .selectable-label,
 #calendar-event-summary-dialog .selectable-label,
 #calendar-task-summary-dialog .selectable-label {
     background-color: inherit;
     color: inherit;
--- a/calendar/lightning/content/lightning-item-iframe.xul
+++ b/calendar/lightning/content/lightning-item-iframe.xul
@@ -581,19 +581,17 @@
                label="&event.attendees.label;"
                accesskey="&event.attendees.accesskey;"
                collapsed="true"/>
         </tabs>
         <tabpanels id="event-grid-tabpanels"
                    flex="1">
           <tabpanel id="event-grid-tabpanel-description">
             <html:textarea id="item-description"
-                           disable-on-readonly="true"
-                           flex="1"
-                           rows="12"/>
+                           disable-on-readonly="true"/>
           </tabpanel>
           <tabpanel id="event-grid-tabpanel-attachments">
             <vbox flex="1">
               <richlistbox id="attachment-link"
                            seltype="single"
                            context="attachment-popup"
                            rows="3"
                            flex="1"