Bug 1386238 - Multi-select boxes broken by bug 1366143

This reverts commit 3d864bdde0aff3931aca3afa864228341aaa0e92.

5 files changed, 16 insertions, 46 deletions

diff --git a/extensions/BugModal/web/bug_modal.css b/extensions/BugModal/web/bug_modal.css
index ae35b739f..36e556efe 100644
--- a/extensions/BugModal/web/bug_modal.css
+++ b/extensions/BugModal/web/bug_modal.css
@@ -191,7 +191,7 @@ a.activity-ref {
     width: 100px;
     min-width: 100px;
     text-align: right;
-    vertical-align: middle;
+    vertical-align: top;
     padding-right: 10px;
     color: #666;
 }
@@ -283,7 +283,7 @@ input[type="number"] {
 #duplicate-container, #duplicate-actions, #assigned-container,
 #bottom-duplicate-container, #bottom-duplicate-actions {
     display: table-cell;
-    vertical-align: middle;
+    vertical-align: top;
     padding-left: 8px;
 }
 
diff --git a/extensions/BugModal/web/common_bug_modal.css b/extensions/BugModal/web/common_bug_modal.css
index 7eeefd6ff..fe64da3bd 100644
--- a/extensions/BugModal/web/common_bug_modal.css
+++ b/extensions/BugModal/web/common_bug_modal.css
@@ -174,7 +174,7 @@ a.activity-ref {
 
 .module .field {
     margin-top: 4px;
-    vertical-align: baseline;
+    vertical-align: top;
     display: table;
     width: 100%;
 }
@@ -187,7 +187,7 @@ a.activity-ref {
     width: 100px;
     min-width: 100px;
     text-align: right;
-    vertical-align: middle;
+    vertical-align: top;
     padding-right: 10px;
     color: #666;
 }
@@ -279,7 +279,7 @@ input[type="number"] {
 #duplicate-container, #duplicate-actions, #assigned-container,
 #bottom-duplicate-container, #bottom-duplicate-actions {
     display: table-cell;
-    vertical-align: middle;
+    vertical-align: top;
     padding-left: 8px;
 }
 
diff --git a/skins/standard/global.css b/skins/standard/global.css
index 0772047c5..e6f63a927 100644
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@@ -546,7 +546,7 @@ div.user_match {
 
 .field_label {
     text-align: right;
-    vertical-align: middle;
+    vertical-align: top;
     font-weight: bold;
 }
 .field_help_link {
@@ -830,7 +830,7 @@ a:hover, #header a:hover, #footer a:hover {
     color: #00539f;
 }
 
-select, textarea, input[type=text], input[type=password],
+select[multiple], textarea, input[type=text], input[type=password],
 input[type=email], input[type=url], input[type=number], input:not([type]), .text_input, .yui-ac-input {
     -moz-box-sizing: border-box;
     -webkit-box-sizing: border-box;
@@ -839,16 +839,16 @@ input[type=email], input[type=url], input[type=number], input:not([type]), .text
     border-radius: .25em;
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.1);
     background: white;
-    padding: 4px;
+    padding: 4px 3px 5px;
     color: #404040;
-    vertical-align: middle;
+    vertical-align: top;
 }
 
 select[multiple], .text_input, .yui-ac-input, input {
     font-size: 1em;
 }
 
-select:focus, textarea:focus, .text-input:focus, -yui-ac-input:focus, input:focus {
+select[multiple]:focus, textarea:focus, .text-input:focus, -yui-ac-input:focus, input:focus {
     border-color: #42a4e0;
     -webkit-box-shadow: 0 0 0 2px rgba(73,173,227,0.4);
     -moz-box-shadow: 0 0 0 2px rgba(73,173,227,0.4);
@@ -859,40 +859,6 @@ select, select[multiple] {
     font-size: 12px;
 }
 
-select:not([multiple]) {
-    -moz-appearance: none;
-    -webkit-appearance: none;
-    appearance: none;
-    min-width: 2em;
-    height: 26px;
-    padding-right: 18px;
-    background-image: url(material-icons/ic_unfold_more_18px.svg), linear-gradient(to bottom, #FFF, #EEE);
-    background-position: center right;
-    background-repeat: no-repeat;
-    background-size: 18px 18px, cover;
-    vertical-align: middle;
-}
-
-select:disabled:not([multiple]) {
-    opacity: .6;
-    cursor: not-allowed;
-}
-
-/* Hack to remove dotted outline on Firefox */
-select:-moz-focusring {
-    color: transparent;
-    text-shadow: 0 0 0 #000;
-}
-
-/* Remove the arrow icon on IE */
-select::-ms-expand {
-    display: none;
-}
-
-option {
-    padding: 2px 5px;
-}
-
 hr {
     border: none;
     height: 1px;
@@ -1582,6 +1548,10 @@ table.tabs {
 
 /* search */
 
+#summary_field.search_field_row input {
+    padding-bottom: 6px;
+}
+
 body {
     margin: 0;
     padding: 15px 15px 2px 15px;
diff --git a/skins/standard/material-icons/ic_unfold_more_18px.svg b/skins/standard/material-icons/ic_unfold_more_18px.svg
deleted file mode 100644
index ad95ff598..000000000
--- a/skins/standard/material-icons/ic_unfold_more_18px.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><path d="M9 4.12l2.38 2.38 1.06-1.06L9 2 5.56 5.44 6.62 6.5 9 4.12zm0 9.76L6.62 11.5l-1.06 1.06L9 16l3.44-3.44-1.06-1.06L9 13.88z"/></svg>
\ No newline at end of file
diff --git a/skins/standard/search_form.css b/skins/standard/search_form.css
index 77f220980..71ce22484 100644
--- a/skins/standard/search_form.css
+++ b/skins/standard/search_form.css
@@ -28,7 +28,7 @@
 
 #bug_id_container { 
   display: inline-block;
-  vertical-align: top;
+  vertical-align: middle;
   padding-bottom: 1ex;
 }
 
@@ -92,6 +92,7 @@
 #summary_field.search_field_row select
 {
   display: inline;
+  padding-bottom: 0;
   vertical-align: middle;
 }