Merge branch 'front/ui-improvements' of github.com:strapi/strapi into front/ui-improvements

packages/strapi-plugin-content-manager/admin/src/components/FieldComponent/Wrapper.js

@@ -2,9 +2,6 @@ import styled from 'styled-components';
 
 const Wrapper = styled.div`
   position: relative;
-  .row {
-    margin-bottom: 4px;
-  }
 
   ${({ isFromDynamicZone }) => {
     if (isFromDynamicZone) {

packages/strapi-plugin-content-manager/admin/src/components/FormWrapper/index.js

@@ -11,7 +11,6 @@ const FormWrapper = styled.div`
     margin-left: 0;
   }
   .row {
-    margin-bottom: 4px;
     &:last-of-type {
       margin-bottom: 0;
     }

packages/strapi-plugin-content-manager/admin/src/components/SettingsViewWrapper/index.js

@@ -163,16 +163,9 @@ const SettingsViewWrapper = ({
                   return (
                     <FormattedMessage key={input.name} id={input.label.id}>
                       {label => (
-                        <div
+                        <div className={input.customBootstrapClass}>
-                          className={input.customBootstrapClass}
-                          style={{ marginBottom: 1 }}
-                        >
                           <FormattedMessage
-                            id={get(
+                            id={get(input, 'description.id', 'app.utils.defaultMessage')}
-                              input,
-                              'description.id',
-                              'app.utils.defaultMessage'
-                            )}
                           >
                             {description => (
                               <Input
@@ -191,7 +184,7 @@ const SettingsViewWrapper = ({
                   );
                 })}
                 <div className="col-12">
-                  <Separator style={{ marginBottom: 23 }} />
+                  <Separator style={{ marginBottom: 20 }} />
                 </div>
               </div>
               <SectionTitle />