MDL-69454 core_search: message search

diff --git a/message/templates/message_drawer_view_overview_header.mustache b/message/templates/message_drawer_view_overview_header.mustache
index 8d4b9a4..07c801c 100644 (file)
--- a/message/templates/message_drawer_view_overview_header.mustache
+++ b/message/templates/message_drawer_view_overview_header.mustache
@@ -35,19 +35,19 @@
 }}
 <div class="border-bottom  p-1 px-sm-2 py-sm-3" aria-hidden="false" {{^isdrawer}}data-in-panel="true"{{/isdrawer}} data-region="view-overview">
     <div class="d-flex align-items-center">
-        <div class="input-group">
-            <div class="input-group-prepend">
-                <span class="input-group-text pr-2 bg-white">
-                    {{#pix}} a/search, core {{/pix}}
-                </span>
-            </div>
+        <div class="input-group simplesearchform">
             <input
                 type="text"
-                class="form-control border-left-0"
+                class="form-control"
                 placeholder="{{#str}} search, core_search {{/str}}"
                 aria-label="{{#str}} search, core_search {{/str}}"
                 data-region="view-overview-search-input"
             >
+            <div class="input-group-append">
+                <span class="icon-no-margin btn btn-submit">
+                    {{#pix}} a/search, core {{/pix}}
+                </span>
+            </div>
         </div>
         <div class="ml-2">
             <a

diff --git a/message/templates/message_drawer_view_search_header.mustache b/message/templates/message_drawer_view_search_header.mustache
index b39202c..296110b 100644 (file)
--- a/message/templates/message_drawer_view_search_header.mustache
+++ b/message/templates/message_drawer_view_search_header.mustache
@@ -45,7 +45,7 @@
         >
             {{> core_message/message_drawer_icon_back }}
         </a>
-        <div class="input-group">
+        <div class="input-group simplesearchform">
             <input
                 type="text"
                 class="form-control"
@@ -55,7 +55,7 @@
             >
             <div class="input-group-append">
                 <button
-                    class="btn btn-outline-secondary"
+                    class="btn btn-submit icon-no-margin"
                     type="button"
                     data-action="search"
                     aria-label="{{#str}} search, core_search {{/str}}"