4 files changed, 52 insertions, 39 deletions

diff --git a/skins/standard/enter_bug.css b/skins/standard/enter_bug.css
index 2fd79baa4..bb8b05034 100644
--- a/skins/standard/enter_bug.css
+++ b/skins/standard/enter_bug.css
@@ -55,6 +55,11 @@
     max-width: 35em;
 }
 
+/* Text inputs need to be a little shorter on enter_bug
+ * than the 100% that they are on show_bug.
+ */
+#Create .field_value .text_input { max-width: 50em; }
+
 /* The Possible Duplicates table on enter_bug. */
 #possible_duplicates th {
     text-align: center; 
diff --git a/skins/standard/global.css b/skins/standard/global.css
index 8077ba8ea..c5dd62156 100644
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@@ -424,12 +424,6 @@ dl dl > dt {
     padding-left: 1em;
 }
 
-/* For bug fields */
-.uneditable_textarea {
-    width: 30em;
-    font-size: medium;
-}
-
 div.user_match {
     margin-bottom: 1em;
 }
@@ -462,6 +456,10 @@ div.user_match {
     }
 }
 
+/**************/
+/* Bug Fields */
+/**************/
+
 .field_label {
     text-align: right;
     vertical-align: top;
@@ -473,6 +471,16 @@ div.user_match {
 .field_value, form#Create th, form#Create td {
     vertical-align: top;
 }
+.field_value .text_input {
+  width: 100%;
+  min-width: 25em;
+}
+
+.uneditable_textarea {
+    width: 30em;
+    font-size: medium;
+}
+
 th.required:before {
     content: "* ";
 }
@@ -504,29 +512,6 @@ input.required, select.required, span.required_explanation {
     list-style-type: none;
 }
 
-.image_button {
-    background-repeat: no-repeat;
-    background-position: center center;
-    width: 30px;
-    height: 20px;
-}
-
-#select_button {
-    background-image: url(global/right.png);
-}
-
-#deselect_button {
-    background-image: url(global/left.png);
-}
-
-#up_button {
-    background-image: url(global/up.png);
-}
-
-#down_button {
-    background-image: url(global/down.png);
-}
-
 /* custom styles for inline instances of autocomplete input fields */
 .yui-skin-sam .yui-ac-input { position:static !important; 
                               vertical-align:middle !important;
@@ -559,3 +544,30 @@ input.required, select.required, span.required_explanation {
 .validation_error_field {
     border: 2px solid #152446;
 }
+
+/*****************/
+/* colchange.cgi */
+/*****************/
+
+.image_button {
+    background-repeat: no-repeat;
+    background-position: center center;
+    width: 30px;
+    height: 20px;
+}
+
+#select_button {
+    background-image: url(global/right.png);
+}
+
+#deselect_button {
+    background-image: url(global/left.png);
+}
+
+#up_button {
+    background-image: url(global/up.png);
+}
+
+#down_button {
+    background-image: url(global/down.png);
+}
diff --git a/skins/standard/show_bug.css b/skins/standard/show_bug.css
index 1768ddc42..04f87d647 100644
--- a/skins/standard/show_bug.css
+++ b/skins/standard/show_bug.css
@@ -13,10 +13,6 @@
 .bz_bug .edit_form table {
   width: 100%;
 }
-.bz_bug .edit_form .text_input {
-  width: 100%;
-  min-width: 25em;
-}
 .bz_bug #alias {
     min-width: 0;
     width: 10em;
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index fbf415d86..43fa1646e 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -311,7 +311,7 @@ TUI_hide_default('expert_fields');
   </tr>
   [% IF !Param('defaultplatform') || !Param('defaultopsys') %]
     <tr>
-      <td colspan="3">&nbsp;</th>
+      <th colspan="3">&nbsp;</th>
       <td id="os_guess_note" class="comment">
         <div>We've made a guess at your
         [% IF Param('defaultplatform') %]
@@ -485,9 +485,9 @@ TUI_hide_default('expert_fields');
     [% INCLUDE "bug/field-label.html.tmpl"
       field = bug_fields.bug_file_loc editable = 1
     %]
-    <td colspan="2">
-      <input name="bug_file_loc" size="40"
-             value="[% bug_file_loc FILTER html %]">
+    <td colspan="2" class="field_value">
+      <input name="bug_file_loc" id="bug_file_loc" class="text_input"
+             size="40" value="[% bug_file_loc FILTER html %]">
     </td>
   </tr>
 </tbody>
@@ -512,10 +512,10 @@ TUI_hide_default('expert_fields');
     [% INCLUDE "bug/field-label.html.tmpl"
       field = bug_fields.short_desc editable = 1
     %]
-    <td colspan="3">
+    <td colspan="3" class="field_value">
       <input name="short_desc" size="70" value="[% short_desc FILTER html %]"
              maxlength="255" spellcheck="true" aria-required="true"
-             class="required" id="short_desc">
+             class="required text_input" id="short_desc">
     </td>
   </tr>