Merge pull request #1258 from weseek/support/apply-bst4-form-fix-SearchPageform.jsx

SearchPageform.jsx のフォームBST4化：search foerm fixed

src/client/js/components/SearchPage/SearchPageForm.jsx

@@ -1,13 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import FormGroup from 'react-bootstrap/es/FormGroup';
-import Button from 'react-bootstrap/es/Button';
-import InputGroup from 'react-bootstrap/es/InputGroup';
-
 import { createSubscribedElement } from '../UnstatedUtils';
 import AppContainer from '../../services/AppContainer';
-
 import SearchForm from '../SearchForm';
 
 // Search.SearchForm
@@ -37,21 +32,19 @@ class SearchPageForm extends React.Component {
 
   render() {
     return (
-      <FormGroup>
-        <InputGroup>
-          <SearchForm
-            t={this.props.t}
-            onSubmit={this.search}
-            keyword={this.state.searchedKeyword}
-            onInputChange={this.onInputChange}
-          />
-          <InputGroup.Button className="">
-            <Button onClick={this.search}>
-              <i className="icon-magnifier"></i>
-            </Button>
-          </InputGroup.Button>
-        </InputGroup>
-      </FormGroup>
+      <div className="input-group mb-3">
+        <SearchForm
+          t={this.props.t}
+          onSubmit={this.search}
+          keyword={this.state.searchedKeyword}
+          onInputChange={this.onInputChange}
+        />
+        <div className="input-group-append">
+          <button className="btn btn-outline-secondary" type="button" id="button-addon2" onClick={this.search}>
+            <i className="icon-magnifier"></i>
+          </button>
+        </div>
+      </div>
     );
   }
 

src/server/views/layout/layout.html

@@ -79,7 +79,7 @@
     <div class="navbar-header d-flex w-100">
 
       <!-- 1 GROWI logo -->
-      <a class="logo d-block top-left-part bg-grw-mos-green my-auto px-3" href="/">
+      <a class="logo d-block top-left-part bg-grw-mos-green my-auto" href="/">
         <div class="logo-mark _white d-inline-block">{% include '../widget/logo.html' %}</div>
         <span class="logo-text mx-3 text-white">
           {% set appTitle = appService.getAppTitle() %}