Change header in upload and email plugins

packages/strapi-admin/admin/src/plugins.js

@@ -27,10 +27,10 @@ module.exports = {
     .default,
   'strapi-plugin-content-type-builder': require('../../../strapi-plugin-content-type-builder/admin/src')
     .default,
-  // 'strapi-plugin-documentation': require('../../../strapi-plugin-documentation/admin/src')
-  //   .default,
-  // 'strapi-plugin-email': require('../../../strapi-plugin-email/admin/src')
-  //   .default,
+  'strapi-plugin-documentation': require('../../../strapi-plugin-documentation/admin/src')
+    .default,
+  'strapi-plugin-email': require('../../../strapi-plugin-email/admin/src')
+    .default,
   'strapi-plugin-upload': require('../../../strapi-plugin-upload/admin/src')
     .default,
 };

packages/strapi-plugin-email/admin/src/components/EditForm/Wrapper.js

@@ -10,6 +10,10 @@ const Wrapper = styled.div`
     max-width: 358px;
   }
 
+  .input-wrapper {
+    margin-bottom: 1.1rem;
+  }
+
   .subFormWrapper {
     margin-bottom: 14px;
     padding: 23px 30px 0 30px;

packages/strapi-plugin-email/admin/src/components/EditForm/index.js

@@ -40,6 +40,7 @@ class EditForm extends React.Component {
             inputDescription={{
               id: 'email.EditForm.Input.select.inputDescription',
             }}
+            className="input-wrapper"
             inputClassName="inputStyle"
             label={{ id: 'email.EditForm.Input.select.label' }}
             name="provider"

packages/strapi-plugin-email/admin/src/containers/ConfigPage/index.js

@@ -9,11 +9,12 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { bindActionCreators, compose } from 'redux';
 import { findIndex, get, isEmpty } from 'lodash';
+import { Header } from '@buffetjs/custom';
 
 // You can find these components in either
 // ./node_modules/strapi-helper-plugin/lib/src
 // or strapi/packages/strapi-helper-plugin/lib/src
-import { ContainerFluid, HeaderNav, PluginHeader } from 'strapi-helper-plugin';
+import { ContainerFluid, HeaderNav, GlobalContext } from 'strapi-helper-plugin';
 
 import pluginId from '../../pluginId';
 
@@ -27,6 +28,8 @@ import saga from './saga';
 import selectConfigPage from './selectors';
 
 class ConfigPage extends React.Component {
+  static contextType = GlobalContext;
+
   componentDidMount() {
     this.getSettings(this.props);
   }
@@ -106,30 +109,40 @@ class ConfigPage extends React.Component {
 
   pluginHeaderActions = [
     {
-      kind: 'secondary',
-      label: 'app.components.Button.cancel',
+      color: 'cancel',
+      label: this.context.formatMessage({ id: 'app.components.Button.cancel' }),
       onClick: this.props.onCancel,
       type: 'button',
+      key: 'button-cancel',
     },
     {
-      kind: 'primary',
-      label: 'app.components.Button.save',
+      color: 'success',
+      label: this.context.formatMessage({ id: 'app.components.Button.save' }),
       onClick: this.handleSubmit,
       type: 'submit',
+      key: 'button-submit',
     },
   ];
 
   render() {
+    const { formatMessage } = this.context;
+
     return (
       <div>
         <form onSubmit={this.handleSubmit}>
           <ContainerFluid>
-            <PluginHeader
+            <Header
               actions={this.pluginHeaderActions}
-              description={{ id: 'email.ConfigPage.description' }}
-              title={{ id: 'email.ConfigPage.title' }}
+              contenet="iii"
+              content={formatMessage({
+                id: 'email.ConfigPage.description',
+              })}
+              title={{ label: formatMessage({ id: 'email.ConfigPage.title' }) }}
+            />
+            <HeaderNav
+              links={this.generateLinks()}
+              style={{ marginTop: '4.6rem' }}
             />
-            <HeaderNav links={this.generateLinks()} />
             <EditForm
               didCheckErrors={this.props.didCheckErrors}
               formErrors={this.props.formErrors}

packages/strapi-plugin-upload/admin/src/components/EditForm/index.js

@@ -76,7 +76,7 @@ class EditForm extends React.Component {
             </div>
           </div>
         )}
-        <Separator />
+        <Separator style={{ marginBottom: 17 }} />
         <div className="row">
           <Input
             inputClassName="inputStyle"

packages/strapi-plugin-upload/admin/src/containers/ConfigPage/index.js

@@ -130,7 +130,10 @@ class ConfigPage extends React.Component {
                 label: formatMessage({ id: 'upload.ConfigPage.title' }),
               }}
             />
-            <HeaderNav links={this.generateLinks()} />
+            <HeaderNav
+              links={this.generateLinks()}
+              style={{ marginTop: '4.6rem' }}
+            />
             <EditForm
               didCheckErrors={this.props.didCheckErrors}
               formErrors={this.props.formErrors}