2 files changed, 5 insertions(+), 3 deletions(-)

M src/wiki/templates/wiki/base_site.html
M src/wiki/templates/wiki/search.html

@@ 95,14 95,16 @@
             {% endspaceless %}"
       >
       <div class="input-group">
-        <input type="search" class="form-control mr-sm-2" aria-label="Search" name="q" placeholder="{% spaceless %}
+        <input type="search" class="form-control" aria-label="Search" name="q" placeholder="{% spaceless %}
                 {% if article or urlpath %}
                    {% trans "Search from current article..." %}
                 {% else %}
                   {% trans "Search whole wiki..." %}
                 {% endif %}
               {% endspaceless %}" />
-        <button class="btn btn-outline-light my-sm-0" type="submit"><span class="fa fa-search"></span></button>
+        <div class="input-group-append">
+          <button class="btn btn-outline-light my-sm-0" type="submit"><span class="fa fa-search"></span></button>
+        </div>
         </div>
       </form>
     </div>

@@ 18,7 18,7 @@
     {% endif %}
     <div class="input-group">
       <input type="search" class="form-control search-query" name="q" value="{{ search_query }}" />
-      <span class="input-group-btn">
+      <span class="input-group-append">
         <button class="btn btn-secondary" type="submit">
           <span class="fa fa-search"></span>
         </button>