diff --git a/packages/strapi-admin/admin/src/containers/Admin/index.js b/packages/strapi-admin/admin/src/containers/Admin/index.js index 2a95ac83d3..6d5a36fc53 100644 --- a/packages/strapi-admin/admin/src/containers/Admin/index.js +++ b/packages/strapi-admin/admin/src/containers/Admin/index.js @@ -70,6 +70,10 @@ export class Admin extends React.Component { this.props.setAppError(); } + componentDidMount() { + this.props.emitEvent('didAccessAuthenticatedAdministration'); + } + hasApluginNotReady = props => { const { global: { plugins }, diff --git a/packages/strapi-admin/admin/src/containers/App/index.js b/packages/strapi-admin/admin/src/containers/App/index.js index ee74be6530..d56d4ad8d0 100644 --- a/packages/strapi-admin/admin/src/containers/App/index.js +++ b/packages/strapi-admin/admin/src/containers/App/index.js @@ -47,16 +47,20 @@ function App(props) { const { uuid } = data; if (uuid) { - await fetch('https://analytics.strapi.io/track', { - method: 'POST', - body: JSON.stringify({ - event: 'didInitializeAdministration', - uuid, - }), - headers: { - 'Content-Type': 'application/json', - }, - }); + try { + await fetch('https://analytics.strapi.io/track', { + method: 'POST', + body: JSON.stringify({ + event: 'didInitializeAdministration', + uuid, + }), + headers: { + 'Content-Type': 'application/json', + }, + }); + } catch (e) { + // Silent. + } } getDataRef.current(hasAdmin, data); diff --git a/packages/strapi-helper-plugin/lib/src/components/InputToggle/Wrapper.js b/packages/strapi-helper-plugin/lib/src/components/InputToggle/Wrapper.js index 0daa8a8134..46cf36bad8 100644 --- a/packages/strapi-helper-plugin/lib/src/components/InputToggle/Wrapper.js +++ b/packages/strapi-helper-plugin/lib/src/components/InputToggle/Wrapper.js @@ -37,26 +37,26 @@ const Wrapper = styled.div` } .gradientOff { - background-image: linear-gradient(to bottom right, #f65a1d, #f68e0e); + background-color: #f64d0a; color: white !important; z-index: 0 !important; &:active, :hover { box-shadow: inset -1px 1px 3px rgba(0, 0, 0, 0.1); - background-image: linear-gradient(to bottom right, #f65a1d, #f68e0e); + background-color: #f64d0a; color: white !important; z-index: 0 !important; } } .gradientOn { - background-image: linear-gradient(to bottom right, #005eea, #0097f6); + background-color: #007eff; color: white !important; box-shadow: inset 1px 1px 3px rgba(0, 0, 0, 0.1); &:active, :hover { - background-image: linear-gradient(to bottom right, #005eea, #0097f6); + background-color: #007eff; color: white !important; z-index: 0 !important; } diff --git a/packages/strapi-helper-plugin/lib/src/components/Modal/HeaderModal.js b/packages/strapi-helper-plugin/lib/src/components/Modal/HeaderModal.js index 3c04794295..64f14e8527 100644 --- a/packages/strapi-helper-plugin/lib/src/components/Modal/HeaderModal.js +++ b/packages/strapi-helper-plugin/lib/src/components/Modal/HeaderModal.js @@ -11,7 +11,7 @@ const HeaderModal = styled(ModalHeader)` border: 0; > button { margin: 0; - padding: 20px; + padding: 2rem; color: #c3c5c8; opacity: 1; font-size: 1.2rem; @@ -26,13 +26,12 @@ const HeaderModal = styled(ModalHeader)` > span { display: none; } - &:before { - content: '\f00d'; - -webkit-font-smoothing: antialiased; - font-family: 'FontAwesome'; - font-weight: 400; - font-size: 1.2rem; - } - + } + & + svg { + position: absolute; + top: 26px; + right: 30px; + fill: #c3c5c8; + } `; export default HeaderModal; diff --git a/packages/strapi-helper-plugin/lib/src/components/Modal/index.js b/packages/strapi-helper-plugin/lib/src/components/Modal/index.js index b2f0486971..ef87bddf99 100644 --- a/packages/strapi-helper-plugin/lib/src/components/Modal/index.js +++ b/packages/strapi-helper-plugin/lib/src/components/Modal/index.js @@ -6,16 +6,18 @@ import React, { memo } from 'react'; import PropTypes from 'prop-types'; - import HeaderModal from './HeaderModal'; import StyledModal from './StyledModal'; import Wrapper from './Wrapper'; +import Close from '../../svgs/Close'; + function WrapperModal({ children, isOpen, onToggle, ...rest }) { return ( + {children} diff --git a/packages/strapi-helper-plugin/lib/src/svgs/Close/index.js b/packages/strapi-helper-plugin/lib/src/svgs/Close/index.js new file mode 100644 index 0000000000..5234d17533 --- /dev/null +++ b/packages/strapi-helper-plugin/lib/src/svgs/Close/index.js @@ -0,0 +1,12 @@ +import React from 'react'; + +const Close = props => ( + + + +); + +export default Close; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/AddDropdown/components.js b/packages/strapi-plugin-content-manager/admin/src/components/AddDropdown/components.js index f1579ceba1..112792f2a4 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/AddDropdown/components.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/AddDropdown/components.js @@ -9,7 +9,7 @@ const Wrapper = styled.div` background: #ffffff; color: #333740; border-radius: 2px; - border: solid 1px #006ced; + border: solid 1px #007eff; > button { cursor: pointer; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DisplayedFieldsDropdown/DropdownItemLink.js b/packages/strapi-plugin-content-manager/admin/src/components/DisplayedFieldsDropdown/DropdownItemLink.js index a221956e50..b4f3db7a69 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/DisplayedFieldsDropdown/DropdownItemLink.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/DisplayedFieldsDropdown/DropdownItemLink.js @@ -3,6 +3,7 @@ import styled from 'styled-components'; const DropdownItemLink = styled(DropdownItem)` border-bottom: 1px solid #f7f8f8; + padding: 0.3rem 1.5rem 0.8rem 1.5rem; &:hover { background-color: #fff; } diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DisplayedFieldsDropdown/ItemDropdown.js b/packages/strapi-plugin-content-manager/admin/src/components/DisplayedFieldsDropdown/ItemDropdown.js index cbfe2c0880..caabf27c97 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/DisplayedFieldsDropdown/ItemDropdown.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/DisplayedFieldsDropdown/ItemDropdown.js @@ -3,7 +3,6 @@ import styled from 'styled-components'; const ItemDropdown = styled(DropdownItem)` padding: 0; - padding-top: 9px; &:active, :focus { background-color: #f7f7f9 !important; @@ -19,6 +18,13 @@ const ItemDropdown = styled(DropdownItem)` label { width: 100%; outline: none; + &:before { + top: 12px; + } + } + .form-check { + height: 36px; + line-height: 36px; } `; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DisplayedFieldsDropdown/ItemDropdownReset.js b/packages/strapi-plugin-content-manager/admin/src/components/DisplayedFieldsDropdown/ItemDropdownReset.js index 0053aac58f..e30eb34ea0 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/DisplayedFieldsDropdown/ItemDropdownReset.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/DisplayedFieldsDropdown/ItemDropdownReset.js @@ -2,9 +2,8 @@ import styled from 'styled-components'; import ItemDropdown from './ItemDropdown'; const ItemDropdownReset = styled(ItemDropdown)` - margin-top: 11px; - margin-bottom: 2px; - padding: 0.25rem 1.5rem; + margin-bottom: 6px; + padding: 0.8rem 1.5rem 0.2rem 1.5rem; font-weight: 600; font-size: 1.3rem; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/GrabWrapper.js b/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/GrabWrapper.js index e66118c692..567a6531ca 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/GrabWrapper.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/GrabWrapper.js @@ -28,7 +28,7 @@ const GrabWrapper = styled.div` (isSelected || isOverEditBlock) && css` g { - fill: #007eff; + fill: #aed4fb; } `} `; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/Link.js b/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/Link.js index 258a52de09..14fb4c25d0 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/Link.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/Link.js @@ -7,6 +7,7 @@ const Link = styled.div` font-weight: 400; color: #007eff; cursor: pointer; + font-size: 13px; &:before { content: '\f013'; margin-right: 7px; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/NameWrapper.js b/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/NameWrapper.js index 3f4d6ee0b3..fbb5ecb33a 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/NameWrapper.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/NameWrapper.js @@ -2,8 +2,6 @@ import styled from 'styled-components'; const NameWrapper = styled.div` position: relative; - padding-left: 38px; - padding-right: 38px; line-height: 30px; overflow: hidden; text-overflow: ellipsis; @@ -13,13 +11,13 @@ const NameWrapper = styled.div` ${({ isOverEditBlock, isOverRemove, isSelected }) => { if (isOverRemove) { return ` - color: #f64d0a + color: #f64d0a; `; } if (isSelected || isOverEditBlock) { return ` - color: #007eff + color: #007eff; `; } }} diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/RemoveWrapper.js b/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/RemoveWrapper.js index a09b3d8ebb..34c0dd5ceb 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/RemoveWrapper.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/RemoveWrapper.js @@ -19,14 +19,15 @@ const RemoveWrapper = styled.div` svg { align-self: center; + color: #b4b6ba; } ${({ isOverRemove }) => { if (isOverRemove) { return ` - path { - fill: #f64d0a; - } + path { + fill: #f64d0a; + } `; } }} diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/Wrapper.js b/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/Wrapper.js index b095d0c454..be7a892073 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/Wrapper.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/Wrapper.js @@ -19,7 +19,12 @@ const Wrapper = styled.div` .sub_wrapper { position: relative; cursor: pointer; - background: ${({ isOverEditBlock, isOverRemove, isSelected, isSub }) => { + background-color: ${({ + isOverEditBlock, + isOverRemove, + isSelected, + isSub, + }) => { if (isOverRemove) { return '#ffe9e0'; } else if (isSelected || isOverEditBlock) { @@ -34,7 +39,25 @@ const Wrapper = styled.div` ${({ isOverEditBlock, isOverRemove, isSelected }) => getColor(isOverRemove, isSelected, isOverEditBlock)}; border-radius: 2px; + padding-left: 38px; + padding-right: 38px; + + ${({ isSub }) => + isSub && + css` + padding-left: 12px !important; + padding-right: 12px !important; + + .grab, + .remove { + display: none; + } + `} + .name { + font-size: 13px; + font-weight: 500; + ${({ isOverRemove }) => isOverRemove && css` @@ -64,7 +87,7 @@ const Wrapper = styled.div` (isSelected || isOverEditBlock) && css` g { - fill: #007eff; + fill: #aed4fb; } `} } diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/index.js b/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/index.js index 6f39c1d961..d999c01f90 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/index.js @@ -57,7 +57,6 @@ const DraggedField = forwardRef( { diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/Button.js b/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/Button.js index 36e7b33c2a..31f0d246c8 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/Button.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/Button.js @@ -3,8 +3,15 @@ import PlusButton from '../PlusButton'; const Button = styled(PlusButton)` transform: rotate(-90deg); - transition: background-color 0.2s linear; - transition: transform 0.2s ease-in-out; + transition: background-color 0.1s linear; + transition: transform 0.1s ease-in-out; + &:hover { + background-color: #aed4fb; + :before, + :after { + background-color: #007eff; + } + } ${({ hasError }) => { if (hasError) { @@ -18,11 +25,6 @@ const Button = styled(PlusButton)` }} &.isOpen { transform: rotate(-45deg); - background-color: #aed4fb; - :before, - :after { - background-color: #007eff; - } } `; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/ComponentWrapper.js b/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/ComponentWrapper.js index c278a3a862..f7120a25be 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/ComponentWrapper.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/ComponentWrapper.js @@ -5,12 +5,24 @@ const ComponentWrapper = styled.div` > div { position: relative; box-shadow: 0 2px 4px #e3e9f3; + .arrow-icons { + position: absolute; + top: -12px; + right: 49px; + z-index: 9; + .arrow-btn { + display: inline-flex; + svg { + margin-left: 6px; + } + } + } &:not(:first-of-type) { margin-top: 32px; &:before { content: '&'; position: absolute; - top: -37px; + top: -30px; left: 22px; height: 100%; width: 2px; @@ -18,12 +30,10 @@ const ComponentWrapper = styled.div` color: transparent; } } - > div:not(:first-of-type) { + > div:last-of-type { padding-top: 6px; padding-bottom: 5px; - } - > div:last-of-type { - margin-bottom: 18px; + margin-bottom: 22px; } } `; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/ComponentsPicker.js b/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/ComponentsPicker.js index 569f258ffb..44670790c2 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/ComponentsPicker.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/ComponentsPicker.js @@ -6,8 +6,8 @@ const ComponentsPicker = styled.div` transition: max-height 0.2s ease-out; > div { - margin-top: 19px; - padding: 23px 18px 22px 18px; + margin-top: 15px; + padding: 23px 18px 26px 18px; background-color: #f2f3f4; } @@ -18,6 +18,7 @@ const ComponentsPicker = styled.div` `} .componentPickerTitle { + margin-bottom: 18px; color: #919bae; font-weight: 600; font-size: 13px; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/DynamicZoneWrapper.js b/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/DynamicZoneWrapper.js index 578cad9264..b8fdb88ba9 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/DynamicZoneWrapper.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/DynamicZoneWrapper.js @@ -3,7 +3,10 @@ import styled from 'styled-components'; const DynamicZoneWrapper = styled.div` position: relative; padding-top: 10px; - margin-bottom: 18px; + margin-bottom: 15px; + & + & { + padding-top: 13px; + } `; export default DynamicZoneWrapper; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/Label.js b/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/Label.js index 74a1585c19..4a9572780a 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/Label.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/Label.js @@ -1,18 +1,23 @@ import styled from 'styled-components'; const Label = styled.div` - padding: 13px 20px; + padding: 9px 20px; font-size: 13px; font-weight: 600; position: relative; - min-height: 68px; + min-height: 64px; &:after { - content: '• '; + content: '•'; position: absolute; - top: 11px; + top: 15px; left: 18.5px; - color: #aed4fb; font-size: 15px; + width: 8px; + height: 8px; + background-color: #aed4fb; + color: transparent; + border-radius: 4px; + border: 1px solid white; } &:before { content: '&'; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/RoundCTA.js b/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/RoundCTA.js index 0d8b06904f..91efc61055 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/RoundCTA.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/RoundCTA.js @@ -1,32 +1,44 @@ import styled from 'styled-components'; const RoundCTA = styled.div` - position: absolute; - height: 27px; - width: 27px; + height: 29px; + width: 29px; border-radius: 50%; background-color: #f2f3f4; border: 2px solid #ffffff; - z-index: 9; cursor: pointer; display: flex; + z-index: 9; svg { - font-size: 9px; - line-height: 27px; + font-size: 10px; + line-height: 29px; margin: auto; } - &:not(.arrow-btn):hover { - background-color: #faa684; - color: #f64d0a; + &:not(.arrow-btn) { + position: absolute; + top: -15px; + right: 10px; + transition: all 200ms ease-in; + &:hover { + background-color: #faa684; + color: #f64d0a; + } } &.arrow-btn { - height: 22px; - width: 22px; + height: 24px; + width: 24px; background-color: #ffffff; border: 2px solid #ffffff; + svg { + font-size: 10px; + line-height: 24px; + } &:hover { background-color: #f2f3f4; } + &.arrow-down { + transform: rotate(180deg); + } } `; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/Wrapper.js b/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/Wrapper.js index 582cf071d2..8dd74c0d55 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/Wrapper.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/Wrapper.js @@ -8,7 +8,7 @@ const Wrapper = styled.div` position: absolute; display: none; top: 10px; - left: calc(50% + 46px); + left: calc(50% + 38px); > span { letter-spacing: 0.5px; text-transform: uppercase; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/index.js b/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/index.js index 748323071c..92d2b91dfd 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/index.js @@ -2,6 +2,8 @@ import React, { useCallback, useState } from 'react'; import { get } from 'lodash'; import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; +import { Arrow } from '@buffetjs/icons'; + import pluginId from '../../pluginId'; import useDataManager from '../../hooks/useDataManager'; import useEditView from '../../hooks/useEditView'; @@ -89,27 +91,26 @@ const DynamicZone = ({ max, min, name }) => { return (
- {showDownIcon && ( - moveComponentDown(name, index)} - > - - - )} - {showUpIcon && ( - moveComponentUp(name, index)} - > - - - )} +
+ {showDownIcon && ( + moveComponentDown(name, index)} + > + + + )} + {showUpIcon && ( + moveComponentUp(name, index)} + > + + + )} +
removeComponentFromDynamicZone(name, index)} > diff --git a/packages/strapi-plugin-content-manager/admin/src/components/FieldComponent/AddFieldButton.js b/packages/strapi-plugin-content-manager/admin/src/components/FieldComponent/AddFieldButton.js deleted file mode 100644 index 20e0c883e9..0000000000 --- a/packages/strapi-plugin-content-manager/admin/src/components/FieldComponent/AddFieldButton.js +++ /dev/null @@ -1,39 +0,0 @@ -import styled, { css } from 'styled-components'; - -const Button = styled.button` - width: 100%; - height: 37px; - margin-bottom: 27px; - text-align: center; - border: 1px solid rgba(227, 233, 243, 0.75); - border-top: 1px solid - ${({ doesPreviousFieldContainErrorsAndIsClosed }) => - doesPreviousFieldContainErrorsAndIsClosed - ? '#FFA784' - : 'rgba(227, 233, 243, 0.75)'}; - - border-bottom-left-radius: 2px; - border-bottom-right-radius: 2px; - ${({ withBorderRadius }) => { - if (withBorderRadius) { - return css` - border-radius: 2px; - `; - } - }} - - color: #007eff; - font-size: 12px; - font-weight: 700; - -webkit-font-smoothing: antialiased; - line-height: 37px; - cursor: pointer; - text-transform: uppercase; - letter-spacing: 0.5px; - > i, - > svg { - margin-right: 10px; - } -`; - -export default Button; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/FieldComponent/ComponentIcon.js b/packages/strapi-plugin-content-manager/admin/src/components/FieldComponent/ComponentIcon.js index 495bc8e70e..269d610608 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/FieldComponent/ComponentIcon.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/FieldComponent/ComponentIcon.js @@ -4,9 +4,10 @@ const ComponentIcon = styled.div` position: absolute; top: -13px; left: 10px; - width: 27px; - height: 27px; + width: 29px; + height: 29px; border-radius: 50%; + border: 2px solid white; background-color: #e6f0fb; display: flex; i, diff --git a/packages/strapi-plugin-content-manager/admin/src/components/FieldComponent/Wrapper.js b/packages/strapi-plugin-content-manager/admin/src/components/FieldComponent/Wrapper.js index 5ed7deea3e..30cef699bc 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/FieldComponent/Wrapper.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/FieldComponent/Wrapper.js @@ -2,6 +2,9 @@ import styled from 'styled-components'; const Wrapper = styled.div` position: relative; + .row { + margin-bottom: 4px; + } ${({ isFromDynamicZone }) => { if (isFromDynamicZone) { diff --git a/packages/strapi-plugin-content-manager/admin/src/components/FieldsReorder/Item.js b/packages/strapi-plugin-content-manager/admin/src/components/FieldsReorder/Item.js index 65e680b511..48dad5e86c 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/FieldsReorder/Item.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/FieldsReorder/Item.js @@ -205,7 +205,7 @@ const Item = ({ showRightCarret = false; } } - + console.log(type); return ( div { margin-right: 0; margin-left: 0; } + .row { + margin-bottom: 4px; + &:last-of-type { + margin-bottom: 0; + } + } `; export default FormWrapper; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/InputFileWithErrors/Container.js b/packages/strapi-plugin-content-manager/admin/src/components/InputFileWithErrors/Container.js index a43ae5b620..73eaf07a72 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/InputFileWithErrors/Container.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/InputFileWithErrors/Container.js @@ -3,7 +3,7 @@ import styled from 'styled-components'; const Container = styled.div` min-width: 200px; font-size: 1.3rem; - padding-bottom: 30px; + padding-bottom: 26px; .labelFile { margin-bottom: 9px; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/InputJSONWithErrors/Wrapper.js b/packages/strapi-plugin-content-manager/admin/src/components/InputJSONWithErrors/Wrapper.js index e72ffc9ac6..e7938ad0a9 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/InputJSONWithErrors/Wrapper.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/InputJSONWithErrors/Wrapper.js @@ -1,7 +1,7 @@ import styled from 'styled-components'; const Wrapper = styled.div` - padding-bottom: 30px; + padding-bottom: 26px; label { margin-bottom: 1rem; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/NonRepeatableWrapper/index.js b/packages/strapi-plugin-content-manager/admin/src/components/NonRepeatableWrapper/index.js index 400dae32b0..aa89a031f0 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/NonRepeatableWrapper/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/NonRepeatableWrapper/index.js @@ -9,7 +9,7 @@ const NonRepeatableWrapper = styled.div` return ` position: relative; height: 108px; - margin-bottom: 25px !important; + margin-bottom: 21px !important; background-color: #fafafb; text-align: center; cursor: pointer; @@ -49,6 +49,7 @@ const NonRepeatableWrapper = styled.div` if (isFromDynamicZone) { return ` background-color: #fff; + padding: 0 10px !important; `; } diff --git a/packages/strapi-plugin-content-manager/admin/src/components/PlusButton/index.js b/packages/strapi-plugin-content-manager/admin/src/components/PlusButton/index.js index 5b40cb7a42..8adb7435f3 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/PlusButton/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/PlusButton/index.js @@ -4,9 +4,10 @@ const beforeStyle = ` content: ' '; position: absolute; display: block; - width: 2px; - left: 17px; - top: 10px; + width: 14px; + height: 2px; + left: 11px; + top: 17px; bottom: 10px; z-index: 9; `; @@ -15,9 +16,10 @@ const afterStyle = ` content: ' '; position: absolute; display: block; - height: 2px; - top: 17px; - left: 10px; + height: 14px; + width: 2px; + left: 17px; + top: 11px; right: 10px; z-index: 9; `; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/PopupForm/index.js b/packages/strapi-plugin-content-manager/admin/src/components/PopupForm/index.js index 5c3c29bf34..68f905cbe7 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/PopupForm/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/PopupForm/index.js @@ -1,7 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; import { - ButtonModal, HeaderModal, HeaderModalTitle, Modal, @@ -11,7 +10,7 @@ import { } from 'strapi-helper-plugin'; import { FormattedMessage } from 'react-intl'; import { upperFirst } from 'lodash'; -import { AttributeIcon } from '@buffetjs/core'; +import { AttributeIcon, Button } from '@buffetjs/core'; const PopupForm = ({ headerId, @@ -59,12 +58,12 @@ const PopupForm = ({
- - + +
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/AddFieldButton.js b/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/AddFieldButton.js index 46546c1c26..15052ead19 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/AddFieldButton.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/AddFieldButton.js @@ -3,7 +3,7 @@ import styled, { css } from 'styled-components'; const Button = styled.button` width: 100%; height: 37px; - margin-bottom: 25px; + margin-bottom: 21px; padding: 0 0 3px 0; text-align: center; border: 1px solid rgba(227, 233, 243, 0.75); diff --git a/packages/strapi-plugin-content-manager/admin/src/components/Separator/index.js b/packages/strapi-plugin-content-manager/admin/src/components/Separator/index.js index 96f74a58e9..376efe369c 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/Separator/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/Separator/index.js @@ -1,8 +1,8 @@ import styled from 'styled-components'; const Separator = styled.div` - margin-top: 14px; - margin-bottom: 23px; + margin-top: 17px; + margin-bottom: 24px; border-top: 1px solid #f6f6f6; `; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/SettingsViewWrapper/index.js b/packages/strapi-plugin-content-manager/admin/src/components/SettingsViewWrapper/index.js index ca14f26163..cbe708a49f 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/SettingsViewWrapper/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/SettingsViewWrapper/index.js @@ -163,7 +163,10 @@ const SettingsViewWrapper = ({ return ( {label => ( -
+
- +
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/WysiwygWithErrors/Wrapper.js b/packages/strapi-plugin-content-manager/admin/src/components/WysiwygWithErrors/Wrapper.js index 9d37cec071..9b562ee10c 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/WysiwygWithErrors/Wrapper.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/WysiwygWithErrors/Wrapper.js @@ -1,7 +1,7 @@ import styled from 'styled-components'; const Wrapper = styled.div` - padding-bottom: 2.8rem; + padding-bottom: 2.4rem; font-size: 1.3rem; font-family: 'Lato'; label { diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/EditSettingsView/index.js b/packages/strapi-plugin-content-manager/admin/src/containers/EditSettingsView/index.js index 9d70bf0dc4..c00004d1af 100644 --- a/packages/strapi-plugin-content-manager/admin/src/containers/EditSettingsView/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/containers/EditSettingsView/index.js @@ -281,7 +281,7 @@ const EditSettingsView = ({ } return ( -
+
diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/ListSettingsView/index.js b/packages/strapi-plugin-content-manager/admin/src/containers/ListSettingsView/index.js index ef0c6ebff3..c6ae2c6532 100644 --- a/packages/strapi-plugin-content-manager/admin/src/containers/ListSettingsView/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/containers/ListSettingsView/index.js @@ -169,7 +169,7 @@ const ListSettingsView = ({ deleteLayout, models, slug }) => { const renderForm = () => ( <> -
+
{label => ( {
{get(getAttributes, [labelToEdit, 'type'], 'text') !== 'media' && ( -
+
{label => (