From 213d244ab33907606c8d1a08a9fad79ad47ff75e Mon Sep 17 00:00:00 2001
From: "mattwillis%gmail.com"
 <mattwillis%gmail.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 22 Dec 2004 16:05:09 +0000
Subject: [PATCH] bug 275059 move width of date/timepickers to css r=mattwillis

git-svn-id: svn://10.0.0.236/trunk@166956 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../content/datetimepickers/datepicker.xbl          |  2 +-
 .../content/datetimepickers/timepicker.xbl          |  2 +-
 .../skin/classic/datetimepickers/datepicker.css     | 13 ++++++++++---
 .../skin/classic/datetimepickers/timepicker.css     | 10 ++++------
 .../skin/modern/datetimepickers/datepicker.css      | 13 ++++++++++---
 .../skin/modern/datetimepickers/timepicker.css      | 10 ++++------
 6 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/mozilla/calendar/resources/content/datetimepickers/datepicker.xbl b/mozilla/calendar/resources/content/datetimepickers/datepicker.xbl
index 83aa26c924e..59d0da0b029 100755
--- a/mozilla/calendar/resources/content/datetimepickers/datepicker.xbl
+++ b/mozilla/calendar/resources/content/datetimepickers/datepicker.xbl
@@ -96,7 +96,7 @@
           node that interferes with navigation to interior nodes.] -->
         <content id="content">
           <xul:hbox flex="1" id="hbox" class="datepicker-box-class">
-            <xul:menulist editable="true" sizetopopup="false" style="width:11em"
+            <xul:menulist editable="true" sizetopopup="false"
                           id="datepicker-text"
                           class="datepicker-text-class"
                           onkeypress="if (event.keyCode == 13) this.kDatePicker.parseTextBoxDate(true);"
diff --git a/mozilla/calendar/resources/content/datetimepickers/timepicker.xbl b/mozilla/calendar/resources/content/datetimepickers/timepicker.xbl
index 24351ba8868..38f5f6bc73c 100755
--- a/mozilla/calendar/resources/content/datetimepickers/timepicker.xbl
+++ b/mozilla/calendar/resources/content/datetimepickers/timepicker.xbl
@@ -107,7 +107,7 @@
           node that interferes with navigation to interior nodes.] -->
     <content id="content">
       <xul:hbox flex="1" id="hbox" class="timepicker-box-class">
-        <xul:menulist editable="true" sizetopopup="false" style="width:7em"
+        <xul:menulist editable="true" sizetopopup="false"
                       id="timepicker-text"
                       class="timepicker-text-class"
                       onkeypress="if (event.keyCode == 13) this.kTimePicker.parseTextBoxTime(true);"
diff --git a/mozilla/calendar/resources/skin/classic/datetimepickers/datepicker.css b/mozilla/calendar/resources/skin/classic/datetimepickers/datepicker.css
index d21aedd9a75..3f1cec8648d 100755
--- a/mozilla/calendar/resources/skin/classic/datetimepickers/datepicker.css
+++ b/mozilla/calendar/resources/skin/classic/datetimepickers/datepicker.css
@@ -34,12 +34,19 @@
  * ***** END LICENSE BLOCK ***** */
 
 /*--------------------------------------------------------------------
- *   Date button (modified from skin/eventDialog.css)
+ *   Datepicker (text field with minimonth popup)
  *-------------------------------------------------------------------*/
-
+ 
+/* flex box around menulist */
 .datepicker-box-class {
 }
-
+ 
+/* menulist */
 .datepicker-text-class {
+  width: 11em;
+}
+
+/* text input field */
+.datepicker-text-class input {
 }
 
diff --git a/mozilla/calendar/resources/skin/classic/datetimepickers/timepicker.css b/mozilla/calendar/resources/skin/classic/datetimepickers/timepicker.css
index f154ec38853..69634511c5f 100755
--- a/mozilla/calendar/resources/skin/classic/datetimepickers/timepicker.css
+++ b/mozilla/calendar/resources/skin/classic/datetimepickers/timepicker.css
@@ -13,8 +13,7 @@
  *
  * The Original Code is OEone Calendar Code, released October 31st, 2001.
  *
- * The Initial Developer of the Original Code is
- * OEone Corporation.
+ * The Initial Developer of the Original Code is OEone Corporation.
  * Portions created by the Initial Developer are Copyright (C) 2001
  * the Initial Developer. All Rights Reserved.
  *
@@ -35,20 +34,19 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-
-
 /*-------------------------------------------------------------------
- *   Time field and button (modified from skin/eventDialog.css)
+ *   Timepicker (text menulist with popup)
  *-------------------------------------------------------------------*/
 
 .timepicker-box-class {
 }
 
 .timepicker-text-class {
+  width: 8em;
 }
 
 /*-------------------------------------------------------------------
- *   popup (from timepicker/timepicker.css
+ *   popup (from timepicker/timepicker.css)
  *-------------------------------------------------------------------*/
 
 /* Box that occupies whole window */
diff --git a/mozilla/calendar/resources/skin/modern/datetimepickers/datepicker.css b/mozilla/calendar/resources/skin/modern/datetimepickers/datepicker.css
index 7b6c574685e..4ec79862f4b 100755
--- a/mozilla/calendar/resources/skin/modern/datetimepickers/datepicker.css
+++ b/mozilla/calendar/resources/skin/modern/datetimepickers/datepicker.css
@@ -34,12 +34,19 @@
  * ***** END LICENSE BLOCK ***** */
 
 /*--------------------------------------------------------------------
- *   Date field and button (modified from skin/eventDialog.css)
+ *   Datepicker (text field with minimonth popup)
  *-------------------------------------------------------------------*/
-
+ 
+/* flex box around menulist */
 .datepicker-box-class {
 }
-
+ 
+/* menulist */
 .datepicker-text-class {
+  width:11em;
+}
+
+/* text input field */
+.datepicker-text-class input {
 }
 
diff --git a/mozilla/calendar/resources/skin/modern/datetimepickers/timepicker.css b/mozilla/calendar/resources/skin/modern/datetimepickers/timepicker.css
index 5f1b45e59e6..2545b1dddfe 100755
--- a/mozilla/calendar/resources/skin/modern/datetimepickers/timepicker.css
+++ b/mozilla/calendar/resources/skin/modern/datetimepickers/timepicker.css
@@ -13,8 +13,7 @@
  *
  * The Original Code is OEone Calendar Code, released October 31st, 2001.
  *
- * The Initial Developer of the Original Code is
- * OEone Corporation.
+ * The Initial Developer of the Original Code is OEone Corporation.
  * Portions created by the Initial Developer are Copyright (C) 2001
  * the Initial Developer. All Rights Reserved.
  *
@@ -35,20 +34,19 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-
-
 /*-------------------------------------------------------------------
- *   Time field and button (modified from skin/eventDialog.css)
+ *   Timepicker (text menulist with popup)
  *-------------------------------------------------------------------*/
 
 .timepicker-box-class {
 }
 
 .timepicker-text-class {
+  width: 8em;
 }
 
 /*-------------------------------------------------------------------
- *   popup (from timepicker/timepicker.css
+ *   popup (from timepicker/timepicker.css)
  *-------------------------------------------------------------------*/
 
 /* Box that occupies whole window */