From cb76e68ed28411b26155ef06faeb7a49b29b986b Mon Sep 17 00:00:00 2001 From: Akash <2557058+aksdevac@users.noreply.github.com> Date: Thu, 15 Feb 2024 13:12:57 +0530 Subject: [PATCH] update stylelint to v16, fix lint errors --- .eslintrc.back.js | 3 +- .eslintrc.front.js | 1 + .stylelintrc | 21 +- package.json | 7 +- .../components/BaselineAlignement/index.js | 6 +- .../admin/src/components/Fonts/index.js | 20 +- .../admin/src/components/FormBloc/index.js | 70 +- .../admin/src/components/GlobalStyle/index.js | 9 +- .../admin/src/components/Header/index.js | 5 +- .../LeftMenu/LeftMenuFooter/Wrapper.js | 2 +- .../LeftMenu/LeftMenuHeader/Wrapper.js | 3 +- .../LeftMenu/LeftMenuHeader/index.js | 12 +- .../LeftMenu/LeftMenuLink/LeftMenuIcon.js | 2 +- .../LeftMenuLink/NotificationCount.js | 14 +- .../LeftMenu/LinksContainer/index.js | 5 +- .../Notifications/Notification/Li.js | 6 +- .../admin/src/components/PageTitle/index.js | 2 +- .../Roles/CheckboxWithCondition/index.js | 2 +- .../Roles/ConditionsButton/index.js | 1 + .../ConditionsSelect/IndicatorSeparator.js | 2 +- .../ConditionsSelect/MenuList/SubUl.js | 2 +- .../ConditionsSelect/MenuList/Ul.js | 10 +- .../SubActionRow/row.js | 2 +- .../CollapsePropertyMatrix/Wrapper.js | 2 +- .../Roles/ContentTypeCollapse/Wrapper.js | 2 +- .../admin/src/components/Roles/Curve/index.js | 44 +- .../PluginsAndSettings/SubCategory/Wrapper.js | 2 +- .../PluginsAndSettings/SubCategory/index.js | 2 +- .../components/Roles/RequiredSign/index.js | 2 +- .../components/Roles/RoleForm/NameInput.js | 2 +- .../src/components/Roles/Tabs/TabsWrapper.js | 4 +- .../components/Option/Wrapper.js | 4 +- .../Users/LinkNotification/Envelope.js | 28 +- .../Users/LinkNotification/Wrapper.js | 5 +- .../src/components/Users/List/ActiveStatus.js | 2 +- .../Users/SelectRoles/IndicatorSeparator.js | 2 +- .../components/Webhooks/EventInput/Wrapper.js | 8 +- .../Webhooks/HeadersInput/Wrapper.js | 2 +- .../src/components/Webhooks/Switch/Wrapper.js | 7 +- .../src/containers/Admin/Logout/components.js | 14 +- .../admin/src/containers/App/components.js | 2 +- .../AuthPage/components/Box/Wrapper.js | 2 +- .../AuthPage/components/Box/index.js | 18 +- .../ForgotPasswordSuccess/Envelope.js | 28 +- .../AuthPage/components/Logo/index.js | 2 +- .../src/containers/HomePage/components.js | 32 +- .../containers/InstalledPluginsPage/Logo.js | 5 +- .../src/containers/LeftMenu/LoaderWrapper.js | 5 +- .../src/containers/LocaleToggle/Wrapper.js | 14 +- .../MarketplaceBanner/Wrapper.js | 1 - .../MarketplacePage/PluginCard/Wrapper.js | 3 +- .../Notification/styledComponents.js | 2 +- .../src/containers/NotFoundPage/index.js | 2 +- .../admin/src/containers/Onboarding/Li.js | 2 +- .../src/containers/Onboarding/Wrapper.js | 8 +- .../PluginDispatcher/tests/index.test.js | 4 +- .../src/containers/PrivateRoute/index.js | 30 +- .../Roles/ProtectedListPage/index.js | 8 +- .../components/ApplicationDetailLink/Notif.js | 2 +- .../ApplicationDetailLink/Wrapper.js | 2 +- .../components/StyledLeftMenu/index.js | 1 + .../Users/ProtectedListPage/index.js | 8 +- .../containers/Webhooks/EditView/Wrapper.js | 6 +- .../Webhooks/ProtectedCreateView/index.js | 8 +- .../Webhooks/ProtectedEditView/index.js | 8 +- .../Webhooks/ProtectedListView/index.js | 8 +- .../src/components/AddDropdown/components.js | 7 +- .../admin/src/components/Block/components.js | 4 +- .../admin/src/components/Block/index.js | 28 +- .../admin/src/components/Container/index.js | 2 +- .../CustomInputCheckbox/components.js | 16 +- .../CustomTable/ActionCollapse/Delete.js | 2 +- .../CustomTable/ActionCollapse/DeleteAll.js | 2 +- .../CustomTable/Row/ActionContainer.js | 3 +- .../CustomTable/styledComponents.js | 6 +- .../components/DraggedField/GrabWrapper.js | 4 +- .../components/DraggedField/RemoveWrapper.js | 4 +- .../src/components/DraggedField/SubWrapper.js | 2 - .../DraggedFieldWithPreview/Carret.js | 2 +- .../DynamicZoneWrapper.js | 2 +- .../DraggedFieldWithPreview/Tooltip.js | 2 +- .../DynamicComponentCard/Wrapper.js | 4 +- .../src/components/DynamicZone/Button.js | 4 +- .../DynamicZone/Component/RoundCTA.js | 6 +- .../DynamicZone/ComponentWrapper.js | 2 +- .../admin/src/components/DynamicZone/Label.js | 4 +- .../Picker/Category/Banner/Wrapper.js | 2 +- .../components/DynamicZone/Picker/Wrapper.js | 2 +- .../components/DynamicZone/utils/connect.js | 2 +- .../FieldComponent/EmptyComponent.js | 2 +- .../FieldComponent/ResetComponent.js | 4 +- .../FieldComponent/utils/connect.js | 2 +- .../src/components/FilterOptionsCTA/index.js | 2 +- .../src/components/FilterPicker/components.js | 4 +- .../FilterPickerOption/components.js | 8 +- .../admin/src/components/FormTitle/index.js | 12 +- .../admin/src/components/FormWrapper/index.js | 4 +- .../src/components/InputUID/Options/index.js | 24 +- .../src/components/Inputs/utils/connect.js | 2 +- .../StyledMediaPreviewList.js | 4 +- .../admin/src/components/PlusButton/index.js | 8 +- .../components/PreviewCarret/components.js | 2 - .../src/components/PreviewCarret/index.js | 8 +- .../src/components/PreviewWysiwyg/Wrapper.js | 13 +- .../RepeatableComponent/AddFieldButton.js | 11 +- .../RepeatableComponent/BannerWrapper.js | 5 - .../DraggedItem/utils/connect.js | 2 +- .../RepeatableComponent/EmptyComponent.js | 2 +- .../RepeatableComponent/FormWrapper.js | 5 +- .../RepeatableComponent/utils/connect.js | 2 +- .../src/components/SelectMany/components.js | 28 +- .../SelectWrapper/IndicatorSeparator.js | 2 +- .../components/SelectWrapper/utils/connect.js | 2 +- .../components/SettingFormWrapper/index.js | 2 +- .../admin/src/components/Truncate/index.js | 1 + .../src/components/Wysiwyg/EditorWrapper.js | 10 +- .../Wysiwyg/PreviewControlWrapper.js | 3 +- .../src/components/Wysiwyg/SelectWrapper.js | 2 +- .../components/Wysiwyg/ToggleModeWrapper.js | 2 +- .../src/components/Wysiwyg/previewControl.js | 14 +- .../WysiwygBottomControls/components.js | 2 +- .../src/components/WysiwygDropUpload/Label.js | 7 +- .../WysiwygInlineControls/StyledButton.js | 10 +- .../WysiwygInlineControls/Wrapper.js | 2 +- .../components/WysiwygWithErrors/Wrapper.js | 2 +- .../EditView/DeleteLink/utils/connect.js | 2 +- .../EditView/Header/utils/connect.js | 2 +- .../src/containers/EditView/components.js | 6 +- .../utils/schema.js | 12 +- .../ListSettingsView/DragWrapper.js | 3 +- .../ListSettingsView/MenuDropdown.js | 5 +- .../src/containers/ListSettingsView/Toggle.js | 5 +- .../FieldPicker/ConfigureLink/StyledLink.js | 1 - .../ListView/FieldPicker/Fields/Wrapper.js | 2 +- .../src/containers/ListView/components.js | 12 +- .../admin/src/containers/ListView/index.js | 260 +++--- .../src/utils/tests/getComponents.test.js | 8 +- .../front/integration/createPage_specs.js | 2 +- .../tests/front/integration/listPage_specs.js | 2 +- .../src/components/AttributeOption/Button.js | 6 +- .../admin/src/components/BooleanBox/CT.js | 2 +- .../admin/src/components/BooleanBox/ST.js | 2 +- .../src/components/BooleanBox/Wrapper.js | 9 +- .../CheckboxWithDescription/index.js | 24 +- .../ComponentIconPicker/SearchWrapper.js | 2 +- .../components/ComponentIconPicker/Wrapper.js | 5 +- .../components/ComponentSelect/Category.js | 8 +- .../admin/src/components/CustomLink/index.js | 18 +- .../tests/index.test.js | 4 +- .../admin/src/components/List/List.js | 4 +- .../admin/src/components/ListHeader/Title.js | 2 +- .../admin/src/components/ListRow/Wrapper.js | 2 +- .../src/components/RelationForm/Wrapper.js | 2 +- .../RelationTargetPicker/Wrapper.js | 9 +- .../src/components/SelectMenuUl/index.js | 6 +- .../admin/src/components/Td/index.js | 5 +- .../admin/src/components/UpperFirst/index.js | 2 +- .../admin/src/containers/ListView/Wrapper.js | 2 +- .../admin/src/icons/Curve.js | 26 +- .../src/utils/tests/getComponents.test.js | 8 +- .../front/integrationOld/createApi_specs.js | 2 +- .../admin/src/components/Block/components.js | 4 +- .../admin/src/components/Block/index.js | 20 +- .../admin/src/components/Row/components.js | 15 +- .../src/containers/HomePage/components.js | 4 +- .../src/containers/Settings/components.js | 4 +- .../admin/src/containers/Settings/index.js | 178 ++-- .../CMEditViewLocalePicker/Wrapper.js | 2 +- .../src/components/LocalePicker/index.js | 5 +- .../SettingsPage/LocaleSettingsPage.js | 7 +- .../src/components/BrowseAssets/index.js | 100 +- .../src/components/CheckControl/Button.js | 2 +- .../src/components/EditForm/FileWrapper.js | 3 +- .../admin/src/components/EditForm/SizeBox.js | 4 +- .../src/components/InputFileModal/Label.js | 5 +- .../components/InputMedia/Chevron/index.js | 8 +- .../admin/src/components/IntlText/index.js | 8 +- .../admin/src/components/List/ListCell.js | 3 + .../src/components/LoadingIndicator/index.js | 2 +- .../src/components/ModalHeader/BackButton.js | 4 +- .../src/components/ModalNavWrapper/Hr.js | 2 +- .../src/components/ModalTab/Count/index.js | 22 +- .../admin/src/components/PlayIcon/Play.js | 96 +- .../admin/src/components/PlayIcon/Wrapper.js | 2 +- .../admin/src/components/SelectAll/Wrapper.js | 2 +- .../InputModalStepper/InputModalStepper.js | 8 +- .../components/BaselineAlignement/index.js | 6 +- .../src/components/BoundRoute/Components.js | 2 +- .../admin/src/components/FormBloc/index.js | 70 +- .../src/components/ListRow/Components.js | 4 +- .../PermissionRow/CheckboxWrapper.js | 2 + .../SubCategory/SubCategoryWrapper.js | 2 +- .../PermissionRow/SubCategory/index.js | 2 +- .../Roles/ProtectedCreatePage/index.js | 8 +- .../Roles/ProtectedEditPage/index.js | 8 +- yarn.lock | 882 ++++++------------ 196 files changed, 1297 insertions(+), 1548 deletions(-) diff --git a/.eslintrc.back.js b/.eslintrc.back.js index 714b821b..d55b136a 100644 --- a/.eslintrc.back.js +++ b/.eslintrc.back.js @@ -6,10 +6,10 @@ module.exports = { }, extends: [ 'eslint:recommended', - 'prettier', 'plugin:import/errors', 'plugin:import/warnings', 'plugin:node/recommended', + 'prettier', ], env: { es6: true, @@ -36,5 +36,6 @@ module.exports = { 'node/no-callback-literal': 'error', 'node/handle-callback-err': 'error', 'one-var': ['error', 'never'], + 'space-before-function-paren': 'off', }, }; diff --git a/.eslintrc.front.js b/.eslintrc.front.js index c47cb044..fd673709 100644 --- a/.eslintrc.front.js +++ b/.eslintrc.front.js @@ -129,5 +129,6 @@ module.exports = { 'class-methods-use-this': 0, 'no-loss-of-precision': 0, 'default-param-last': 0, + 'space-before-function-paren': 0, }, }; diff --git a/.stylelintrc b/.stylelintrc index 749d63b4..d40acf4a 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -1,13 +1,16 @@ { - "processors": [ - "stylelint-processor-styled-components" - ], - "extends": [ - "stylelint-config-recommended", - "stylelint-config-styled-components" - ], + "extends": ["stylelint-config-standard"], + "customSyntax": "postcss-styled-syntax", "rules": { "font-family-no-missing-generic-family-keyword": null, - "no-descending-specificity": null + "no-descending-specificity": null, + "rule-empty-line-before": null, + "media-feature-range-notation": null, + "selector-class-pattern": null, + "selector-id-pattern": null, + "color-function-notation": null, + "media-query-no-invalid": null, + "selector-not-notation": null, + "no-empty-source": null } -} \ No newline at end of file +} diff --git a/package.json b/package.json index 9d8b2962..aff8e44f 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,7 @@ "lint-staged": "13.0.3", "lodash": "4.17.21", "npm-run-all": "^4.1.5", + "postcss-styled-syntax": "0.6.4", "prettier": "~3.2.5", "qs": "6.11.0", "react-test-renderer": "^17.0.2", @@ -46,10 +47,8 @@ "request-promise-native": "^1.0.9", "rimraf": "3.0.2", "snyk": "^1.566.0", - "stylelint": "13.13.1", - "stylelint-config-recommended": "3.0.0", - "stylelint-config-styled-components": "0.1.1", - "stylelint-processor-styled-components": "1.10.0", + "stylelint": "16.2.1", + "stylelint-config-standard": "36.0.0", "supertest": "5.0.0", "wait-on": "^3.2.0", "yargs": "17.6.2" diff --git a/packages/strapi-admin/admin/src/components/BaselineAlignement/index.js b/packages/strapi-admin/admin/src/components/BaselineAlignement/index.js index e8ed2537..c2210ecb 100644 --- a/packages/strapi-admin/admin/src/components/BaselineAlignement/index.js +++ b/packages/strapi-admin/admin/src/components/BaselineAlignement/index.js @@ -8,10 +8,8 @@ import styled from 'styled-components'; // I create it to temporary fix the baseline alignment until we have the design system. const BaselineAlignment = styled.div` - padding-top: ${({ size, top }) => top && size}; - padding-right: ${({ size, right }) => right && size}; - padding-bottom: ${({ size, bottom }) => bottom && size}; - padding-left: ${({ size, left }) => left && size}; + padding: ${({ size, top }) => top && size} ${({ size, right }) => right && size} + ${({ size, bottom }) => bottom && size} ${({ size, left }) => left && size}; `; BaselineAlignment.defaultProps = { diff --git a/packages/strapi-admin/admin/src/components/Fonts/index.js b/packages/strapi-admin/admin/src/components/Fonts/index.js index 947b7902..0d3c4a72 100644 --- a/packages/strapi-admin/admin/src/components/Fonts/index.js +++ b/packages/strapi-admin/admin/src/components/Fonts/index.js @@ -26,47 +26,53 @@ import latoBlackWoff2 from '@buffetjs/styles/webfonts/Lato-Black.woff2'; const Fonts = createGlobalStyle` @font-face { - font-family: 'FontAwesome'; + font-family: FontAwesome; src: url(${faBrandsLight2}) format("woff2"), url(${faBrandsLight}) format("woff"); font-weight: 400; font-style: normal; } + @font-face { - font-family: 'FontAwesome'; + font-family: FontAwesome; src: url(${faRegularLight2}) format("woff2"), url(${faRegularLight}) format("woff"); font-weight: 400; font-style: normal; } + @font-face { - font-family: 'FontAwesome'; + font-family: FontAwesome; src: url(${faSolidHeavy2}) format("woff2"), url(${faSolidHeavy}) format("woff"); font-weight: 400; font-style: normal; } + /* Lato Regular - 400 */ @font-face { - font-family: 'Lato'; + font-family: Lato; src: url(${latoRegularWoff2}) format('woff2'), url(${latoRegularWoff}) format('woff'), url(${latoRegular}) format('truetype'); font-weight: 400; font-style: normal; } + /* Lato Semi-Bold - 500 */ @font-face { - font-family: 'Lato'; + font-family: Lato; src: url(${latoSemiBoldWoff2}) format('woff2'), url(${latoSemiBoldWoff}) format('woff'), url(${latoSemiBold}) format('truetype'); font-weight: 500; font-style: normal; } + /* Lato Bold - 600 */ @font-face { - font-family: 'Lato'; + font-family: Lato; src: url(${latoBoldWoff2}) format('woff2'), url(${latoBoldWoff}) format('woff'), url(${latoBold}) format('truetype'); font-weight: 600; font-style: normal; } + /* Lato Black - 900 */ @font-face { - font-family: 'Lato'; + font-family: Lato; src: url(${latoBlackWoff2}) format('woff2'), url(${latoBlackWoff}) format('woff'), url(${latoBlack}) format('truetype'); font-weight: 900; font-style: normal; diff --git a/packages/strapi-admin/admin/src/components/FormBloc/index.js b/packages/strapi-admin/admin/src/components/FormBloc/index.js index 17eefa5d..48a78fa9 100644 --- a/packages/strapi-admin/admin/src/components/FormBloc/index.js +++ b/packages/strapi-admin/admin/src/components/FormBloc/index.js @@ -5,41 +5,43 @@ import PropTypes from 'prop-types'; import Bloc from '../Bloc'; function FormBloc({ children, actions, isLoading, title, subtitle }) { - return - - - {isLoading ? ( - <> - - - - ) : ( - <> - {title && ( - <> - - - - - {title} - - {subtitle && ( - - {subtitle} + return ( + + + + {isLoading ? ( + <> + + + + ) : ( + <> + {title && ( + <> + + + + + {title} - )} - - {actions} - - - - - )} - {children} - - )} - - + {subtitle && ( + + {subtitle} + + )} + + {actions} + + + + + )} + {children} + + )} + + + ); } FormBloc.defaultProps = { diff --git a/packages/strapi-admin/admin/src/components/GlobalStyle/index.js b/packages/strapi-admin/admin/src/components/GlobalStyle/index.js index b167c8b4..153f3eaf 100644 --- a/packages/strapi-admin/admin/src/components/GlobalStyle/index.js +++ b/packages/strapi-admin/admin/src/components/GlobalStyle/index.js @@ -1,12 +1,13 @@ import { createGlobalStyle } from 'styled-components'; +/* stylelint-disable selector-not-notation */ const GlobalStyle = createGlobalStyle` html { font-size: 62.5%; } body { - font-family: 'Lato'; + font-family: Lato; font-size: 1.4rem; line-height: 1.5; color: #292b2c; @@ -15,7 +16,7 @@ const GlobalStyle = createGlobalStyle` * { -webkit-font-smoothing: antialiased; box-sizing: border-box; - font-family: 'Lato'; + font-family: Lato; } h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { @@ -52,7 +53,7 @@ const GlobalStyle = createGlobalStyle` .modal-content { border-radius: .2rem; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05); + box-shadow: 0 2px 4px rgba(0, 0, 0, 5%); border: none; } @@ -101,7 +102,7 @@ const GlobalStyle = createGlobalStyle` .btn-secondary, .show > .btn-secondary.dropdown-toggle:focus { &:focus, &:active, &:hover, &.focus { - box-shadow: 0 0 0 0px rgba(134,142,150,0.5); + box-shadow: 0 0 0 0 rgba(134,142,150,50%); color: rgb(51, 55, 64); background-color: rgb(250, 250, 251) !important; diff --git a/packages/strapi-admin/admin/src/components/Header/index.js b/packages/strapi-admin/admin/src/components/Header/index.js index 134b630d..619cb8b8 100644 --- a/packages/strapi-admin/admin/src/components/Header/index.js +++ b/packages/strapi-admin/admin/src/components/Header/index.js @@ -10,14 +10,11 @@ import PropTypes from 'prop-types'; const Header = styled.div` width: 100%; height: ${(props) => props.theme.main.sizes.header.height}; - position: fixed; z-index: 1040; left: ${(props) => props.theme.main.sizes.leftMenu.width}; - - box-shadow: 0 1px 2px 0 rgba(40, 42, 49, 0.16); + box-shadow: 0 1px 2px 0 rgb(40 42 49 / 16%); background-color: ${(props) => props.theme.main.colors.white}; - line-height: ${(props) => props.theme.main.sizes.header.height}; `; diff --git a/packages/strapi-admin/admin/src/components/LeftMenu/LeftMenuFooter/Wrapper.js b/packages/strapi-admin/admin/src/components/LeftMenu/LeftMenuFooter/Wrapper.js index 97f7a6e1..5888f02d 100644 --- a/packages/strapi-admin/admin/src/components/LeftMenu/LeftMenuFooter/Wrapper.js +++ b/packages/strapi-admin/admin/src/components/LeftMenu/LeftMenuFooter/Wrapper.js @@ -13,7 +13,7 @@ const Wrapper = styled.div` padding-left: 15px; padding-right: 15px; line-height: 3rem; - background-color: rgba(255, 255, 255, 0.02); + background-color: rgb(255 255 255 / 2%); font-size: 1rem; font-weight: 400; letter-spacing: 0.05rem; diff --git a/packages/strapi-admin/admin/src/components/LeftMenu/LeftMenuHeader/Wrapper.js b/packages/strapi-admin/admin/src/components/LeftMenu/LeftMenuHeader/Wrapper.js index c17ef3db..17c73eef 100644 --- a/packages/strapi-admin/admin/src/components/LeftMenu/LeftMenuHeader/Wrapper.js +++ b/packages/strapi-admin/admin/src/components/LeftMenu/LeftMenuHeader/Wrapper.js @@ -20,8 +20,7 @@ const Wrapper = styled.div` height: ${(props) => props.theme.main.sizes.leftMenu.height}; font-size: 2rem; letter-spacing: 0.2rem; - color: $white; - + color: white; background-image: url(${Logo}); background-repeat: no-repeat; background-position: left center; diff --git a/packages/strapi-admin/admin/src/components/LeftMenu/LeftMenuHeader/index.js b/packages/strapi-admin/admin/src/components/LeftMenu/LeftMenuHeader/index.js index 61d2102f..51498679 100644 --- a/packages/strapi-admin/admin/src/components/LeftMenu/LeftMenuHeader/index.js +++ b/packages/strapi-admin/admin/src/components/LeftMenu/LeftMenuHeader/index.js @@ -4,11 +4,13 @@ import { Link } from 'react-router-dom'; import Wrapper from './Wrapper'; function LeftMenuHeader() { - return - - - - + return ( + + + + + + ); } export default LeftMenuHeader; diff --git a/packages/strapi-admin/admin/src/components/LeftMenu/LeftMenuLink/LeftMenuIcon.js b/packages/strapi-admin/admin/src/components/LeftMenu/LeftMenuLink/LeftMenuIcon.js index 947b30ea..8885fbf4 100644 --- a/packages/strapi-admin/admin/src/components/LeftMenu/LeftMenuLink/LeftMenuIcon.js +++ b/packages/strapi-admin/admin/src/components/LeftMenu/LeftMenuLink/LeftMenuIcon.js @@ -12,7 +12,7 @@ const FaIcon = styled(({ small, ...props }) => )` `; function LeftMenuIcon({ icon }) { - return + return ; } LeftMenuIcon.propTypes = { diff --git a/packages/strapi-admin/admin/src/components/LeftMenu/LeftMenuLink/NotificationCount.js b/packages/strapi-admin/admin/src/components/LeftMenu/LeftMenuLink/NotificationCount.js index ea72ad76..f5421d1d 100644 --- a/packages/strapi-admin/admin/src/components/LeftMenu/LeftMenuLink/NotificationCount.js +++ b/packages/strapi-admin/admin/src/components/LeftMenu/LeftMenuLink/NotificationCount.js @@ -7,18 +7,20 @@ const NotificationWrapper = styled.div` height: 14px; margin-top: 4px; margin-right: 20px; - padding: 0px 4px; + padding: 0 4px; background-color: #383d49; border-radius: 2px; font-size: 11px; `; function NotificationCount({ count }) { - return - - {count} - - + return ( + + + {count} + + + ); } NotificationCount.defaultProps = { diff --git a/packages/strapi-admin/admin/src/components/LeftMenu/LinksContainer/index.js b/packages/strapi-admin/admin/src/components/LeftMenu/LinksContainer/index.js index 346c4c8e..10afaf0a 100644 --- a/packages/strapi-admin/admin/src/components/LeftMenu/LinksContainer/index.js +++ b/packages/strapi-admin/admin/src/components/LeftMenu/LinksContainer/index.js @@ -4,10 +4,7 @@ import PropTypes from 'prop-types'; const LinksContainer = styled.div` padding-top: 0.7rem; position: absolute; - top: ${(props) => props.theme.main.sizes.leftMenu.height}; - right: 0; - bottom: 0; - left: 0; + inset: ${(props) => props.theme.main.sizes.leftMenu.height} 0 0 0; overflow-y: auto; height: calc(100vh - (${(props) => props.theme.main.sizes.leftMenu.height} + 3rem)); box-sizing: border-box; diff --git a/packages/strapi-admin/admin/src/components/Notifications/Notification/Li.js b/packages/strapi-admin/admin/src/components/Notifications/Notification/Li.js index 444c8404..b219f8a3 100644 --- a/packages/strapi-admin/admin/src/components/Notifications/Notification/Li.js +++ b/packages/strapi-admin/admin/src/components/Notifications/Notification/Li.js @@ -31,7 +31,7 @@ const GlobalNotification = createGlobalStyle` width: 220px; margin: 0; padding-right: 10px; - border-right: 1px solid rgba(255, 255, 255, 0.3); + border-right: 1px solid rgb(255 255 255 / 30%); } .notificationTitle { @@ -118,7 +118,7 @@ const Li = styled.li` margin-bottom: 14px; background: ${(props) => props.theme.main.colors.white}; border-radius: 2px; - box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.15); + box-shadow: 0 1px 3px 0 rgb(0 0 0 / 15%); color: #333740; transition: all 0.15s ease; overflow: hidden; @@ -141,7 +141,7 @@ const Li = styled.li` &:hover { cursor: pointer; - box-shadow: 0 1px 5px 0 rgba(0, 0, 0, 0.2); + box-shadow: 0 1px 5px 0 rgb(0 0 0 / 20%); } `; diff --git a/packages/strapi-admin/admin/src/components/PageTitle/index.js b/packages/strapi-admin/admin/src/components/PageTitle/index.js index 4dd58de3..3ce248d1 100644 --- a/packages/strapi-admin/admin/src/components/PageTitle/index.js +++ b/packages/strapi-admin/admin/src/components/PageTitle/index.js @@ -5,7 +5,7 @@ import PropTypes from 'prop-types'; import favicon from '../../favicon.png'; function PageTitle({ title }) { - return + return ; } PageTitle.propTypes = { diff --git a/packages/strapi-admin/admin/src/components/Roles/CheckboxWithCondition/index.js b/packages/strapi-admin/admin/src/components/Roles/CheckboxWithCondition/index.js index abba11be..e3b52172 100644 --- a/packages/strapi-admin/admin/src/components/Roles/CheckboxWithCondition/index.js +++ b/packages/strapi-admin/admin/src/components/Roles/CheckboxWithCondition/index.js @@ -10,7 +10,7 @@ const CheckboxWithCondition = styled(Checkbox)` input[type='checkbox'] { z-index: 10; - &:after { + &::after { color: ${({ theme }) => theme.main.colors.mediumBlue}; } } diff --git a/packages/strapi-admin/admin/src/components/Roles/ConditionsButton/index.js b/packages/strapi-admin/admin/src/components/Roles/ConditionsButton/index.js index a798ef55..7bc49025 100644 --- a/packages/strapi-admin/admin/src/components/Roles/ConditionsButton/index.js +++ b/packages/strapi-admin/admin/src/components/Roles/ConditionsButton/index.js @@ -46,4 +46,5 @@ ConditionsButton.propTypes = { // This is a styled component advanced usage : // Used to make a ref to a non styled component. // https://styled-components.com/docs/advanced#caveat +/* stylelint-disable no-empty-source */ export default styled(ConditionsButton)``; diff --git a/packages/strapi-admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/IndicatorSeparator.js b/packages/strapi-admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/IndicatorSeparator.js index 7ccc1241..b807d392 100644 --- a/packages/strapi-admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/IndicatorSeparator.js +++ b/packages/strapi-admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/IndicatorSeparator.js @@ -1,5 +1,5 @@ function IndicatorSeparator() { - return null + return null; } export default IndicatorSeparator; diff --git a/packages/strapi-admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/MenuList/SubUl.js b/packages/strapi-admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/MenuList/SubUl.js index 45a51a13..1a517481 100644 --- a/packages/strapi-admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/MenuList/SubUl.js +++ b/packages/strapi-admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/MenuList/SubUl.js @@ -6,7 +6,7 @@ import { Collapse } from 'reactstrap'; const ToggleUl = styled(Collapse)` font-size: 13px; - padding: 12px 15px 0 15px; + padding: 12px 15px 0; list-style: none; background-color: #fff; > li { diff --git a/packages/strapi-admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/MenuList/Ul.js b/packages/strapi-admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/MenuList/Ul.js index 55b787cd..9124f5cc 100644 --- a/packages/strapi-admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/MenuList/Ul.js +++ b/packages/strapi-admin/admin/src/components/Roles/ConditionsModal/ConditionsSelect/MenuList/Ul.js @@ -6,7 +6,7 @@ const Ul = styled.ul` max-height: 150px; font-size: 13px; padding: 0 15px; - margin-bottom: 0px; + margin-bottom: 0; list-style: none; background-color: #fff; > li { @@ -14,7 +14,7 @@ const Ul = styled.ul` flex-shrink: 1; width: fit-content !important; cursor: pointer; - margin-bottom: 0px; + margin-bottom: 0; } .check-wrapper { @@ -25,7 +25,6 @@ const Ul = styled.ul` } .chevron { margin: auto; - font-size: 11px; color: #919bae; } @@ -53,10 +52,7 @@ const Ul = styled.ul` content: ''; position: absolute; z-index: 1; - top: 0; - left: -30px; - right: -30px; - bottom: 0; + inset: 0 -30px; background-color: ${({ theme }) => theme.main.colors.lightBlue}; } } diff --git a/packages/strapi-admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/SubActionRow/row.js b/packages/strapi-admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/SubActionRow/row.js index 35bb44da..65392417 100644 --- a/packages/strapi-admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/SubActionRow/row.js +++ b/packages/strapi-admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/SubActionRow/row.js @@ -21,7 +21,7 @@ const RowStyle = styled.div` ${activeStyle(theme)} } `} - ${({ isActive, theme }) => isActive && activeStyle(theme)}} + ${({ isActive, theme }) => isActive && activeStyle(theme)} `; RowStyle.propTypes = { diff --git a/packages/strapi-admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/Wrapper.js b/packages/strapi-admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/Wrapper.js index 34e58c62..71c321bd 100644 --- a/packages/strapi-admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/Wrapper.js +++ b/packages/strapi-admin/admin/src/components/Roles/ContentTypeCollapse/CollapsePropertyMatrix/Wrapper.js @@ -11,7 +11,7 @@ const Wrapper = styled.div` return `none`; }}; - border-radius: 0px 0px 2px 2px; + border-radius: 0 0 2px 2px; `; Wrapper.defaultProps = { diff --git a/packages/strapi-admin/admin/src/components/Roles/ContentTypeCollapse/Wrapper.js b/packages/strapi-admin/admin/src/components/Roles/ContentTypeCollapse/Wrapper.js index 1c76c498..08ecab87 100644 --- a/packages/strapi-admin/admin/src/components/Roles/ContentTypeCollapse/Wrapper.js +++ b/packages/strapi-admin/admin/src/components/Roles/ContentTypeCollapse/Wrapper.js @@ -1,4 +1,5 @@ /* eslint-disable indent */ +/* stylelint-disable */ import styled from 'styled-components'; import CollapsePropertyMatrix from './CollapsePropertyMatrix/Wrapper'; @@ -8,7 +9,6 @@ const RowWrapper = styled.div` ` margin: 9px 0; `} - ${CollapsePropertyMatrix}:last-of-type { padding-bottom: 17px; } diff --git a/packages/strapi-admin/admin/src/components/Roles/Curve/index.js b/packages/strapi-admin/admin/src/components/Roles/Curve/index.js index 9503b327..825603b7 100644 --- a/packages/strapi-admin/admin/src/components/Roles/Curve/index.js +++ b/packages/strapi-admin/admin/src/components/Roles/Curve/index.js @@ -2,27 +2,29 @@ import React, { memo } from 'react'; import PropTypes from 'prop-types'; function Curve(props) { - return - - - - + return ( + + + + + + ); } Curve.defaultProps = { diff --git a/packages/strapi-admin/admin/src/components/Roles/PluginsAndSettings/SubCategory/Wrapper.js b/packages/strapi-admin/admin/src/components/Roles/PluginsAndSettings/SubCategory/Wrapper.js index aebf74cd..55d659ce 100644 --- a/packages/strapi-admin/admin/src/components/Roles/PluginsAndSettings/SubCategory/Wrapper.js +++ b/packages/strapi-admin/admin/src/components/Roles/PluginsAndSettings/SubCategory/Wrapper.js @@ -4,7 +4,7 @@ import styled from 'styled-components'; const Wrapper = styled.div` padding-bottom: 2.6rem; input[type='checkbox'] { - &:after { + &::after { color: ${({ theme }) => theme.main.colors.mediumBlue}; } } diff --git a/packages/strapi-admin/admin/src/components/Roles/PluginsAndSettings/SubCategory/index.js b/packages/strapi-admin/admin/src/components/Roles/PluginsAndSettings/SubCategory/index.js index cc797bf6..0028e83d 100644 --- a/packages/strapi-admin/admin/src/components/Roles/PluginsAndSettings/SubCategory/index.js +++ b/packages/strapi-admin/admin/src/components/Roles/PluginsAndSettings/SubCategory/index.js @@ -19,7 +19,7 @@ const Border = styled.div` flex: 1; align-self: center; border-top: 1px solid #f6f6f6; - padding: 0px 10px; + padding: 0 10px; `; function SubCategory({ categoryName, isFormDisabled, subCategoryName, actions, pathToData }) { diff --git a/packages/strapi-admin/admin/src/components/Roles/RequiredSign/index.js b/packages/strapi-admin/admin/src/components/Roles/RequiredSign/index.js index 43a4defc..83175e7a 100644 --- a/packages/strapi-admin/admin/src/components/Roles/RequiredSign/index.js +++ b/packages/strapi-admin/admin/src/components/Roles/RequiredSign/index.js @@ -7,7 +7,7 @@ const Required = styled.span` `; function RequiredSign() { - return * + return *; } export default RequiredSign; diff --git a/packages/strapi-admin/admin/src/components/Roles/RoleForm/NameInput.js b/packages/strapi-admin/admin/src/components/Roles/RoleForm/NameInput.js index 9ddc69c2..3a47f409 100644 --- a/packages/strapi-admin/admin/src/components/Roles/RoleForm/NameInput.js +++ b/packages/strapi-admin/admin/src/components/Roles/RoleForm/NameInput.js @@ -2,7 +2,7 @@ import React from 'react'; import SizedInput from '../../SizedInput'; function NameInput(inputProps) { - return + return ; } export default NameInput; diff --git a/packages/strapi-admin/admin/src/components/Roles/Tabs/TabsWrapper.js b/packages/strapi-admin/admin/src/components/Roles/Tabs/TabsWrapper.js index 915e5b52..90e76b30 100644 --- a/packages/strapi-admin/admin/src/components/Roles/Tabs/TabsWrapper.js +++ b/packages/strapi-admin/admin/src/components/Roles/Tabs/TabsWrapper.js @@ -1,10 +1,12 @@ +/* stylelint-disable */ + import styled from 'styled-components'; import Tab from './Tab'; const TabsWrapper = styled.div` display: block; border-radius: ${({ theme }) => theme.main.sizes.borderRadius}; - box-shadow: ${({ theme }) => `0px 2px 4px 0px ${theme.main.colors.darkGrey}`}; + box-shadow: ${({ theme }) => `0px 2px 4px 0 ${theme.main.colors.darkGrey}`}; ${Tab}:first-of-type { border-top-left-radius: ${({ theme }) => theme.main.sizes.borderRadius}; diff --git a/packages/strapi-admin/admin/src/components/UpgradePlanModal/components/Option/Wrapper.js b/packages/strapi-admin/admin/src/components/UpgradePlanModal/components/Option/Wrapper.js index 998d72a4..2fed804f 100644 --- a/packages/strapi-admin/admin/src/components/UpgradePlanModal/components/Option/Wrapper.js +++ b/packages/strapi-admin/admin/src/components/UpgradePlanModal/components/Option/Wrapper.js @@ -4,8 +4,8 @@ const Wrapper = styled.div` height: 25px; max-width: fit-content; padding: 0 15px; - background: rgba(0, 126, 255, 0.08); - border: 1px solid rgba(0, 126, 255, 0.24); + background: rgb(0 126 255 / 8%); + border: 1px solid rgb(0 126 255 / 24%); border-radius: 2px; `; diff --git a/packages/strapi-admin/admin/src/components/Users/LinkNotification/Envelope.js b/packages/strapi-admin/admin/src/components/Users/LinkNotification/Envelope.js index 9545c931..fdfb9061 100644 --- a/packages/strapi-admin/admin/src/components/Users/LinkNotification/Envelope.js +++ b/packages/strapi-admin/admin/src/components/Users/LinkNotification/Envelope.js @@ -2,19 +2,21 @@ import React from 'react'; function Envelope() { - return - - - ✉️ - - - + return ( + + + + ✉️ + + + + ); } export default Envelope; diff --git a/packages/strapi-admin/admin/src/components/Users/LinkNotification/Wrapper.js b/packages/strapi-admin/admin/src/components/Users/LinkNotification/Wrapper.js index 5e89e828..a757aae2 100644 --- a/packages/strapi-admin/admin/src/components/Users/LinkNotification/Wrapper.js +++ b/packages/strapi-admin/admin/src/components/Users/LinkNotification/Wrapper.js @@ -5,7 +5,7 @@ const Wrapper = styled.div` width: 100%; display: flex; margin-bottom: 4px; - &:before { + &::before { content: ''; width: 5px; height: 100%; @@ -14,8 +14,9 @@ const Wrapper = styled.div` border-top-left-radius: ${({ theme }) => theme.main.sizes.borderRadius}; border-bottom-left-radius: ${({ theme }) => theme.main.sizes.borderRadius}; } + border-radius: ${({ theme }) => theme.main.sizes.borderRadius}; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05); + box-shadow: 0 2px 4px rgb(0 0 0 / 5%); .icon-duplicate { margin-left: 10px; diff --git a/packages/strapi-admin/admin/src/components/Users/List/ActiveStatus.js b/packages/strapi-admin/admin/src/components/Users/List/ActiveStatus.js index 095d7cd6..5da7962e 100644 --- a/packages/strapi-admin/admin/src/components/Users/List/ActiveStatus.js +++ b/packages/strapi-admin/admin/src/components/Users/List/ActiveStatus.js @@ -5,7 +5,7 @@ const ActiveStatus = styled.div` text-overflow: ellipsis; white-space: nowrap; - &:before { + &::before { content: ''; display: inline-block; width: 6px; diff --git a/packages/strapi-admin/admin/src/components/Users/SelectRoles/IndicatorSeparator.js b/packages/strapi-admin/admin/src/components/Users/SelectRoles/IndicatorSeparator.js index 7ccc1241..b807d392 100644 --- a/packages/strapi-admin/admin/src/components/Users/SelectRoles/IndicatorSeparator.js +++ b/packages/strapi-admin/admin/src/components/Users/SelectRoles/IndicatorSeparator.js @@ -1,5 +1,5 @@ function IndicatorSeparator() { - return null + return null; } export default IndicatorSeparator; diff --git a/packages/strapi-admin/admin/src/components/Webhooks/EventInput/Wrapper.js b/packages/strapi-admin/admin/src/components/Webhooks/EventInput/Wrapper.js index 3167c9c8..5bb7317f 100644 --- a/packages/strapi-admin/admin/src/components/Webhooks/EventInput/Wrapper.js +++ b/packages/strapi-admin/admin/src/components/Webhooks/EventInput/Wrapper.js @@ -16,7 +16,7 @@ const Wrapper = styled.div` overflow: hidden; } tr { - &:before { + &::before { content: '-'; position: absolute; left: 20px; @@ -28,7 +28,7 @@ const Wrapper = styled.div` color: transparent; background-color: #f6f6f6; } - &:first-of-type:before { + &:first-of-type::before { left: 0; height: 2px; width: 100%; @@ -48,11 +48,11 @@ const Wrapper = styled.div` tbody { border-bottom-left-radius: ${sizes.borderRadius}; border-bottom-right-radius: ${sizes.borderRadius}; - box-shadow: inset 0px 0px 0px 1px #f6f6f6; + box-shadow: inset 0 0 0 1px #f6f6f6; td { height: 54px; padding-top: 3px; - input[type='checkbox']:disabled:before { + input[type='checkbox']:disabled::before { background-color: #e8e5e5; } &:first-of-type { diff --git a/packages/strapi-admin/admin/src/components/Webhooks/HeadersInput/Wrapper.js b/packages/strapi-admin/admin/src/components/Webhooks/HeadersInput/Wrapper.js index 82c05809..732681b8 100644 --- a/packages/strapi-admin/admin/src/components/Webhooks/HeadersInput/Wrapper.js +++ b/packages/strapi-admin/admin/src/components/Webhooks/HeadersInput/Wrapper.js @@ -9,7 +9,7 @@ import { sizes } from '@buffetjs/styles'; const Wrapper = styled.div` margin-top: 12px; - padding: 23px 24px 26px 24px; + padding: 23px 24px 26px; background-color: #fafafb; border-radius: ${sizes.borderRadius}; > ul { diff --git a/packages/strapi-admin/admin/src/components/Webhooks/Switch/Wrapper.js b/packages/strapi-admin/admin/src/components/Webhooks/Switch/Wrapper.js index 852b9538..5cab9c03 100644 --- a/packages/strapi-admin/admin/src/components/Webhooks/Switch/Wrapper.js +++ b/packages/strapi-admin/admin/src/components/Webhooks/Switch/Wrapper.js @@ -31,13 +31,10 @@ const Wrapper = styled.div` height: 17px; border-radius: 9px; background-color: #f1f1f1; - &:before { + &::before { content: ''; position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; + inset: 0; z-index: -1; margin: -1px; border-radius: inherit; diff --git a/packages/strapi-admin/admin/src/containers/Admin/Logout/components.js b/packages/strapi-admin/admin/src/containers/Admin/Logout/components.js index 4ce21ade..6ba31300 100644 --- a/packages/strapi-admin/admin/src/containers/Admin/Logout/components.js +++ b/packages/strapi-admin/admin/src/containers/Admin/Logout/components.js @@ -45,7 +45,7 @@ const Wrapper = styled.div` } } - &:after { + &::after { position: absolute; right: -1px; top: calc(50% - 10px); @@ -57,7 +57,7 @@ const Wrapper = styled.div` transition: opacity 0.2s ease-out; } - &:hover:after { + &:hover::after { opacity: 0; } @@ -74,29 +74,29 @@ const Wrapper = styled.div` border-top-right-radius: 0 !important; font-size: 14px; overflow: hidden; - box-shadow: 0 1px 4px 0px rgba(40, 42, 49, 0.05); + box-shadow: 0 1px 4px 0 rgb(40 42 49 / 5%); &:active { outline: 0; } - &:before { + &::before { content: ''; position: absolute; top: 0; left: -1px; width: calc(100% + 1px); height: 3px; - box-shadow: 0 1px 2px 0 rgba(40, 42, 49, 0.16); + box-shadow: 0 1px 2px 0 rgb(40 42 49 / 16%); } > button { height: 54px; - padding: 0px 15px; + padding: 0 15px; &:hover, &:focus, &:active { background-color: #fafafb !important; - border-radius: 0px; + border-radius: 0; cursor: pointer; outline: 0; } diff --git a/packages/strapi-admin/admin/src/containers/App/components.js b/packages/strapi-admin/admin/src/containers/App/components.js index db114c69..8cf8a87e 100644 --- a/packages/strapi-admin/admin/src/containers/App/components.js +++ b/packages/strapi-admin/admin/src/containers/App/components.js @@ -1,7 +1,7 @@ import styled from 'styled-components'; const Wrapper = styled.div` - font-family: 'Lato'; + font-family: Lato; font-size: 1.4rem; font-weight: 400; line-height: 1.5; diff --git a/packages/strapi-admin/admin/src/containers/AuthPage/components/Box/Wrapper.js b/packages/strapi-admin/admin/src/containers/AuthPage/components/Box/Wrapper.js index 16de4d38..8e0f7a05 100644 --- a/packages/strapi-admin/admin/src/containers/AuthPage/components/Box/Wrapper.js +++ b/packages/strapi-admin/admin/src/containers/AuthPage/components/Box/Wrapper.js @@ -3,7 +3,7 @@ import styled from 'styled-components'; const Wrapper = styled.div` margin: auto; width: 41.6rem; - padding: 20px 30px 25px 30px; + padding: 20px 30px 25px; border-radius: ${({ theme }) => theme.main.sizes.borderRadius}; border-top: 2px solid ${({ theme }) => theme.main.colors.mediumBlue}; background-color: ${({ theme }) => theme.main.colors.white}; diff --git a/packages/strapi-admin/admin/src/containers/AuthPage/components/Box/index.js b/packages/strapi-admin/admin/src/containers/AuthPage/components/Box/index.js index a1f30556..c53ccdd6 100644 --- a/packages/strapi-admin/admin/src/containers/AuthPage/components/Box/index.js +++ b/packages/strapi-admin/admin/src/containers/AuthPage/components/Box/index.js @@ -4,14 +4,16 @@ import { Text } from '@buffetjs/core'; import Wrapper from './Wrapper'; function Box({ children, errorMessage, withoutError }) { - return - {!withoutError && ( - - {errorMessage}  - - )} - {children} - + return ( + + {!withoutError && ( + + {errorMessage}  + + )} + {children} + + ); } Box.defaultProps = { diff --git a/packages/strapi-admin/admin/src/containers/AuthPage/components/ForgotPasswordSuccess/Envelope.js b/packages/strapi-admin/admin/src/containers/AuthPage/components/ForgotPasswordSuccess/Envelope.js index 7929a225..f92bb88e 100644 --- a/packages/strapi-admin/admin/src/containers/AuthPage/components/ForgotPasswordSuccess/Envelope.js +++ b/packages/strapi-admin/admin/src/containers/AuthPage/components/ForgotPasswordSuccess/Envelope.js @@ -2,19 +2,21 @@ import React from 'react'; function Envelope() { - return - - - ✉️ - - - + return ( + + + + ✉️ + + + + ); } export default Envelope; diff --git a/packages/strapi-admin/admin/src/containers/AuthPage/components/Logo/index.js b/packages/strapi-admin/admin/src/containers/AuthPage/components/Logo/index.js index 451878ff..96d18a8b 100644 --- a/packages/strapi-admin/admin/src/containers/AuthPage/components/Logo/index.js +++ b/packages/strapi-admin/admin/src/containers/AuthPage/components/Logo/index.js @@ -3,7 +3,7 @@ import LogoStrapi from '../../../../assets/images/logo_strapi.png'; import Img from './Img'; function Logo() { - return strapi-logo + return strapi-logo; } export default Logo; diff --git a/packages/strapi-admin/admin/src/containers/HomePage/components.js b/packages/strapi-admin/admin/src/containers/HomePage/components.js index be7892eb..36055400 100644 --- a/packages/strapi-admin/admin/src/containers/HomePage/components.js +++ b/packages/strapi-admin/admin/src/containers/HomePage/components.js @@ -5,8 +5,8 @@ const Block = styled.div` width: 100%; position: relative; margin-bottom: 34px; - background: #ffffff; - padding: 19px 30px 30px 30px; + background: #fff; + padding: 19px 30px 30px; box-shadow: 0 2px 4px 0 #e3e9f3; border-radius: 3px; line-height: 18px; @@ -24,7 +24,7 @@ const Block = styled.div` border-radius: 0.3rem; content: ''; opacity: 0.1; - background: #ffffff; + background: #fff; } } h2, @@ -35,7 +35,7 @@ const Block = styled.div` display: inline-block; } #mainHeader { - &:after { + &::after { content: ''; width: 100%; height: 3px; @@ -58,7 +58,7 @@ const Block = styled.div` `; const Container = styled.div` - padding: 47px 13px 0 13px; + padding: 47px 13px 0; > div { margin: 0; } @@ -76,7 +76,7 @@ const P = styled.p` `; const Wave = styled.div` - &:before { + &::before { content: '👋'; position: absolute; top: 24px; @@ -96,12 +96,11 @@ const ALink = styled.a` line-height: 34px; font-size: 13px; - &:before { + &::before { content: '\f105'; - font-weight: 600; margin-right: 10px; - font-family: 'FontAwesome'; + font-family: FontAwesome; } &:hover, @@ -120,7 +119,7 @@ const ALink = styled.a` border-radius: 0.3rem; content: ''; opacity: 0.1; - background: #ffffff; + background: #fff; } ${({ type }) => @@ -128,22 +127,22 @@ const ALink = styled.a` ? css` padding-left: 20px; margin-top: 16px; - color: #ffffff; + color: #fff; text-transform: uppercase; font-size: 13px; font-weight: 500; - &:before { + &::before { font-size: 16px; } &:hover { - color: #ffffff; + color: #fff; } ` : css` margin-top: 9px; font-size: 14px; color: #005fea; - &:before { + &::before { font-size: 12px; } &:hover { @@ -185,11 +184,11 @@ const LinkWrapper = styled.a` outline: 0; } - &:before { + &::before { position: absolute; left: 30px; top: 38px; - font-family: 'FontAwesome'; + font-family: FontAwesome; font-size: 38px; ${({ type }) => { @@ -213,6 +212,7 @@ const LinkWrapper = styled.a` &:first-child { font-size: 16px; } + color: #919bae; text-overflow: ellipsis; overflow: hidden; diff --git a/packages/strapi-admin/admin/src/containers/InstalledPluginsPage/Logo.js b/packages/strapi-admin/admin/src/containers/InstalledPluginsPage/Logo.js index fe980d5f..45971af7 100644 --- a/packages/strapi-admin/admin/src/containers/InstalledPluginsPage/Logo.js +++ b/packages/strapi-admin/admin/src/containers/InstalledPluginsPage/Logo.js @@ -17,10 +17,7 @@ const LogoContainer = styled.div` width: auto; height: auto; position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; + inset: 0; margin: auto; } diff --git a/packages/strapi-admin/admin/src/containers/LeftMenu/LoaderWrapper.js b/packages/strapi-admin/admin/src/containers/LeftMenu/LoaderWrapper.js index 6c780bf6..a28323cc 100644 --- a/packages/strapi-admin/admin/src/containers/LeftMenu/LoaderWrapper.js +++ b/packages/strapi-admin/admin/src/containers/LeftMenu/LoaderWrapper.js @@ -2,10 +2,7 @@ import styled from 'styled-components'; const LoaderWrapper = styled.div` position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; + inset: 0; z-index: 1140; background: ${({ theme }) => theme.main.colors.white}; `; diff --git a/packages/strapi-admin/admin/src/containers/LocaleToggle/Wrapper.js b/packages/strapi-admin/admin/src/containers/LocaleToggle/Wrapper.js index 9b04361d..51e2f3f3 100644 --- a/packages/strapi-admin/admin/src/containers/LocaleToggle/Wrapper.js +++ b/packages/strapi-admin/admin/src/containers/LocaleToggle/Wrapper.js @@ -60,21 +60,21 @@ const Wrapper = styled.div` border: none !important; border-top-left-radius: 0 !important; border-top-right-radius: 0 !important; - box-shadow: 0 1px 4px 0px rgba(40, 42, 49, 0.05); + box-shadow: 0 1px 4px 0 rgb(40 42 49 / 5%); - &:before { + &::before { content: ''; position: absolute; top: -3px; left: -1px; width: calc(100% + 1px); height: 3px; - box-shadow: 0 1px 2px 0 rgba(40, 42, 49, 0.16); + box-shadow: 0 1px 2px 0 rgb(40 42 49 / 16%); } > button { height: 40px; - padding: 0px 15px; + padding: 0 15px; line-height: 40px; color: #f75b1d; font-size: 13px; @@ -84,7 +84,7 @@ const Wrapper = styled.div` &:focus, &:active { background-color: #fafafb !important; - border-radius: 0px; + border-radius: 0; cursor: pointer; } } @@ -112,7 +112,7 @@ const Wrapper = styled.div` background: transparent !important; box-shadow: none !important; border: 1px solid #e3e9f3 !important; - border-top: 0px !important; + border-top: 0 !important; button { padding-left: 17px; @@ -121,7 +121,7 @@ const Wrapper = styled.div` } } - &:before { + &::before { box-shadow: none !important; } } diff --git a/packages/strapi-admin/admin/src/containers/MarketplacePage/MarketplaceBanner/Wrapper.js b/packages/strapi-admin/admin/src/containers/MarketplacePage/MarketplaceBanner/Wrapper.js index 4870210d..a86e1314 100644 --- a/packages/strapi-admin/admin/src/containers/MarketplacePage/MarketplaceBanner/Wrapper.js +++ b/packages/strapi-admin/admin/src/containers/MarketplacePage/MarketplaceBanner/Wrapper.js @@ -11,7 +11,6 @@ const Wrapper = styled.div` padding: 8px 16px; .bannerImage { - margin-right: 1rem; width: 48px; height: 48px; margin-right: 16px; diff --git a/packages/strapi-admin/admin/src/containers/MarketplacePage/PluginCard/Wrapper.js b/packages/strapi-admin/admin/src/containers/MarketplacePage/PluginCard/Wrapper.js index 06f27af1..d92bb399 100644 --- a/packages/strapi-admin/admin/src/containers/MarketplacePage/PluginCard/Wrapper.js +++ b/packages/strapi-admin/admin/src/containers/MarketplacePage/PluginCard/Wrapper.js @@ -48,6 +48,7 @@ const Wrapper = styled.div` > span:last-child { color: #1c5de7; } + -webkit-font-smoothing: antialiased; } @@ -135,7 +136,7 @@ const Wrapper = styled.div` -webkit-font-smoothing: antialiased; &:active { - box-shadow: inset 1px 1px 3px rgba(0, 0, 0, 0.15); + box-shadow: inset 1px 1px 3px rgb(0 0 0 / 15%); } } diff --git a/packages/strapi-admin/admin/src/containers/NewNotification/Notification/styledComponents.js b/packages/strapi-admin/admin/src/containers/NewNotification/Notification/styledComponents.js index c23e6933..db7f8ab1 100644 --- a/packages/strapi-admin/admin/src/containers/NewNotification/Notification/styledComponents.js +++ b/packages/strapi-admin/admin/src/containers/NewNotification/Notification/styledComponents.js @@ -19,7 +19,7 @@ const NotificationWrapper = styled.div` pointer-events: auto; &:hover { - box-shadow: 0 1px 5px 0 rgba(0, 0, 0, 0.2); + box-shadow: 0 1px 5px 0 rgb(0 0 0 / 20%); } `; diff --git a/packages/strapi-admin/admin/src/containers/NotFoundPage/index.js b/packages/strapi-admin/admin/src/containers/NotFoundPage/index.js index 97aed971..56c4a75b 100644 --- a/packages/strapi-admin/admin/src/containers/NotFoundPage/index.js +++ b/packages/strapi-admin/admin/src/containers/NotFoundPage/index.js @@ -14,7 +14,7 @@ import PropTypes from 'prop-types'; import { NotFound } from '@akemona-org/strapi-helper-plugin'; function NotFoundPage(props) { - return + return ; } NotFoundPage.propTypes = { diff --git a/packages/strapi-admin/admin/src/containers/Onboarding/Li.js b/packages/strapi-admin/admin/src/containers/Onboarding/Li.js index b3505199..a08d87fc 100644 --- a/packages/strapi-admin/admin/src/containers/Onboarding/Li.js +++ b/packages/strapi-admin/admin/src/containers/Onboarding/Li.js @@ -56,7 +56,7 @@ const Li = styled.li` display: inline-block; vertical-align: top; height: 100%; - font-family: 'FontAwesome'; + font-family: FontAwesome; color: white; font-size: 10px; margin-left: 3px; diff --git a/packages/strapi-admin/admin/src/containers/Onboarding/Wrapper.js b/packages/strapi-admin/admin/src/containers/Onboarding/Wrapper.js index be1a957c..f9f05cdb 100644 --- a/packages/strapi-admin/admin/src/containers/Onboarding/Wrapper.js +++ b/packages/strapi-admin/admin/src/containers/Onboarding/Wrapper.js @@ -46,7 +46,7 @@ const Wrapper = styled.div` margin-bottom: 0; } .videosHeader { - padding: 25px 15px 18px 15px; + padding: 25px 15px 18px; p { display: inline-block; vertical-align: top; @@ -86,11 +86,11 @@ const Wrapper = styled.div` animation: ${fadeOut} 0.5s forwards; } ul { - padding: 0 0 8px 0; + padding: 0 0 8px; margin-bottom: 0; list-style: none; &:last-of-type { - padding: 8px 0 10px 0; + padding: 8px 0 10px; border-top: 1px solid #f6f6f6; } } @@ -105,7 +105,7 @@ const Wrapper = styled.div` border-radius: 50%; color: white; background: #0e7de7; - box-shadow: 0px 2px 4px 0px rgba(227, 233, 243, 1); + box-shadow: 0 2px 4px 0 rgb(227 233 243 / 100%); i, svg { margin: auto; diff --git a/packages/strapi-admin/admin/src/containers/PluginDispatcher/tests/index.test.js b/packages/strapi-admin/admin/src/containers/PluginDispatcher/tests/index.test.js index 8493cf79..0b1988a0 100644 --- a/packages/strapi-admin/admin/src/containers/PluginDispatcher/tests/index.test.js +++ b/packages/strapi-admin/admin/src/containers/PluginDispatcher/tests/index.test.js @@ -4,10 +4,10 @@ import { BlockerComponent } from '@akemona-org/strapi-helper-plugin'; import { PluginDispatcher } from '../index'; function BlockerComponent2() { - return
BlockerComponent
+ return
BlockerComponent
; } function Email() { - return
Email Plugin
+ return
Email Plugin
; } describe('', () => { diff --git a/packages/strapi-admin/admin/src/containers/PrivateRoute/index.js b/packages/strapi-admin/admin/src/containers/PrivateRoute/index.js index 432fdf5d..545ec6b4 100644 --- a/packages/strapi-admin/admin/src/containers/PrivateRoute/index.js +++ b/packages/strapi-admin/admin/src/containers/PrivateRoute/index.js @@ -15,20 +15,22 @@ import { auth } from '@akemona-org/strapi-helper-plugin'; /* eslint-disable react/jsx-curly-newline */ function PrivateRoute({ component: Component, path, ...rest }) { - return - auth.getToken() !== null ? ( - - ) : ( - - ) - } - /> + return ( + + auth.getToken() !== null ? ( + + ) : ( + + ) + } + /> + ); } PrivateRoute.propTypes = { diff --git a/packages/strapi-admin/admin/src/containers/Roles/ProtectedListPage/index.js b/packages/strapi-admin/admin/src/containers/Roles/ProtectedListPage/index.js index c6489c98..3cdf1b91 100644 --- a/packages/strapi-admin/admin/src/containers/Roles/ProtectedListPage/index.js +++ b/packages/strapi-admin/admin/src/containers/Roles/ProtectedListPage/index.js @@ -4,9 +4,11 @@ import adminPermissions from '../../../permissions'; import ListPage from '../ListPage'; function ProtectedListPage() { - return - - + return ( + + + + ); } export default ProtectedListPage; diff --git a/packages/strapi-admin/admin/src/containers/SettingsPage/components/ApplicationDetailLink/Notif.js b/packages/strapi-admin/admin/src/containers/SettingsPage/components/ApplicationDetailLink/Notif.js index 327211aa..be2694e2 100644 --- a/packages/strapi-admin/admin/src/containers/SettingsPage/components/ApplicationDetailLink/Notif.js +++ b/packages/strapi-admin/admin/src/containers/SettingsPage/components/ApplicationDetailLink/Notif.js @@ -4,7 +4,7 @@ const Notif = styled.div` margin: auto; margin-right: 15px; - &:before { + &::before { content: ''; display: flex; width: 6px; diff --git a/packages/strapi-admin/admin/src/containers/SettingsPage/components/ApplicationDetailLink/Wrapper.js b/packages/strapi-admin/admin/src/containers/SettingsPage/components/ApplicationDetailLink/Wrapper.js index 72e96acb..a922778f 100644 --- a/packages/strapi-admin/admin/src/containers/SettingsPage/components/ApplicationDetailLink/Wrapper.js +++ b/packages/strapi-admin/admin/src/containers/SettingsPage/components/ApplicationDetailLink/Wrapper.js @@ -3,7 +3,7 @@ import styled from 'styled-components'; const Wrapper = styled.div` position: relative; margin-bottom: -5px; - padding: 25px 20px 0 20px; + padding: 25px 20px 0; `; export default Wrapper; diff --git a/packages/strapi-admin/admin/src/containers/SettingsPage/components/StyledLeftMenu/index.js b/packages/strapi-admin/admin/src/containers/SettingsPage/components/StyledLeftMenu/index.js index a246afd6..a8884e84 100644 --- a/packages/strapi-admin/admin/src/containers/SettingsPage/components/StyledLeftMenu/index.js +++ b/packages/strapi-admin/admin/src/containers/SettingsPage/components/StyledLeftMenu/index.js @@ -6,6 +6,7 @@ const StyledLeftMenu = styled(LeftMenu)` > div { margin-bottom: 27px; } + min-height: unset; height: unset; `; diff --git a/packages/strapi-admin/admin/src/containers/Users/ProtectedListPage/index.js b/packages/strapi-admin/admin/src/containers/Users/ProtectedListPage/index.js index 89075c77..828c8d13 100644 --- a/packages/strapi-admin/admin/src/containers/Users/ProtectedListPage/index.js +++ b/packages/strapi-admin/admin/src/containers/Users/ProtectedListPage/index.js @@ -4,9 +4,11 @@ import adminPermissions from '../../../permissions'; import ListPage from '../ListPage'; function ProtectedListPage() { - return - - + return ( + + + + ); } export default ProtectedListPage; diff --git a/packages/strapi-admin/admin/src/containers/Webhooks/EditView/Wrapper.js b/packages/strapi-admin/admin/src/containers/Webhooks/EditView/Wrapper.js index 1dd2e7ab..510daf03 100644 --- a/packages/strapi-admin/admin/src/containers/Webhooks/EditView/Wrapper.js +++ b/packages/strapi-admin/admin/src/containers/Webhooks/EditView/Wrapper.js @@ -16,7 +16,7 @@ const Wrapper = styled.div` } } .header-title + div { - button: first-of-type { + button:first-of-type { position: relative; margin-right: 30px; overflow: initial; @@ -42,8 +42,8 @@ const Wrapper = styled.div` } .form-card { margin-bottom: 30px; - padding: 21px 25px 0px 25px; - background-color: #ffffff; + padding: 21px 25px 0; + background-color: #fff; border-radius: 2px; box-shadow: 0 2px 4px 0 #e3e9f3; } diff --git a/packages/strapi-admin/admin/src/containers/Webhooks/ProtectedCreateView/index.js b/packages/strapi-admin/admin/src/containers/Webhooks/ProtectedCreateView/index.js index 8d4b8d75..6c46fada 100644 --- a/packages/strapi-admin/admin/src/containers/Webhooks/ProtectedCreateView/index.js +++ b/packages/strapi-admin/admin/src/containers/Webhooks/ProtectedCreateView/index.js @@ -4,9 +4,11 @@ import adminPermissions from '../../../permissions'; import EditView from '../EditView'; function ProtectedCreateView() { - return - - + return ( + + + + ); } export default ProtectedCreateView; diff --git a/packages/strapi-admin/admin/src/containers/Webhooks/ProtectedEditView/index.js b/packages/strapi-admin/admin/src/containers/Webhooks/ProtectedEditView/index.js index ca5062ec..694608ed 100644 --- a/packages/strapi-admin/admin/src/containers/Webhooks/ProtectedEditView/index.js +++ b/packages/strapi-admin/admin/src/containers/Webhooks/ProtectedEditView/index.js @@ -4,9 +4,11 @@ import adminPermissions from '../../../permissions'; import EditView from '../EditView'; function ProtectedEditView() { - return - - + return ( + + + + ); } export default ProtectedEditView; diff --git a/packages/strapi-admin/admin/src/containers/Webhooks/ProtectedListView/index.js b/packages/strapi-admin/admin/src/containers/Webhooks/ProtectedListView/index.js index 2fe8fc32..2dc4a3f6 100644 --- a/packages/strapi-admin/admin/src/containers/Webhooks/ProtectedListView/index.js +++ b/packages/strapi-admin/admin/src/containers/Webhooks/ProtectedListView/index.js @@ -4,9 +4,11 @@ import adminPermissions from '../../../permissions'; import ListView from '../ListView'; function ProtectedListView() { - return - - + return ( + + + + ); } export default ProtectedListView; 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 eab6b4d3..48f0cb84 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 @@ -7,7 +7,7 @@ const Wrapper = styled.div` height: 30px; width: 100%; justify-content: space-between; - background: #ffffff; + background: #fff; color: #333740; border-radius: 2px; border: solid 1px #007eff; @@ -19,7 +19,7 @@ const Wrapper = styled.div` width: 100%; color: #333740; text-align: left; - background-color: #ffffff; + background-color: #fff; border: none; font-size: 13px; font-weight: 500; @@ -59,8 +59,7 @@ const Wrapper = styled.div` border-top-right-radius: 0; border-color: #e3e9f3 !important; border-top-color: #aed4fb !important; - box-shadow: 0 2px 3px rgba(227, 233, 245, 0.5); - + box-shadow: 0 2px 3px rgb(227 233 245 / 50%); overflow: scroll; button { diff --git a/packages/strapi-plugin-content-manager/admin/src/components/Block/components.js b/packages/strapi-plugin-content-manager/admin/src/components/Block/components.js index 03e170e8..2eac85df 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/Block/components.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/Block/components.js @@ -2,7 +2,7 @@ import styled from 'styled-components'; const Wrapper = styled.div` margin-bottom: 35px; - background: #ffffff; + background: #fff; padding: 22px 28px 18px; padding-bottom: 13px; border-radius: 2px; @@ -11,7 +11,7 @@ const Wrapper = styled.div` `; const Sub = styled.div` - padding-top: 0px; + padding-top: 0; line-height: 18px; > p:first-child { margin-bottom: 1px; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/Block/index.js b/packages/strapi-plugin-content-manager/admin/src/components/Block/index.js index b9b8f3fe..3a52ec3a 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/Block/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/Block/index.js @@ -11,19 +11,21 @@ import { Wrapper, Sub } from './components'; const renderMsg = (msg) =>

{msg}

; function Block({ children, description, style, title }) { - return
- - - {!!title && ( -

- -

- )} - {!!description && {renderMsg}} -
- {children} -
-
+ return ( +
+ + + {!!title && ( +

+ +

+ )} + {!!description && {renderMsg}} +
+ {children} +
+
+ ); } Block.defaultProps = { diff --git a/packages/strapi-plugin-content-manager/admin/src/components/Container/index.js b/packages/strapi-plugin-content-manager/admin/src/components/Container/index.js index b5c9ceee..7fa0ba65 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/Container/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/Container/index.js @@ -1,7 +1,7 @@ import styled from 'styled-components'; const Container = styled.div` - padding: 18px 30px 66px 30px; + padding: 18px 30px 66px; `; export default Container; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/CustomInputCheckbox/components.js b/packages/strapi-plugin-content-manager/admin/src/components/CustomInputCheckbox/components.js index 2edd9cfb..1e7a1944 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/CustomInputCheckbox/components.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/CustomInputCheckbox/components.js @@ -8,14 +8,14 @@ const Label = styled.label` > input { display: none; } - &:before { + &::before { content: ''; position: absolute; left: 15px; top: calc(50% - 8px); width: 14px; height: 14px; - border: 1px solid rgba(16, 22, 34, 0.15); + border: 1px solid rgb(16 22 34 / 15%); background-color: #fdfdfd; border-radius: 3px; } @@ -23,13 +23,13 @@ const Label = styled.label` ${({ shouldDisplaySomeChecked }) => { if (shouldDisplaySomeChecked) { return css` - &:after { + &::after { content: '\f068'; position: absolute; top: calc(50% - 8px); left: 18px; font-size: 10px; - font-family: 'FontAwesome'; + font-family: FontAwesome; font-weight: 100; color: #1c5de7; } @@ -40,13 +40,13 @@ const Label = styled.label` ${({ shouldDisplayAllChecked }) => { if (shouldDisplayAllChecked) { return css` - &:after { + &::after { content: '\f00c'; position: absolute; top: calc(50% - 9px); left: 17px; font-size: 10px; - font-family: 'FontAwesome'; + font-family: FontAwesome; font-weight: 100; color: #1c5de7; transition: all 0.2s; @@ -58,13 +58,13 @@ const Label = styled.label` ${({ isChecked }) => { if (isChecked) { return css` - &:after { + &::after { content: '\f00c'; position: absolute; top: calc(50% - 11px); left: 17px; font-size: 10px; - font-family: 'FontAwesome'; + font-family: FontAwesome; font-weight: 100; color: #1c5de7; transition: all 0.2s; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/ActionCollapse/Delete.js b/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/ActionCollapse/Delete.js index a9ad8c2a..1ad12418 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/ActionCollapse/Delete.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/ActionCollapse/Delete.js @@ -3,7 +3,7 @@ import styled from 'styled-components'; const Delete = styled.span` font-weight: 600; -webkit-font-smoothing: antialiased; - &:after { + &::after { content: '—'; margin: 0 7px; font-size: 13px; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/ActionCollapse/DeleteAll.js b/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/ActionCollapse/DeleteAll.js index 219e9899..fe15f21a 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/ActionCollapse/DeleteAll.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/ActionCollapse/DeleteAll.js @@ -5,7 +5,7 @@ const DeleteAll = styled.span` color: #f64d0a; font-weight: 500; cursor: pointer; - &:after { + &::after { position: relative; top: -1px; content: '\f2ed'; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/Row/ActionContainer.js b/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/Row/ActionContainer.js index 3950d9ff..48a0ba1f 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/Row/ActionContainer.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/Row/ActionContainer.js @@ -7,11 +7,10 @@ const ActionContainer = styled.td` svg { margin-left: 15px; font-size: 1rem; - color: #333740; &:first-of-type { - margin-left: 0px; + margin-left: 0; } } `; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/styledComponents.js b/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/styledComponents.js index 01121636..ba2567c5 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/styledComponents.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/styledComponents.js @@ -29,7 +29,7 @@ const Table = styled.table` const TableEmpty = styled.tr` width: 100%; height: 108px; - background: #ffffff; + background: #fff; td { height: 106px; @@ -45,7 +45,7 @@ const TableEmpty = styled.tr` const TableRow = styled.tr` height: 54px; - background: #ffffff; + background: #fff; &:hover { cursor: pointer; @@ -75,7 +75,7 @@ const LoadingWrapper = styled.div` display: flex; background: ${(props) => props.theme.main.colors.white}; box-shadow: 0 2px 4px ${(props) => props.theme.main.colors.darkGrey}; - clip-path: inset(0px -5px -5px -5px); + clip-path: inset(0 -5px -5px -5px); `; LoadingWrapper.propTypes = { 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 41db156b..f826bf86 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 @@ -8,8 +8,8 @@ const GrabWrapper = styled.div` flex-direction: column; justify-content: center; position: absolute; - top: 0px; - bottom: 0px; + top: 0; + bottom: 0; left: 0; padding-left: 10px; border-right: 1px solid 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 1ca77b43..802bb015 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 @@ -7,8 +7,8 @@ const RemoveWrapper = styled.div` flex-direction: column; justify-content: center; position: absolute; - top: 0px; - bottom: 0px; + top: 0; + bottom: 0; right: 0; width: 30px; text-align: center; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/SubWrapper.js b/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/SubWrapper.js index 6905d232..649e16b8 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/SubWrapper.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/DraggedField/SubWrapper.js @@ -14,10 +14,8 @@ const SubWrapper = styled.div` `; } }}; - line-height: ${({ withLongerHeight }) => getHeight(withLongerHeight)}; cursor: pointer; - background: ${({ isOverEditBlock, isOverRemove, isSelected }) => { if (isOverRemove) { return '#ffe9e0'; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DraggedFieldWithPreview/Carret.js b/packages/strapi-plugin-content-manager/admin/src/components/DraggedFieldWithPreview/Carret.js index 5904adfa..8c9da86f 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/DraggedFieldWithPreview/Carret.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/DraggedFieldWithPreview/Carret.js @@ -9,7 +9,7 @@ const Carret = styled.div` right: -4px; `; } - + // eslint-disable-next-line newline-before-return return ` left: -1px; `; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DraggedFieldWithPreview/DynamicZoneWrapper.js b/packages/strapi-plugin-content-manager/admin/src/components/DraggedFieldWithPreview/DynamicZoneWrapper.js index d211033e..bf436113 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/DraggedFieldWithPreview/DynamicZoneWrapper.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/DraggedFieldWithPreview/DynamicZoneWrapper.js @@ -2,7 +2,7 @@ import styled from 'styled-components'; const DynamicZoneWrapper = styled.div` display: flex; - margin: 5px 0 0px 0; + margin: 5px 0 0; overflow: auto; height: 119px; `; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DraggedFieldWithPreview/Tooltip.js b/packages/strapi-plugin-content-manager/admin/src/components/DraggedFieldWithPreview/Tooltip.js index 182452dc..8252e21f 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/DraggedFieldWithPreview/Tooltip.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/DraggedFieldWithPreview/Tooltip.js @@ -8,7 +8,7 @@ const Tooltip = styled.div` line-height: 20px; height: 20px; padding: 0 10px; - background-color: #000000; + background-color: #000; font-size: 12px; color: #fff; opacity: 0.5; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DynamicComponentCard/Wrapper.js b/packages/strapi-plugin-content-manager/admin/src/components/DynamicComponentCard/Wrapper.js index cf2822bf..3edd50fa 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/DynamicComponentCard/Wrapper.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/DynamicComponentCard/Wrapper.js @@ -6,12 +6,12 @@ const Wrapper = styled.div` width: 139px !important; margin: 0 10px 10px 0; padding: 18px 10px; - background-color: #ffffff; + background-color: #fff; color: #919bae; text-align: center; border-radius: 2px; cursor: pointer; - border: 1px solid #ffffff; + border: 1px solid #fff; button { outline: 0; 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 4e152be7..f485b5a8 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 @@ -8,8 +8,8 @@ const Button = styled(PlusButton)` transition: transform 0.1s ease-in-out; &:hover { background-color: #aed4fb; - :before, - :after { + ::before, + ::after { background-color: #007eff; } } diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/Component/RoundCTA.js b/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/Component/RoundCTA.js index bd546266..38dcd739 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/Component/RoundCTA.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/Component/RoundCTA.js @@ -5,7 +5,7 @@ const RoundCTA = styled.div` width: 31px; border-radius: 50%; background-color: #f2f3f4; - border: 2px solid #ffffff; + border: 2px solid #fff; cursor: pointer; display: flex; z-index: 9; @@ -27,8 +27,8 @@ const RoundCTA = styled.div` &.arrow-btn { height: 22px; width: 22px; - background-color: #ffffff; - border: 2px solid #ffffff; + background-color: #fff; + border: 2px solid #fff; svg { font-size: 10px; line-height: 22px; 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 3c5912b9..5011e8e3 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 @@ -21,7 +21,7 @@ const ComponentWrapper = styled.div` } &:not(:first-of-type) { margin-top: 32px; - &:before { + &::before { content: '&'; position: absolute; top: -30px; 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 34b66e1d..e59f6237 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 @@ -6,7 +6,7 @@ const Label = styled.div` font-weight: 600; position: relative; min-height: 64px; - &:after { + &::after { content: '•'; position: absolute; top: 15px; @@ -19,7 +19,7 @@ const Label = styled.div` border-radius: 4px; border: 1px solid white; } - &:before { + &::before { content: '&'; position: absolute; top: 22px; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/Picker/Category/Banner/Wrapper.js b/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/Picker/Category/Banner/Wrapper.js index 8992b2d0..f77f2370 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/Picker/Category/Banner/Wrapper.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/Picker/Category/Banner/Wrapper.js @@ -8,7 +8,7 @@ const BannerWrapper = styled.button` width: 100%; padding: 0 15px; border-bottom: 0; - border: 1px solid rgba(227, 233, 243, 0.75); + border: 1px solid rgb(227 233 243 / 75%); background-color: ${({ theme }) => theme.main.colors.white}; font-size: ${({ theme }) => theme.main.sizes.fonts.md}; font-weight: ${({ theme }) => theme.main.fontWeights.semiBold}; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/Picker/Wrapper.js b/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/Picker/Wrapper.js index 5b7c7af0..d8ec9275 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/Picker/Wrapper.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/Picker/Wrapper.js @@ -5,7 +5,7 @@ const Wrapper = styled.div` > div { margin-top: 15px; - padding: 23px 18px 21px 18px; + padding: 23px 18px 21px; background-color: #f2f3f4; } diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/utils/connect.js b/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/utils/connect.js index 238d60ef..b41217bc 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/utils/connect.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/utils/connect.js @@ -1,7 +1,7 @@ import React from 'react'; function connect(WrappedComponent, select) { - return function(props) { + return function (props) { // eslint-disable-next-line react/prop-types const selectors = select(props.name); diff --git a/packages/strapi-plugin-content-manager/admin/src/components/FieldComponent/EmptyComponent.js b/packages/strapi-plugin-content-manager/admin/src/components/FieldComponent/EmptyComponent.js index b0b1335a..4375168e 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/FieldComponent/EmptyComponent.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/FieldComponent/EmptyComponent.js @@ -2,7 +2,7 @@ import styled from 'styled-components'; const EmptyComponent = styled.div` height: 72px; - border: 1px solid rgba(227, 233, 243, 0.75); + border: 1px solid rgb(227 233 243 / 75%); border-top-left-radius: 2px; border-top-right-radius: 2px; border-bottom: 0; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/FieldComponent/ResetComponent.js b/packages/strapi-plugin-content-manager/admin/src/components/FieldComponent/ResetComponent.js index 016e5558..01435a50 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/FieldComponent/ResetComponent.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/FieldComponent/ResetComponent.js @@ -5,7 +5,6 @@ const ResetComponent = styled.div` top: 0; right: 15px; display: flex; - cursor: pointer; color: #4b515a; @@ -18,6 +17,7 @@ const ResetComponent = styled.div` > div { background-color: #faa684; } + color: #f64d0a; > span { display: initial; @@ -30,7 +30,7 @@ const ResetComponent = styled.div` background-color: #f3f4f4; text-align: center; border-radius: 2px; - &:after { + &::after { content: '\f2ed'; font-size: 10px; font-family: FontAwesome; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/FieldComponent/utils/connect.js b/packages/strapi-plugin-content-manager/admin/src/components/FieldComponent/utils/connect.js index 648a3d30..f1027b59 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/FieldComponent/utils/connect.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/FieldComponent/utils/connect.js @@ -1,7 +1,7 @@ import React from 'react'; function connect(WrappedComponent, select) { - return function(props) { + return function (props) { // eslint-disable-next-line react/prop-types const selectors = select(props); diff --git a/packages/strapi-plugin-content-manager/admin/src/components/FilterOptionsCTA/index.js b/packages/strapi-plugin-content-manager/admin/src/components/FilterOptionsCTA/index.js index 90001ebf..3dfa396d 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/FilterOptionsCTA/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/FilterOptionsCTA/index.js @@ -5,7 +5,7 @@ const FilterOptionsCTA = styled.button` justify-content: center; height: 20px; width: 20px; - margin: 8px 5px 0px 0px; + margin: 8px 5px 0 0; border-radius: 50%; border: 1px solid #e3e9f3; cursor: pointer; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/FilterPicker/components.js b/packages/strapi-plugin-content-manager/admin/src/components/FilterPicker/components.js index b01bf0bb..914775cd 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/FilterPicker/components.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/FilterPicker/components.js @@ -19,7 +19,7 @@ const Span = styled.span` vertical-align: text-top; cursor: pointer; - &:after { + &::after { margin-left: 2px; content: '\f077'; font-family: FontAwesome; @@ -41,7 +41,7 @@ const Div = styled.div` margin: ${(props) => (props.show ? '-100px -30px 30px' : `-${props.number}px -30px 103px`)}; background: #fff; box-shadow: 3px 2px 4px #e3e9f3; - padding: 18px 30px 0px 30px; + padding: 18px 30px 0; transition: ${(props) => { if (props.anim) { return props.show diff --git a/packages/strapi-plugin-content-manager/admin/src/components/FilterPickerOption/components.js b/packages/strapi-plugin-content-manager/admin/src/components/FilterPickerOption/components.js index 481939a4..e85deb69 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/FilterPickerOption/components.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/FilterPickerOption/components.js @@ -6,14 +6,14 @@ const Wrapper = styled.div` min-height: 38px; border-left: ${(props) => props.borderLeft && '3px solid #007EFF'}; padding-left: ${(props) => (props.borderLeft ? '10px' : '13px')}; - margin-bottom: 0px !important; + margin-bottom: 0 !important; `; const InputWrapper = styled.div` display: flex; input, select { - margin: 0px 5px !important; + margin: 0 5px !important; } `; @@ -54,7 +54,7 @@ const Input = styled.input` border-radius: 0.25rem; line-height: 3.4rem; font-size: 1.3rem; - font-family: 'Lato' !important; - box-shadow: 0px 1px 1px rgba(104, 118, 142, 0.05); + font-family: Lato !important; + box-shadow: 0 1px 1px rgb(104 118 142 / 5%); `; export { InputWrapper, Wrapper, InputWrapperDate, Input }; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/FormTitle/index.js b/packages/strapi-plugin-content-manager/admin/src/components/FormTitle/index.js index 7a2f6ff6..50a370a7 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/FormTitle/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/FormTitle/index.js @@ -3,10 +3,14 @@ import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; function FormTitle({ description, title }) { - return <> - {!!title && } - {!!description && {(msg) =>

{msg}

}
} - + return ( + <> + {!!title && } + {!!description && ( + {(msg) =>

{msg}

}
+ )} + + ); } FormTitle.propTypes = { diff --git a/packages/strapi-plugin-content-manager/admin/src/components/FormWrapper/index.js b/packages/strapi-plugin-content-manager/admin/src/components/FormWrapper/index.js index 754fd9ed..a829c07d 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/FormWrapper/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/FormWrapper/index.js @@ -1,8 +1,8 @@ import styled from 'styled-components'; const FormWrapper = styled.div` - padding: 22px 10px 0 10px; - background: #ffffff; + padding: 22px 10px 0; + background: #fff; border-radius: 2px; box-shadow: 0 2px 4px #e3e9f3; margin-bottom: 17px; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/InputUID/Options/index.js b/packages/strapi-plugin-content-manager/admin/src/components/InputUID/Options/index.js index 6267ba27..0eb8f156 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/InputUID/Options/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/InputUID/Options/index.js @@ -9,17 +9,19 @@ import OptionsTitle from './OptionsTitle'; import RightOptionLabel from './RightOptionLabel'; function Options({ options, title }) { - return - {title && {title}} - {options.map((option) => ( - - ))} - + return ( + + {title && {title}} + {options.map((option) => ( + + ))} + + ); } Options.propTypes = { diff --git a/packages/strapi-plugin-content-manager/admin/src/components/Inputs/utils/connect.js b/packages/strapi-plugin-content-manager/admin/src/components/Inputs/utils/connect.js index 51685b44..f7d486eb 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/Inputs/utils/connect.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/Inputs/utils/connect.js @@ -1,7 +1,7 @@ import React from 'react'; function connect(WrappedComponent, select) { - return function(props) { + return function (props) { // eslint-disable-next-line react/prop-types const selectors = select(props.keys); diff --git a/packages/strapi-plugin-content-manager/admin/src/components/MediaPreviewList/StyledMediaPreviewList.js b/packages/strapi-plugin-content-manager/admin/src/components/MediaPreviewList/StyledMediaPreviewList.js index 2407db19..57f8fc9c 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/MediaPreviewList/StyledMediaPreviewList.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/MediaPreviewList/StyledMediaPreviewList.js @@ -80,7 +80,7 @@ const MediaPreviewFile = styled(MediaPreviewItem)` font-size: 15px; width: 100%; height: 100%; - &:before { + &::before { width: 100%; height: 100%; padding: 10px; @@ -145,7 +145,7 @@ const MediaPreviewImage = styled(MediaPreviewItem)` border-radius: calc(${sizes.big} / 2); margin-top: calc(${`-${sizes.big}`} - ${sizes.small} - 5px); margin-left: calc((${sizes.small} - ${sizes.big}) / 2); - box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.05); + box-shadow: 0 2px 4px 0 rgb(0 0 0 / 5%); } &.hoverable { 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 8adb7435..3d9c44cd 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 @@ -36,15 +36,15 @@ const Button = styled.button` outline: 0; } - :before { + ::before { ${beforeStyle} } - :after { + ::after { ${afterStyle} } - :before, - :after { + ::before, + ::after { background-color: #b4b6ba; } `; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/PreviewCarret/components.js b/packages/strapi-plugin-content-manager/admin/src/components/PreviewCarret/components.js index 761d9630..b1b0f136 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/PreviewCarret/components.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/PreviewCarret/components.js @@ -8,14 +8,12 @@ const Wrapper = styled.div` height: 30px; width: 100%; padding: 0 5px; - ${({ isComponent }) => isComponent && ` height: 34px; padding: 0; `} - border-radius: 2px; > div { width: 100%; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/PreviewCarret/index.js b/packages/strapi-plugin-content-manager/admin/src/components/PreviewCarret/index.js index b36e3847..621c8cb4 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/PreviewCarret/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/PreviewCarret/index.js @@ -4,9 +4,11 @@ import PropTypes from 'prop-types'; import Wrapper from './components'; function PreviewCarret({ isComponent, style }) { - return -
- + return ( + +
+ + ); } PreviewCarret.defaultProps = { diff --git a/packages/strapi-plugin-content-manager/admin/src/components/PreviewWysiwyg/Wrapper.js b/packages/strapi-plugin-content-manager/admin/src/components/PreviewWysiwyg/Wrapper.js index f8968079..c7862a33 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/PreviewWysiwyg/Wrapper.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/PreviewWysiwyg/Wrapper.js @@ -6,11 +6,11 @@ const Wrapper = styled.div` max-height: 555px; min-height: 294px; overflow: auto; - padding: 20px 20px 0 20px; + padding: 20px 20px 0; font-size: 16px; background-color: #fff; line-height: 24px !important; - font-family: 'Lato'; + font-family: Lato; cursor: text; h1, @@ -19,9 +19,8 @@ const Wrapper = styled.div` h4, h5, h6 { - margin-block-start: 10px; - margin-block-end: 10px; - font-family: 'Lato'; + margin-block: 10px 10px; + font-family: Lato; } h1 { @@ -61,7 +60,7 @@ const Wrapper = styled.div` table { font-size: 13px; thead { - background: rgb(243, 243, 243); + background: rgb(243 243 243); tr { height: 43px; } @@ -87,7 +86,7 @@ const Wrapper = styled.div` pre, code { font-size: 13px; - font-family: 'Lato'; + font-family: Lato; border-radius: 3px; background-color: #002b36; } 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 7f02123e..60d839bb 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 @@ -5,13 +5,12 @@ const Button = styled.button` width: 100%; height: 37px; margin-bottom: 25px; - padding: 0 0 3px 0; + padding: 0 0 3px; text-align: center; - border: 1px solid rgba(227, 233, 243, 0.75); + border: 1px solid rgb(227 233 243 / 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 }) => { @@ -20,10 +19,9 @@ const Button = styled.button` border-radius: 2px; `; } - + // eslint-disable-next-line newline-before-return return ''; }} - ${({ hasMinError }) => { if (hasMinError) { return ` @@ -31,10 +29,9 @@ const Button = styled.button` border-top-color: rgba(227, 233, 243, 0.75); `; } - + // eslint-disable-next-line newline-before-return return ''; }} - color: ${({ disabled }) => (disabled ? '#9EA7B8' : ' #007eff')}; font-size: 12px; font-weight: 700; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/BannerWrapper.js b/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/BannerWrapper.js index 9022ee9b..ef282b34 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/BannerWrapper.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/BannerWrapper.js @@ -17,7 +17,6 @@ const BannerWrapper = styled.button` return 'rgba(227, 233, 243, 0.75)'; } }}; - ${({ doesPreviousFieldContainErrorsAndIsOpen }) => { if (doesPreviousFieldContainErrorsAndIsOpen) { return ` @@ -25,7 +24,6 @@ const BannerWrapper = styled.button` `; } }} - ${({ isFirst }) => { if (isFirst) { return ` @@ -34,7 +32,6 @@ const BannerWrapper = styled.button` `; } }} - ${({ hasMinError, isFirst }) => { if (hasMinError) { return ` @@ -44,12 +41,10 @@ const BannerWrapper = styled.button` `; } }} - border-bottom: 0; font-size: 13px; font-weight: 500; cursor: pointer; - background-color: ${({ hasErrors, isOpen, isReadOnly }) => { if (isReadOnly) { return '#fafafb'; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/DraggedItem/utils/connect.js b/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/DraggedItem/utils/connect.js index 563d58b4..e9c07d0f 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/DraggedItem/utils/connect.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/DraggedItem/utils/connect.js @@ -1,7 +1,7 @@ import React from 'react'; function connect(WrappedComponent, select) { - return function(props) { + return function (props) { const selectors = select(props); return ; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/EmptyComponent.js b/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/EmptyComponent.js index 7f60ab98..c92de8aa 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/EmptyComponent.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/EmptyComponent.js @@ -3,7 +3,7 @@ import styled from 'styled-components'; /* eslint-disable indent */ const EmptyComponent = styled.div` height: 71px; - border: 1px solid rgba(227, 233, 243, 0.75); + border: 1px solid rgb(227 233 243 / 75%); border-top-left-radius: 2px; border-top-right-radius: 2px; border-bottom: 0; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/FormWrapper.js b/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/FormWrapper.js index f6240501..1fa7a0e2 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/FormWrapper.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/FormWrapper.js @@ -3,10 +3,7 @@ import styled from 'styled-components'; /* eslint-disable indent */ const FormWrapper = styled.div` - padding-top: 24px; - padding-left: 20px; - padding-right: 20px; - padding-bottom: 10px; + padding: 24px 20px 10px; border-top: 1px solid ${({ hasErrors, isOpen, isReadOnly }) => { if (hasErrors) { diff --git a/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/utils/connect.js b/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/utils/connect.js index 563d58b4..e9c07d0f 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/utils/connect.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/utils/connect.js @@ -1,7 +1,7 @@ import React from 'react'; function connect(WrappedComponent, select) { - return function(props) { + return function (props) { const selectors = select(props); return ; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/SelectMany/components.js b/packages/strapi-plugin-content-manager/admin/src/components/SelectMany/components.js index 8a54a949..329426ab 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/SelectMany/components.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/SelectMany/components.js @@ -4,7 +4,7 @@ const ListWrapper = styled.div` max-height: 116px; > ul { - margin: 0 -20px 0; + margin: 0 -20px; padding: 0 20px !important; list-style: none !important; overflow: auto; @@ -16,9 +16,9 @@ const ListShadow = styled.div` position: relative; display: inline-block; width: 100%; - height: 0px; + height: 0; - &:after { + &::after { position: absolute; top: -15px; left: -5px; @@ -27,20 +27,19 @@ const ListShadow = styled.div` width: calc(100% + 10px); height: 1px; margin-bottom: -25px; - box-shadow: 0px -2px 4px 0px rgba(227, 233, 243, 0.5); + box-shadow: 0 -2px 4px 0 rgb(227 233 243 / 50%); } `; const Li = styled.li` display: flex; flex-wrap: nowrap; - align-content: center; - justify-content: space-between; + place-content: center space-between; height: 18px; margin-top: 9px; line-height: 1; &:last-of-type { - margin-bottom: 0px; + margin-bottom: 0; } &:active { .dragHandle { @@ -61,13 +60,13 @@ const Li = styled.li` display: inline-block; width: 6px; height: 1px; - padding: 0px !important; + padding: 0 !important; background: #b3b5b9; overflow: visible !important; transition: background 0.25s ease-out; - &:before, - &:after { + &::before, + &::after { content: ''; display: inline-block; width: 6px; @@ -75,13 +74,13 @@ const Li = styled.li` background: inherit; } - &:before { + &::before { position: absolute; top: -2px; left: 0; } - &:after { + &::after { position: absolute; bottom: -2px; left: 0; @@ -94,7 +93,7 @@ const Li = styled.li` > a { flex-grow: 2; max-width: 100%; - color: rgb(35, 56, 77); + color: rgb(35 56 77); } > a:hover { text-decoration: none; @@ -114,6 +113,7 @@ const Li = styled.li` > a { color: #007eff; } + color: #007eff; } @@ -127,7 +127,7 @@ const Li = styled.li` &:last-of-type { display: inline-block; height: 100%; - padding-right: 0px; + padding-right: 0; line-height: 18px; text-align: right; white-space: nowrap; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/SelectWrapper/IndicatorSeparator.js b/packages/strapi-plugin-content-manager/admin/src/components/SelectWrapper/IndicatorSeparator.js index 7ccc1241..b807d392 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/SelectWrapper/IndicatorSeparator.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/SelectWrapper/IndicatorSeparator.js @@ -1,5 +1,5 @@ function IndicatorSeparator() { - return null + return null; } export default IndicatorSeparator; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/SelectWrapper/utils/connect.js b/packages/strapi-plugin-content-manager/admin/src/components/SelectWrapper/utils/connect.js index 648a3d30..f1027b59 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/SelectWrapper/utils/connect.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/SelectWrapper/utils/connect.js @@ -1,7 +1,7 @@ import React from 'react'; function connect(WrappedComponent, select) { - return function(props) { + return function (props) { // eslint-disable-next-line react/prop-types const selectors = select(props); diff --git a/packages/strapi-plugin-content-manager/admin/src/components/SettingFormWrapper/index.js b/packages/strapi-plugin-content-manager/admin/src/components/SettingFormWrapper/index.js index 543404af..17d0c76e 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/SettingFormWrapper/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/SettingFormWrapper/index.js @@ -1,7 +1,7 @@ import styled from 'styled-components'; const SettingFormWrapper = styled.div` - padding: 24px 30px 0px; + padding: 24px 30px 0; background-color: #fafafb; border-radius: 2px; `; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/Truncate/index.js b/packages/strapi-plugin-content-manager/admin/src/components/Truncate/index.js index 55957ef7..0e73fc02 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/Truncate/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/Truncate/index.js @@ -1,5 +1,6 @@ import styled from 'styled-components'; +/* stylelint-disable no-empty-source */ const Truncate = styled.div``; export default Truncate; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/Wysiwyg/EditorWrapper.js b/packages/strapi-plugin-content-manager/admin/src/components/Wysiwyg/EditorWrapper.js index 7b538e04..c477fdcd 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/Wysiwyg/EditorWrapper.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/Wysiwyg/EditorWrapper.js @@ -5,11 +5,7 @@ const EditorWrapper = styled.div` if (isFullscreen) { return css` position: fixed; - z-index: 1040; - top: calc(6rem + 90px); - left: calc(24rem + 28px); - right: 28px; - bottom: 32px; + inset: calc(6rem + 90px) 28px 32px calc(24rem + 28px); display: flex; background-color: transparent; z-index: 99999; @@ -58,7 +54,7 @@ const EditorWrapper = styled.div` border-radius: 0.25rem; line-height: 18px !important; font-size: 13px; - box-shadow: 0px 1px 1px rgba(104, 118, 142, 0.05); + box-shadow: 0 1px 1px rgb(104 118 142 / 5%); background-color: #fff; position: relative; } @@ -70,7 +66,7 @@ const EditorWrapper = styled.div` .editor { min-height: 294px; max-height: 555px; - padding: 20px 20px 0 20px; + padding: 20px 20px 0; font-size: 13px; background-color: #fff; line-height: 18px !important; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/Wysiwyg/PreviewControlWrapper.js b/packages/strapi-plugin-content-manager/admin/src/components/Wysiwyg/PreviewControlWrapper.js index aa3f9a16..5cbf9161 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/Wysiwyg/PreviewControlWrapper.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/Wysiwyg/PreviewControlWrapper.js @@ -16,10 +16,11 @@ const PreviewControlWrapper = styled.div` font-size: 12px; } } + cursor: pointer; .wysiwygCollapse { - &:after { + &::after { content: '\f066'; font-family: FontAwesome; margin-left: 8px; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/Wysiwyg/SelectWrapper.js b/packages/strapi-plugin-content-manager/admin/src/components/Wysiwyg/SelectWrapper.js index da532a82..b901b0fb 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/Wysiwyg/SelectWrapper.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/Wysiwyg/SelectWrapper.js @@ -17,7 +17,7 @@ const SelectWrapper = styled.div` `; } }} - box-shadow: 0 0 0 rgba(0, 0, 0, 0) !important; + box-shadow: 0 0 0 rgb(0 0 0 / 0%) !important; } `; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/Wysiwyg/ToggleModeWrapper.js b/packages/strapi-plugin-content-manager/admin/src/components/Wysiwyg/ToggleModeWrapper.js index d0b504e2..09aa5418 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/Wysiwyg/ToggleModeWrapper.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/Wysiwyg/ToggleModeWrapper.js @@ -10,7 +10,7 @@ const ToggleModeWrapper = styled.div` min-width: 32px; padding-left: 10px; padding-right: 10px; - border: 1px solid rgba(16, 22, 34, 0.1); + border: 1px solid rgb(16 22 34 / 10%); border-radius: 3px; background: #f3f4f4; font-size: 13px; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/Wysiwyg/previewControl.js b/packages/strapi-plugin-content-manager/admin/src/components/Wysiwyg/previewControl.js index 64989c62..48dfc485 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/Wysiwyg/previewControl.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/Wysiwyg/previewControl.js @@ -10,12 +10,14 @@ import { FormattedMessage } from 'react-intl'; import PreviewControlWrapper from './PreviewControlWrapper'; function PreviewControl({ onClick }) { - return -
-
- -
- + return ( + +
+
+ +
+ + ); } PreviewControl.defaultProps = { diff --git a/packages/strapi-plugin-content-manager/admin/src/components/WysiwygBottomControls/components.js b/packages/strapi-plugin-content-manager/admin/src/components/WysiwygBottomControls/components.js index 3118e7cd..7ddb7743 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/WysiwygBottomControls/components.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/WysiwygBottomControls/components.js @@ -26,7 +26,7 @@ const Wrapper = styled.div` .fullScreenWrapper { cursor: pointer; - &:after { + &::after { content: '\f065'; margin-left: 8px; font-family: FontAwesome; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/WysiwygDropUpload/Label.js b/packages/strapi-plugin-content-manager/admin/src/components/WysiwygDropUpload/Label.js index 0f7ab6a1..53d3ac3f 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/WysiwygDropUpload/Label.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/WysiwygDropUpload/Label.js @@ -2,11 +2,8 @@ import styled from 'styled-components'; const Label = styled.label` position: absolute; - top: 0; - right: 0; - left: 0; - bottom: 0; - background-color: rgba(28, 93, 231, 0.01); + inset: 0; + background-color: rgb(28 93 231 / 1%); > input { display: none; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/WysiwygInlineControls/StyledButton.js b/packages/strapi-plugin-content-manager/admin/src/components/WysiwygInlineControls/StyledButton.js index 0528ff5f..46a34964 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/WysiwygInlineControls/StyledButton.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/WysiwygInlineControls/StyledButton.js @@ -5,8 +5,8 @@ const Button = styled.button` display: flex; height: 32px; min-width: 32px; - background-color: #ffffff; - border: 1px solid rgba(16, 22, 34, 0.1); + background-color: #fff; + border: 1px solid rgb(16 22 34 / 10%); font-size: 13px; font-weight: 500; line-height: 32px; @@ -25,10 +25,10 @@ const Button = styled.button` if (active) { return css` border: 0; - background: rgba(16, 22, 34, 0); + background: rgb(16 22 34 / 0%); box-shadow: - inset 0 -1px 0 0 rgba(16, 22, 34, 0.04), - inset 0 1px 0 0 rgba(16, 22, 34, 0.04); + inset 0 -1px 0 0 rgb(16 22 34 / 4%), + inset 0 1px 0 0 rgb(16 22 34 / 4%); `; } diff --git a/packages/strapi-plugin-content-manager/admin/src/components/WysiwygInlineControls/Wrapper.js b/packages/strapi-plugin-content-manager/admin/src/components/WysiwygInlineControls/Wrapper.js index 055a6961..43207b43 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/WysiwygInlineControls/Wrapper.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/WysiwygInlineControls/Wrapper.js @@ -18,7 +18,7 @@ const Wrapper = styled.div` > button:last-child { border-top-right-radius: 3px; border-bottom-right-radius: 3px; - border-right: 1px solid rgba(16, 22, 34, 0.1); + border-right: 1px solid rgb(16 22 34 / 10%); } `; 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 56f95b4a..8f0d6b75 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 @@ -3,7 +3,7 @@ import styled from 'styled-components'; const Wrapper = styled.div` padding-bottom: 2.8rem; font-size: 1.3rem; - font-family: 'Lato'; + font-family: Lato; label { display: block; margin-bottom: 1rem; diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/EditView/DeleteLink/utils/connect.js b/packages/strapi-plugin-content-manager/admin/src/containers/EditView/DeleteLink/utils/connect.js index b7735feb..e42d7e8a 100644 --- a/packages/strapi-plugin-content-manager/admin/src/containers/EditView/DeleteLink/utils/connect.js +++ b/packages/strapi-plugin-content-manager/admin/src/containers/EditView/DeleteLink/utils/connect.js @@ -1,7 +1,7 @@ import React from 'react'; function connect(WrappedComponent, select) { - return function(props) { + return function (props) { // eslint-disable-next-line react/prop-types const selectors = select(); diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/EditView/Header/utils/connect.js b/packages/strapi-plugin-content-manager/admin/src/containers/EditView/Header/utils/connect.js index b7735feb..e42d7e8a 100644 --- a/packages/strapi-plugin-content-manager/admin/src/containers/EditView/Header/utils/connect.js +++ b/packages/strapi-plugin-content-manager/admin/src/containers/EditView/Header/utils/connect.js @@ -1,7 +1,7 @@ import React from 'react'; function connect(WrappedComponent, select) { - return function(props) { + return function (props) { // eslint-disable-next-line react/prop-types const selectors = select(); diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/EditView/components.js b/packages/strapi-plugin-content-manager/admin/src/containers/EditView/components.js index 0d0e448a..e86d7656 100644 --- a/packages/strapi-plugin-content-manager/admin/src/containers/EditView/components.js +++ b/packages/strapi-plugin-content-manager/admin/src/containers/EditView/components.js @@ -2,7 +2,7 @@ import styled from 'styled-components'; import { Flex, Text } from '@buffetjs/core'; const SubWrapper = styled.div` - background: #ffffff; + background: #fff; border-radius: 2px; box-shadow: 0 2px 4px #e3e9f3; `; @@ -12,11 +12,12 @@ const MainWrapper = styled(SubWrapper)` margin-right: 0; margin-left: 0; } + padding: 22px 10px; `; const LinkWrapper = styled(SubWrapper)` - background: #ffffff; + background: #fff; border-radius: 2px; box-shadow: 0 2px 4px #e3e9f3; ul { @@ -50,7 +51,6 @@ const StatusWrapper = styled.div` display: flex; align-items: center; border-radius: 2px; - height: 36px; padding: 0 15px; ${({ theme, isGreen }) => diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/EditViewDataManagerProvider/utils/schema.js b/packages/strapi-plugin-content-manager/admin/src/containers/EditViewDataManagerProvider/utils/schema.js index 1f321028..6fd83d4d 100644 --- a/packages/strapi-plugin-content-manager/admin/src/containers/EditViewDataManagerProvider/utils/schema.js +++ b/packages/strapi-plugin-content-manager/admin/src/containers/EditViewDataManagerProvider/utils/schema.js @@ -13,11 +13,11 @@ import moment from 'moment'; import * as yup from 'yup'; import { translatedErrors as errorsTrads } from '@akemona-org/strapi-helper-plugin'; -yup.addMethod(yup.mixed, 'defined', function() { +yup.addMethod(yup.mixed, 'defined', function () { return this.test('defined', errorsTrads.required, (value) => value !== undefined); }); -yup.addMethod(yup.array, 'notEmptyMin', function(min) { +yup.addMethod(yup.array, 'notEmptyMin', function (min) { return this.test('notEmptyMin', errorsTrads.min, (value) => { if (isEmpty(value)) { return true; @@ -27,8 +27,8 @@ yup.addMethod(yup.array, 'notEmptyMin', function(min) { }); }); -yup.addMethod(yup.string, 'isInferior', function(message, max) { - return this.test('isInferior', message, function(value) { +yup.addMethod(yup.string, 'isInferior', function (message, max) { + return this.test('isInferior', message, function (value) { if (!value) { return true; } @@ -41,8 +41,8 @@ yup.addMethod(yup.string, 'isInferior', function(message, max) { }); }); -yup.addMethod(yup.string, 'isSuperior', function(message, min) { - return this.test('isSuperior', message, function(value) { +yup.addMethod(yup.string, 'isSuperior', function (message, min) { + return this.test('isSuperior', message, function (value) { if (!value) { return true; } diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/ListSettingsView/DragWrapper.js b/packages/strapi-plugin-content-manager/admin/src/containers/ListSettingsView/DragWrapper.js index 213287ce..7e576fce 100644 --- a/packages/strapi-plugin-content-manager/admin/src/containers/ListSettingsView/DragWrapper.js +++ b/packages/strapi-plugin-content-manager/admin/src/containers/ListSettingsView/DragWrapper.js @@ -13,8 +13,7 @@ const DragWrapper = styled.div` padding: 0; } > div > div { - overflow-x: auto; - overflow-y: scroll; + overflow: auto scroll; } `; diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/ListSettingsView/MenuDropdown.js b/packages/strapi-plugin-content-manager/admin/src/containers/ListSettingsView/MenuDropdown.js index 62ad4989..f1288ea4 100644 --- a/packages/strapi-plugin-content-manager/admin/src/containers/ListSettingsView/MenuDropdown.js +++ b/packages/strapi-plugin-content-manager/admin/src/containers/ListSettingsView/MenuDropdown.js @@ -11,9 +11,8 @@ const MenuDropdown = styled(DropdownMenu)` border-top-right-radius: 0; border-color: #e3e9f3 !important; border-top-color: #aed4fb !important; - box-shadow: 0 2px 3px rgba(227, 233, 245, 0.5); - transform: translate3d(-199px, 30px, 0px) !important; - + box-shadow: 0 2px 3px rgb(227 233 245 / 50%); + transform: translate3d(-199px, 30px, 0) !important; overflow: scroll; button { diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/ListSettingsView/Toggle.js b/packages/strapi-plugin-content-manager/admin/src/containers/ListSettingsView/Toggle.js index 810f08d4..f2b1aabf 100644 --- a/packages/strapi-plugin-content-manager/admin/src/containers/ListSettingsView/Toggle.js +++ b/packages/strapi-plugin-content-manager/admin/src/containers/ListSettingsView/Toggle.js @@ -26,14 +26,13 @@ const Toggle = styled(DropdownToggle)` &:disabled { cursor: not-allowed !important; - background: #fafafb; border: 1px solid #e3e9f3; border-radius: 2px; color: #b3b5b9; } - &:before { + &::before { ${beforeStyle} } @@ -42,7 +41,7 @@ const Toggle = styled(DropdownToggle)` :focus { ${openedStyle} - &:before { + &::before { ${beforeStyle} } } diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/ListView/FieldPicker/ConfigureLink/StyledLink.js b/packages/strapi-plugin-content-manager/admin/src/containers/ListView/FieldPicker/ConfigureLink/StyledLink.js index c75e39d3..b75f6f01 100644 --- a/packages/strapi-plugin-content-manager/admin/src/containers/ListView/FieldPicker/ConfigureLink/StyledLink.js +++ b/packages/strapi-plugin-content-manager/admin/src/containers/ListView/FieldPicker/ConfigureLink/StyledLink.js @@ -4,7 +4,6 @@ import { Link } from 'react-router-dom'; const StyledLink = styled(Link)` display: block; width: 100%; - text-decoration: none; color: #333740; font-size: 13px; diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/ListView/FieldPicker/Fields/Wrapper.js b/packages/strapi-plugin-content-manager/admin/src/containers/ListView/FieldPicker/Fields/Wrapper.js index 33a90e24..3bf8c559 100644 --- a/packages/strapi-plugin-content-manager/admin/src/containers/ListView/FieldPicker/Fields/Wrapper.js +++ b/packages/strapi-plugin-content-manager/admin/src/containers/ListView/FieldPicker/Fields/Wrapper.js @@ -5,7 +5,7 @@ import { Text } from '@buffetjs/core'; const Wrapper = styled((props) => )` margin-bottom: 0; - padding: 9px 0 0 0; + padding: 9px 0 0; min-width: 228px; list-style-type: none; background-color: ${({ theme }) => theme.main.colors.white}; diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/ListView/components.js b/packages/strapi-plugin-content-manager/admin/src/containers/ListView/components.js index fca01653..4d8e26cf 100644 --- a/packages/strapi-plugin-content-manager/admin/src/containers/ListView/components.js +++ b/packages/strapi-plugin-content-manager/admin/src/containers/ListView/components.js @@ -20,7 +20,7 @@ const AddFilterCta = styled(Button)` margin-right: 10px; padding: 0 10px; text-align: center; - background-color: #ffffff; + background-color: #fff; border: 1px solid #e3e9f3; border-radius: 2px; line-height: 28px; @@ -44,7 +44,7 @@ const AddFilterCta = styled(Button)` const Img = styled.img` height: 7px; margin: auto; - margin-right: 0px; + margin-right: 0; font-size: 12px; `; @@ -72,8 +72,8 @@ const FilterWrapper = styled.div` margin-bottom: 6px; margin-right: 10px; padding: 0 10px; - background: rgba(0, 126, 255, 0.08); - border: 1px solid rgba(0, 126, 255, 0.24); + background: rgb(0 126 255 / 8%); + border: 1px solid rgb(0 126 255 / 24%); border-radius: 2px; line-height: 28px; color: #007eff; @@ -100,7 +100,7 @@ const Separator = styled.span` margin-left: 10px; margin-right: 10px; line-height: 30px; - &:after { + &::after { content: ''; height: 15px; border-left: 1px solid #007eff; @@ -113,7 +113,7 @@ const Remove = styled.span` cursor: pointer; vertical-align: middle; - &:after { + &::after { display: inline-block; content: ''; width: 8px; diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/ListView/index.js b/packages/strapi-plugin-content-manager/admin/src/containers/ListView/index.js index 727b6e40..064d1999 100644 --- a/packages/strapi-plugin-content-manager/admin/src/containers/ListView/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/containers/ListView/index.js @@ -349,143 +349,141 @@ function ListView({ return ( + - - - {!isFilterPickerOpen &&
} - {isSearchable && canRead && ( - - )} - - {!canRead && ( - - - - - - )} - - {canRead && ( - -
-
-
- {isFilterable && ( - <> - - - - - {filters.map(({ filter: filterName, name, value }, key) => ( - - ))} - - )} -
+ slug={slug} + /> + + {!isFilterPickerOpen &&
} + {isSearchable && canRead && ( + + )} + + {!canRead && ( + + + + + + )} + + {canRead && ( + +
+
+
+ {isFilterable && ( + <> + + + + + {filters.map(({ filter: filterName, name, value }, key) => ( + + ))} + + )}
+
-
- - - - - - - - - -
+
+ + + + + + + + +
-
-
- -
-
+
+
+
+ +
- - )} - - - - - 1 ? '.all' : '' - }` - ), - }} - popUpWarningType="danger" - onConfirm={handleConfirmDeleteAllData} - onClosed={handleModalClose} - isConfirmButtonLoading={showModalConfirmButtonLoading} - > - - - +
+ + )} + + + + + 1 ? '.all' : ''}` + ), + }} + popUpWarningType="danger" + onConfirm={handleConfirmDeleteAllData} + onClosed={handleModalClose} + isConfirmButtonLoading={showModalConfirmButtonLoading} + > + + + ); } diff --git a/packages/strapi-plugin-content-manager/admin/src/utils/tests/getComponents.test.js b/packages/strapi-plugin-content-manager/admin/src/utils/tests/getComponents.test.js index 02c455cf..83f43a2b 100644 --- a/packages/strapi-plugin-content-manager/admin/src/utils/tests/getComponents.test.js +++ b/packages/strapi-plugin-content-manager/admin/src/utils/tests/getComponents.test.js @@ -9,11 +9,11 @@ describe('Content Manager | EditView | utils | getComponents', () => { it('should return the correct components', () => { function TestCompo1() { - return
TestCompo1
-} + return
TestCompo1
; + } function TestCompo2() { - return
TestCompo2
-} + return
TestCompo2
; + } const plugins = { test: { diff --git a/packages/strapi-plugin-content-manager/tests/front/integration/createPage_specs.js b/packages/strapi-plugin-content-manager/tests/front/integration/createPage_specs.js index 9a17d0c7..18daf4ec 100644 --- a/packages/strapi-plugin-content-manager/tests/front/integration/createPage_specs.js +++ b/packages/strapi-plugin-content-manager/tests/front/integration/createPage_specs.js @@ -11,7 +11,7 @@ const getRequest = (model, sort = '_id') => { return `${backendUrl}/content-manager/explorer/${model}?_limit=10&_start=0&_sort=${sort}:ASC&source=content-manager`; }; -describe('Testing Content Manager createPages', function() { +describe('Testing Content Manager createPages', function () { before(() => { cy.login() .then((data) => { diff --git a/packages/strapi-plugin-content-manager/tests/front/integration/listPage_specs.js b/packages/strapi-plugin-content-manager/tests/front/integration/listPage_specs.js index 2e0fe95c..5c61cb90 100644 --- a/packages/strapi-plugin-content-manager/tests/front/integration/listPage_specs.js +++ b/packages/strapi-plugin-content-manager/tests/front/integration/listPage_specs.js @@ -3,7 +3,7 @@ const animDelay = Cypress.config('animDelay'); const frontLoadingDelay = Cypress.config('frontLoadingDelay'); const backendUrl = Cypress.config('backendUrl'); -describe('Testing Content Manager ListPages', function() { +describe('Testing Content Manager ListPages', function () { before(() => { cy.login() .then((data) => { diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/AttributeOption/Button.js b/packages/strapi-plugin-content-type-builder/admin/src/components/AttributeOption/Button.js index b7a4a33c..dd61a5eb 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/AttributeOption/Button.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/AttributeOption/Button.js @@ -4,16 +4,16 @@ const Button = styled.button` display: flex; width: 100% !important; height: 4rem; - padding: 0 1rem 0 1rem; + padding: 0 1rem; margin-top: 0.6rem; margin-bottom: 0.8rem; align-items: center; justify-content: space-between; border-radius: 0.25rem; border: 1px solid #e3e9f3; - background: #ffffff; + background: #fff; line-height: 4rem; - box-shadow: 1px 1px 1px rgba(104, 118, 145, 0.05); + box-shadow: 1px 1px 1px rgb(104 118 145 / 5%); cursor: pointer; &:hover, diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/BooleanBox/CT.js b/packages/strapi-plugin-content-type-builder/admin/src/components/BooleanBox/CT.js index fce5b8f5..9e4b3c99 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/BooleanBox/CT.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/BooleanBox/CT.js @@ -8,7 +8,7 @@ function CT({ selected }) { ) : ( - ) + ); } CT.defaultProps = { diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/BooleanBox/ST.js b/packages/strapi-plugin-content-type-builder/admin/src/components/BooleanBox/ST.js index d42f670c..5155654c 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/BooleanBox/ST.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/BooleanBox/ST.js @@ -8,7 +8,7 @@ function ST({ selected }) { ) : ( - ) + ); } ST.defaultProps = { diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/BooleanBox/Wrapper.js b/packages/strapi-plugin-content-type-builder/admin/src/components/BooleanBox/Wrapper.js index 090ac69d..df209253 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/BooleanBox/Wrapper.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/BooleanBox/Wrapper.js @@ -31,14 +31,14 @@ const Wrapper = styled.div` position: absolute; top: 36px; left: 20px; - background: #ffffff; + background: #fff; width: 12px; height: 12px; border: solid 1px #b4b6ba; border-radius: 50%; - &:before, - &:after { + &::before, + &::after { content: ''; display: block; border-radius: 50%; @@ -49,7 +49,7 @@ const Wrapper = styled.div` left: 1px; } - &:after { + &::after { transform: scale(0); transition: inherit; will-change: transform; @@ -65,7 +65,6 @@ const Wrapper = styled.div` border: solid 1px #aed4fb; &::after { background: #007eff; - transform: scale(1); } } diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/CheckboxWithDescription/index.js b/packages/strapi-plugin-content-type-builder/admin/src/components/CheckboxWithDescription/index.js index 7db8631f..8e9e484f 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/CheckboxWithDescription/index.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/CheckboxWithDescription/index.js @@ -6,18 +6,18 @@ import Wrapper from './Wrapper'; function CheckboxWithDescription({ description, error, label, value, ...rest }) { return ( - - {description && ( - - {description} - - )} - {error && ( - - {error} - - )} - + + {description && ( + + {description} + + )} + {error && ( + + {error} + + )} + ); } diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentIconPicker/SearchWrapper.js b/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentIconPicker/SearchWrapper.js index 7ced37ac..3fbc4ac1 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentIconPicker/SearchWrapper.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentIconPicker/SearchWrapper.js @@ -21,7 +21,7 @@ const SearchWrapper = styled.div` position: absolute; top: 1px; right: 0; - padding: 5px 0 0px 5px; + padding: 5px 0 0 5px; line-height: 11px; outline: 0; i, diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentIconPicker/Wrapper.js b/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentIconPicker/Wrapper.js index c77fbc7b..d708dd37 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentIconPicker/Wrapper.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentIconPicker/Wrapper.js @@ -27,10 +27,7 @@ const Wrapper = styled.div` .noCells { position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; + inset: 0; display: flex; align-items: center; justify-content: center; diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentSelect/Category.js b/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentSelect/Category.js index 69795145..0d9c887b 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentSelect/Category.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentSelect/Category.js @@ -4,9 +4,11 @@ import UpperFirst from '../UpperFirst'; import CategoryName from './CategoryName'; function Category({ categoryName }) { - return - - + return ( + + + + ); } Category.defaultProps = { diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/CustomLink/index.js b/packages/strapi-plugin-content-type-builder/admin/src/components/CustomLink/index.js index 1f91044d..d0d7021a 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/CustomLink/index.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/CustomLink/index.js @@ -6,14 +6,16 @@ import P from './P'; import StyledCustomLink from './StyledCustomLink'; function CustomLink({ disabled, id, onClick }) { - return - - + return ( + + + + ); } CustomLink.defaultProps = { diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/HeaderModalNavContainer/tests/index.test.js b/packages/strapi-plugin-content-type-builder/admin/src/components/HeaderModalNavContainer/tests/index.test.js index 48be2695..adb89a48 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/HeaderModalNavContainer/tests/index.test.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/HeaderModalNavContainer/tests/index.test.js @@ -10,8 +10,8 @@ describe('', () => { it('should render its children', () => { function Child() { - return
Some child
-} + return
Some child
; + } const wrapper = shallow( diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/List/List.js b/packages/strapi-plugin-content-type-builder/admin/src/components/List/List.js index 65923207..eee5db9c 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/List/List.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/List/List.js @@ -88,8 +88,7 @@ const Wrapper = styled(List)` width: 100%; display: flex; flex-wrap: nowrap; - overflow-x: auto; - overflow-y: hidden; + overflow: auto hidden; li { margin-right: 9px; } @@ -110,7 +109,6 @@ const Wrapper = styled(List)` bottom: 14px; left: 34px; background-color: ${({ isFromDynamicZone }) => (isFromDynamicZone ? '#AED4FB' : '#f3f4f4')}; - color: transparent; text-align: center; line-height: 27px; diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/ListHeader/Title.js b/packages/strapi-plugin-content-type-builder/admin/src/components/ListHeader/Title.js index 432b9b12..fe4e7826 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/ListHeader/Title.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/ListHeader/Title.js @@ -10,7 +10,7 @@ import { colors } from '@akemona-org/strapi-helper-plugin'; const Title = styled.p` margin-bottom: 0; color: ${colors.blueTxt}; - font-family: 'Lato'; + font-family: Lato; font-size: 1.8rem; font-weight: bold; line-height: 2.2rem; diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/ListRow/Wrapper.js b/packages/strapi-plugin-content-type-builder/admin/src/components/ListRow/Wrapper.js index 7bff3112..ea69db03 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/ListRow/Wrapper.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/ListRow/Wrapper.js @@ -52,7 +52,7 @@ const Wrapper = styled.tr` } } &.relation-row { - background: linear-gradient(135deg, rgba(28, 93, 231, 0.05), rgba(239, 243, 253, 0)); + background: linear-gradient(135deg, rgb(28 93 231 / 5%), rgb(239 243 253 / 0%)); } &.clickable { &:hover { diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/RelationForm/Wrapper.js b/packages/strapi-plugin-content-type-builder/admin/src/components/RelationForm/Wrapper.js index 331cbc71..33d4a188 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/RelationForm/Wrapper.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/RelationForm/Wrapper.js @@ -3,7 +3,7 @@ import styled from 'styled-components'; const Wrapper = styled.div` width: 100%; display: flex; - padding: 2.7rem 15px 3.3rem 15px; + padding: 2.7rem 15px 3.3rem; `; export default Wrapper; diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/RelationTargetPicker/Wrapper.js b/packages/strapi-plugin-content-type-builder/admin/src/components/RelationTargetPicker/Wrapper.js index a502d79a..d560f458 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/RelationTargetPicker/Wrapper.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/RelationTargetPicker/Wrapper.js @@ -21,7 +21,7 @@ const Wrapper = styled.div` box-shadow: none; color: black; } - &:after { + &::after { position: absolute; top: calc(50% - 0.1rem); right: 1.5rem; @@ -43,6 +43,7 @@ const Wrapper = styled.div` } } } + /* Dropdown List */ > button + div { max-width: 100%; @@ -64,11 +65,11 @@ const Wrapper = styled.div` &:focus, &:active { outline: 0; - background-color: rgb(255, 255, 255) !important; - color: rgba(50, 55, 64, 0.75); + background-color: rgb(255 255 255) !important; + color: rgb(50 55 64 / 75%); } > p { - color: rgba(50, 55, 64, 0.75); + color: rgb(50 55 64 / 75%); line-height: 3rem; white-space: nowrap; overflow: hidden; diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/SelectMenuUl/index.js b/packages/strapi-plugin-content-type-builder/admin/src/components/SelectMenuUl/index.js index ff9831af..bb76bf33 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/SelectMenuUl/index.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/SelectMenuUl/index.js @@ -21,7 +21,6 @@ const Ul = styled.ul` } .chevron { margin: auto; - font-size: 11px; color: #919bae; } @@ -49,10 +48,7 @@ const Ul = styled.ul` content: ''; position: absolute; z-index: 1; - top: 0; - left: -30px; - right: -30px; - bottom: 0; + inset: 0 -30px; background-color: #e6f0fb; } } diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/Td/index.js b/packages/strapi-plugin-content-type-builder/admin/src/components/Td/index.js index 3e8d179c..1145b7c3 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/Td/index.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/Td/index.js @@ -10,7 +10,6 @@ const Td = styled.td` top: -7px; left: 45px; color: transparent; - ${({ isFromDynamicZone, isChildOfDynamicZone }) => { if (isChildOfDynamicZone) { return ` @@ -18,18 +17,16 @@ const Td = styled.td` background-color: transparent !important; `; } - if (isFromDynamicZone) { return ` background-color: #AED4FB !important; `; } - + // eslint-disable-next-line newline-before-return return ` background-color: #f3f4f4 !important; `; }} - border-radius: 3px; } `; diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/UpperFirst/index.js b/packages/strapi-plugin-content-type-builder/admin/src/components/UpperFirst/index.js index 98d8c7ea..5b7d36d1 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/components/UpperFirst/index.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/components/UpperFirst/index.js @@ -2,7 +2,7 @@ import PropTypes from 'prop-types'; import { upperFirst } from 'lodash'; function UpperFirst({ content }) { - return upperFirst(content) + return upperFirst(content); } UpperFirst.defaultProps = { diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/ListView/Wrapper.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/ListView/Wrapper.js index 973bc805..6c7dc0c2 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/containers/ListView/Wrapper.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/ListView/Wrapper.js @@ -4,7 +4,7 @@ import { ViewContainer } from '@akemona-org/strapi-helper-plugin'; const Wrapper = styled(ViewContainer)` .button-secondary { &:hover { - background-color: #ffffff !important; + background-color: #fff !important; box-shadow: 0 0 0 #fff; } } diff --git a/packages/strapi-plugin-content-type-builder/admin/src/icons/Curve.js b/packages/strapi-plugin-content-type-builder/admin/src/icons/Curve.js index dc1cf27d..8c1ccd4f 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/icons/Curve.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/icons/Curve.js @@ -2,18 +2,20 @@ import React from 'react'; import PropTypes from 'prop-types'; function Curve(props) { - return - - - - + return ( + + + + + + ); } Curve.defaultProps = { diff --git a/packages/strapi-plugin-content-type-builder/admin/src/utils/tests/getComponents.test.js b/packages/strapi-plugin-content-type-builder/admin/src/utils/tests/getComponents.test.js index 1b67db3a..ed68df9b 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/utils/tests/getComponents.test.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/utils/tests/getComponents.test.js @@ -9,11 +9,11 @@ describe('Content Type Builder | utils | getComponents', () => { it('should return the correct components', () => { function TestCompo1() { - return
TestCompo1
-} + return
TestCompo1
; + } function TestCompo2() { - return
TestCompo2
-} + return
TestCompo2
; + } const plugins = { test: { diff --git a/packages/strapi-plugin-content-type-builder/tests/front/integrationOld/createApi_specs.js b/packages/strapi-plugin-content-type-builder/tests/front/integrationOld/createApi_specs.js index 7f95620b..4ac61939 100644 --- a/packages/strapi-plugin-content-type-builder/tests/front/integrationOld/createApi_specs.js +++ b/packages/strapi-plugin-content-type-builder/tests/front/integrationOld/createApi_specs.js @@ -55,7 +55,7 @@ describe('Test CTB', () => { .should('have.value', 'notcamelcase'); }); - it('Should create a TAG API', function() { + it('Should create a TAG API', function () { cy.server(); cy.route('GET', `${backendUrl}/content-type-builder/models`).as('models'); cy.route('POST', `${backendUrl}/content-type-builder/models`).as('createModel'); diff --git a/packages/strapi-plugin-documentation/admin/src/components/Block/components.js b/packages/strapi-plugin-documentation/admin/src/components/Block/components.js index 25a21022..c66f90f9 100644 --- a/packages/strapi-plugin-documentation/admin/src/components/Block/components.js +++ b/packages/strapi-plugin-documentation/admin/src/components/Block/components.js @@ -2,7 +2,7 @@ import styled from 'styled-components'; const Wrapper = styled.div` margin-bottom: 28px; - background: #ffffff; + background: #fff; padding: 22px 28px 18px; border-radius: 2px; box-shadow: 0 2px 4px #e3e9f3; @@ -10,7 +10,7 @@ const Wrapper = styled.div` `; const Title = styled.div` - padding-top: 0px; + padding-top: 0; line-height: 18px; > span { font-weight: 600; diff --git a/packages/strapi-plugin-documentation/admin/src/components/Block/index.js b/packages/strapi-plugin-documentation/admin/src/components/Block/index.js index 688119b2..a133f3b5 100755 --- a/packages/strapi-plugin-documentation/admin/src/components/Block/index.js +++ b/packages/strapi-plugin-documentation/admin/src/components/Block/index.js @@ -11,15 +11,17 @@ import { Wrapper, Title } from './components'; const renderMsg = (msg) =>

{msg}

; function Block({ children, description, style, title }) { - return
- - - <FormattedMessage id={title} /> - <FormattedMessage id={description}>{renderMsg}</FormattedMessage> - - {children} - -
+ return ( +
+ + + <FormattedMessage id={title} /> + <FormattedMessage id={description}>{renderMsg}</FormattedMessage> + + {children} + +
+ ); } Block.defaultProps = { diff --git a/packages/strapi-plugin-documentation/admin/src/components/Row/components.js b/packages/strapi-plugin-documentation/admin/src/components/Row/components.js index cf329dee..499bd348 100644 --- a/packages/strapi-plugin-documentation/admin/src/components/Row/components.js +++ b/packages/strapi-plugin-documentation/admin/src/components/Row/components.js @@ -7,7 +7,7 @@ const Wrapper = styled.div` line-height: 53px; margin: 0 28px 0 36px; justify-content: space-between; - border-bottom: 1px solid rgba(14, 22, 34, 0.04); + border-bottom: 1px solid rgb(14 22 34 / 4%); font-size: 13px; color: #333740; > div:first-child { @@ -24,6 +24,7 @@ const Wrapper = styled.div` align-self: center; text-align: right; } + -webkit-font-smoothing: antialiased; `; @@ -39,10 +40,10 @@ const StyledButton = styled(Button)` return css` margin-right: 10px; border: 1px solid #dfe0e1; - &:before { + &::before { margin-right: 10px; content: '\f08e'; - font-family: 'FontAwesome'; + font-family: FontAwesome; font-size: 10px; } `; @@ -52,10 +53,10 @@ const StyledButton = styled(Button)` background: #e6f0fb; border: 1px solid #aed4fb; color: #007eff; - &:before { + &::before { margin-right: 10px; content: '\f021'; - font-family: 'FontAwesome'; + font-family: FontAwesome; font-size: 10px; } `; @@ -64,10 +65,10 @@ const StyledButton = styled(Button)` return css` margin-left: 25px; font-weight: 400; - &:before { + &::before { margin-right: 10px; content: '\f2ed'; - font-family: 'FontAwesome'; + font-family: FontAwesome; font-size: 12 px; } `; diff --git a/packages/strapi-plugin-documentation/admin/src/containers/HomePage/components.js b/packages/strapi-plugin-documentation/admin/src/containers/HomePage/components.js index 95cfeb9d..9ef757ed 100644 --- a/packages/strapi-plugin-documentation/admin/src/containers/HomePage/components.js +++ b/packages/strapi-plugin-documentation/admin/src/containers/HomePage/components.js @@ -12,10 +12,10 @@ const ContainerFluid = styled.div` border: 1px solid #dfe0e1; font-weight: 500; font-size: 13px; - &:before { + &::before { margin-right: 10px; content: '\f08e'; - font-family: 'FontAwesome'; + font-family: FontAwesome; font-size: 10px; } } diff --git a/packages/strapi-plugin-email/admin/src/containers/Settings/components.js b/packages/strapi-plugin-email/admin/src/containers/Settings/components.js index 600c0890..ef579332 100644 --- a/packages/strapi-plugin-email/admin/src/containers/Settings/components.js +++ b/packages/strapi-plugin-email/admin/src/containers/Settings/components.js @@ -3,13 +3,13 @@ import { Button, Text as TextBase } from '@buffetjs/core'; const Text = styled(TextBase)` width: 100%; - padding: 0 15px 17px 15px; + padding: 0 15px 17px; `; const AlignedButton = styled(Button)` height: 34px; padding-top: 3px; - margin: 29px 15px 0 15px; + margin: 29px 15px 0; min-width: unset; `; diff --git a/packages/strapi-plugin-email/admin/src/containers/Settings/index.js b/packages/strapi-plugin-email/admin/src/containers/Settings/index.js index fccf07f3..f77530a3 100644 --- a/packages/strapi-plugin-email/admin/src/containers/Settings/index.js +++ b/packages/strapi-plugin-email/admin/src/containers/Settings/index.js @@ -101,98 +101,98 @@ function SettingsPage() { return ( - -
-
-
+
+ +
+ + + + ./config/plugins.js, + link: ( + + link + + ), + }} + /> + + - - - - ./config/plugins.js, - link: ( - - link - - ), - }} + + + + + + setTestAddress(event.target.value)} + size={{ xs: 6 }} + type="email" + value={testAddress} + error={formErrors.email} + /> + - - - - - - - - setTestAddress(event.target.value)} - size={{ xs: 6 }} - type="email" - value={testAddress} - error={formErrors.email} - /> - - } - isLoading={isTestButtonLoading} - style={{ fontWeight: 600 }} - type="submit" - > - {formatMessage({ id: getTrad('Settings.button.test-email') })} - - - -
- + {formatMessage({ id: getTrad('Settings.button.test-email') })} + + + +
+
); } diff --git a/packages/strapi-plugin-i18n/admin/src/components/CMEditViewLocalePicker/Wrapper.js b/packages/strapi-plugin-i18n/admin/src/components/CMEditViewLocalePicker/Wrapper.js index bd457c4c..3e0c8288 100644 --- a/packages/strapi-plugin-i18n/admin/src/components/CMEditViewLocalePicker/Wrapper.js +++ b/packages/strapi-plugin-i18n/admin/src/components/CMEditViewLocalePicker/Wrapper.js @@ -2,7 +2,7 @@ import styled from 'styled-components'; const Wrapper = styled.div` padding-bottom: ${({ paddingBottom }) => paddingBottom}; - border-top: 1px solid rgba(14, 22, 34, 0.04); + border-top: 1px solid rgb(14 22 34 / 4%); `; export default Wrapper; diff --git a/packages/strapi-plugin-i18n/admin/src/components/LocalePicker/index.js b/packages/strapi-plugin-i18n/admin/src/components/LocalePicker/index.js index 2e4e4033..6b15bf6b 100644 --- a/packages/strapi-plugin-i18n/admin/src/components/LocalePicker/index.js +++ b/packages/strapi-plugin-i18n/admin/src/components/LocalePicker/index.js @@ -17,10 +17,7 @@ const List = styled.ul` `; const ListItem = styled.li` - margin-top: 0; - margin-bottom: 0; - margin-left: -10px; - margin-right: -10px; + margin: 0 -10px; padding-left: 10px; padding-right: 10px; height: 36px; diff --git a/packages/strapi-plugin-i18n/admin/src/containers/SettingsPage/LocaleSettingsPage.js b/packages/strapi-plugin-i18n/admin/src/containers/SettingsPage/LocaleSettingsPage.js index d0cd36b3..26033e0c 100644 --- a/packages/strapi-plugin-i18n/admin/src/containers/SettingsPage/LocaleSettingsPage.js +++ b/packages/strapi-plugin-i18n/admin/src/containers/SettingsPage/LocaleSettingsPage.js @@ -7,12 +7,7 @@ import { Button } from '@buffetjs/core'; import { getTrad } from '../../utils'; import LocaleList from '../../components/LocaleList'; -function LocaleSettingsPage({ - canReadLocale, - canCreateLocale, - canDeleteLocale, - canUpdateLocale, -}) { +function LocaleSettingsPage({ canReadLocale, canCreateLocale, canDeleteLocale, canUpdateLocale }) { const { formatMessage } = useIntl(); const [isOpenedCreateModal, setIsOpenedCreateModal] = useState(false); diff --git a/packages/strapi-plugin-upload/admin/src/components/BrowseAssets/index.js b/packages/strapi-plugin-upload/admin/src/components/BrowseAssets/index.js index 44bb58c1..91b4b8ce 100644 --- a/packages/strapi-plugin-upload/admin/src/components/BrowseAssets/index.js +++ b/packages/strapi-plugin-upload/admin/src/components/BrowseAssets/index.js @@ -121,59 +121,59 @@ function BrowseAssets() { return ( - - {allowedActions.canRead && ( - - {multiple && ( - - - - )} - - - - - )} - - {!files || files.length === 0 ? ( - - ) : ( - <> - - - - {} }} - count={count} - onChangeParams={handleChangeListParams} - params={paginationParams} + + {allowedActions.canRead && ( + + {multiple && ( + + - - + )} + + + + )} - + + {!files || files.length === 0 ? ( + + ) : ( + <> + + + + {} }} + count={count} + onChangeParams={handleChangeListParams} + params={paginationParams} + /> + + + + )} + ); } diff --git a/packages/strapi-plugin-upload/admin/src/components/CheckControl/Button.js b/packages/strapi-plugin-upload/admin/src/components/CheckControl/Button.js index 4aa296d0..e73c885f 100644 --- a/packages/strapi-plugin-upload/admin/src/components/CheckControl/Button.js +++ b/packages/strapi-plugin-upload/admin/src/components/CheckControl/Button.js @@ -6,7 +6,7 @@ const Button = styled(Text)` align-items: center; height: 36px; width: 280px; - padding: 0 15px 0; + padding: 0 15px; color: ${({ theme }) => theme.main.colors.black}; background-color: #fafafb; border: 1px solid transparent; diff --git a/packages/strapi-plugin-upload/admin/src/components/EditForm/FileWrapper.js b/packages/strapi-plugin-upload/admin/src/components/EditForm/FileWrapper.js index fc443d58..4f3874a4 100644 --- a/packages/strapi-plugin-upload/admin/src/components/EditForm/FileWrapper.js +++ b/packages/strapi-plugin-upload/admin/src/components/EditForm/FileWrapper.js @@ -21,9 +21,10 @@ const FileWrapper = styled(CardImgWrapper)` } .point-se { - &:before { + &::before { display: none; } + height: 5px; width: 5px; } diff --git a/packages/strapi-plugin-upload/admin/src/components/EditForm/SizeBox.js b/packages/strapi-plugin-upload/admin/src/components/EditForm/SizeBox.js index 86b30f59..276c0158 100644 --- a/packages/strapi-plugin-upload/admin/src/components/EditForm/SizeBox.js +++ b/packages/strapi-plugin-upload/admin/src/components/EditForm/SizeBox.js @@ -1,12 +1,14 @@ +/* stylelint-disable */ import React from 'react'; import styled from 'styled-components'; import { Text } from '@buffetjs/core'; +/* stylelint-enable */ const SizeBox = styled((props) => )` position: absolute; bottom: 0; right: 0; - background: #000000; + background: #000; border-radius: ${({ theme }) => theme.main.sizes.borderRadius}; `; diff --git a/packages/strapi-plugin-upload/admin/src/components/InputFileModal/Label.js b/packages/strapi-plugin-upload/admin/src/components/InputFileModal/Label.js index e0235ecd..31503be7 100644 --- a/packages/strapi-plugin-upload/admin/src/components/InputFileModal/Label.js +++ b/packages/strapi-plugin-upload/admin/src/components/InputFileModal/Label.js @@ -16,10 +16,7 @@ const Label = styled.label` .dragzone { position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; + inset: 0; } ${({ isDragging, theme }) => diff --git a/packages/strapi-plugin-upload/admin/src/components/InputMedia/Chevron/index.js b/packages/strapi-plugin-upload/admin/src/components/InputMedia/Chevron/index.js index 477a9092..dded437a 100644 --- a/packages/strapi-plugin-upload/admin/src/components/InputMedia/Chevron/index.js +++ b/packages/strapi-plugin-upload/admin/src/components/InputMedia/Chevron/index.js @@ -5,9 +5,11 @@ import PropTypes from 'prop-types'; import Wrapper from './Wrapper'; function Chevron({ side, onClick }) { - return - - + return ( + + + + ); } Chevron.propTypes = { diff --git a/packages/strapi-plugin-upload/admin/src/components/IntlText/index.js b/packages/strapi-plugin-upload/admin/src/components/IntlText/index.js index 3b1a5ed7..fbaee7a2 100644 --- a/packages/strapi-plugin-upload/admin/src/components/IntlText/index.js +++ b/packages/strapi-plugin-upload/admin/src/components/IntlText/index.js @@ -5,9 +5,11 @@ import PropTypes from 'prop-types'; import { Text } from '@buffetjs/core'; function IntlText({ id, defaultMessage, values, ...textProps }) { - return - {(msg) => {msg}} - + return ( + + {(msg) => {msg}} + + ); } IntlText.defaultProps = { diff --git a/packages/strapi-plugin-upload/admin/src/components/List/ListCell.js b/packages/strapi-plugin-upload/admin/src/components/List/ListCell.js index 808a3b55..66bf62d0 100644 --- a/packages/strapi-plugin-upload/admin/src/components/List/ListCell.js +++ b/packages/strapi-plugin-upload/admin/src/components/List/ListCell.js @@ -5,12 +5,15 @@ const ListCell = styled.div` display: inline-block; padding-left: 15px; padding-right: 15px; + @media only screen and (min-width: 768px) { width: 50%; } + @media only screen and (min-width: 1024px) { width: 25%; } + @media only screen and (min-width: 1280px) { max-width: 248px; } diff --git a/packages/strapi-plugin-upload/admin/src/components/LoadingIndicator/index.js b/packages/strapi-plugin-upload/admin/src/components/LoadingIndicator/index.js index 236e774b..7fb699b1 100644 --- a/packages/strapi-plugin-upload/admin/src/components/LoadingIndicator/index.js +++ b/packages/strapi-plugin-upload/admin/src/components/LoadingIndicator/index.js @@ -29,7 +29,7 @@ const LoadingIndicator = styled.div` overflow: hidden; background-color: #515764; border-radius: 2px; - &:before { + &::before { content: ''; display: block; position: absolute; diff --git a/packages/strapi-plugin-upload/admin/src/components/ModalHeader/BackButton.js b/packages/strapi-plugin-upload/admin/src/components/ModalHeader/BackButton.js index 671fd0ae..306a7618 100644 --- a/packages/strapi-plugin-upload/admin/src/components/ModalHeader/BackButton.js +++ b/packages/strapi-plugin-upload/admin/src/components/ModalHeader/BackButton.js @@ -15,10 +15,10 @@ const BackButton = styled.button` text-align: center; color: #81848a; border-right: 1px solid #f3f4f4; - &:before { + &::before { line-height: normal; content: '\f053'; - font-family: 'FontAwesome'; + font-family: FontAwesome; font-size: ${({ theme }) => theme.main.sizes.fonts.lg}; font-weight: ${({ theme }) => theme.main.fontWeights.bold}; } diff --git a/packages/strapi-plugin-upload/admin/src/components/ModalNavWrapper/Hr.js b/packages/strapi-plugin-upload/admin/src/components/ModalNavWrapper/Hr.js index abb556a8..841a6e6e 100644 --- a/packages/strapi-plugin-upload/admin/src/components/ModalNavWrapper/Hr.js +++ b/packages/strapi-plugin-upload/admin/src/components/ModalNavWrapper/Hr.js @@ -2,7 +2,7 @@ import styled from 'styled-components'; import { themePropTypes } from '@akemona-org/strapi-helper-plugin'; const Hr = styled.hr` - margin: 0px; + margin: 0; width: 50%; height: 1px; border: 0; diff --git a/packages/strapi-plugin-upload/admin/src/components/ModalTab/Count/index.js b/packages/strapi-plugin-upload/admin/src/components/ModalTab/Count/index.js index fd439737..2bf88d70 100644 --- a/packages/strapi-plugin-upload/admin/src/components/ModalTab/Count/index.js +++ b/packages/strapi-plugin-upload/admin/src/components/ModalTab/Count/index.js @@ -5,16 +5,18 @@ import { Text } from '@buffetjs/core'; import Wrapper from './Wrapper'; function Count({ count, isActive }) { - return - - {count} - - + return ( + + + {count} + + + ); } Count.propTypes = { diff --git a/packages/strapi-plugin-upload/admin/src/components/PlayIcon/Play.js b/packages/strapi-plugin-upload/admin/src/components/PlayIcon/Play.js index 31220702..d1c2b387 100644 --- a/packages/strapi-plugin-upload/admin/src/components/PlayIcon/Play.js +++ b/packages/strapi-plugin-upload/admin/src/components/PlayIcon/Play.js @@ -2,56 +2,70 @@ import React from 'react'; import PropTypes from 'prop-types'; function Play({ fill, ...rest }) { - return - - - - - - - - - - - - + return ( + + + + + + + + + + + + - - - - + + + + + + - - + + ); } Play.defaultProps = { diff --git a/packages/strapi-plugin-upload/admin/src/components/PlayIcon/Wrapper.js b/packages/strapi-plugin-upload/admin/src/components/PlayIcon/Wrapper.js index 18be5f34..b69cdd07 100644 --- a/packages/strapi-plugin-upload/admin/src/components/PlayIcon/Wrapper.js +++ b/packages/strapi-plugin-upload/admin/src/components/PlayIcon/Wrapper.js @@ -10,7 +10,7 @@ const Wrapper = styled.div` height: ${({ small }) => (small ? '45px' : '94px')}; padding-left: ${({ small }) => (small ? '5px' : '9px')}; border-radius: 50%; - background-color: rgba(255, 255, 255, 0.5); + background-color: rgb(255 255 255 / 50%); `; Wrapper.defaultProps = { diff --git a/packages/strapi-plugin-upload/admin/src/components/SelectAll/Wrapper.js b/packages/strapi-plugin-upload/admin/src/components/SelectAll/Wrapper.js index ea7c1090..54856b3c 100644 --- a/packages/strapi-plugin-upload/admin/src/components/SelectAll/Wrapper.js +++ b/packages/strapi-plugin-upload/admin/src/components/SelectAll/Wrapper.js @@ -5,7 +5,7 @@ const Wrapper = styled.div` justify-content: center; height: 30px; width: 35px; - background: #ffffff; + background: #fff; border: 1px solid #e3e9f3; border-radius: 2px; > div { diff --git a/packages/strapi-plugin-upload/admin/src/containers/InputModalStepper/InputModalStepper.js b/packages/strapi-plugin-upload/admin/src/containers/InputModalStepper/InputModalStepper.js index 9071fd06..17590fbd 100644 --- a/packages/strapi-plugin-upload/admin/src/containers/InputModalStepper/InputModalStepper.js +++ b/packages/strapi-plugin-upload/admin/src/containers/InputModalStepper/InputModalStepper.js @@ -15,13 +15,7 @@ import pluginId from '../../pluginId'; import stepper from './stepper'; import useModalContext from '../../hooks/useModalContext'; -function InputModalStepper({ - allowedActions, - isOpen, - onToggle, - noNavigation, - onInputMediaChange, -}) { +function InputModalStepper({ allowedActions, isOpen, onToggle, noNavigation, onInputMediaChange }) { const { emitEvent, formatMessage } = useGlobalContext(); const [shouldDeleteFile, setShouldDeleteFile] = useState(false); const [displayNextButton, setDisplayNextButton] = useState(false); diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/BaselineAlignement/index.js b/packages/strapi-plugin-users-permissions/admin/src/components/BaselineAlignement/index.js index e8ed2537..c2210ecb 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/BaselineAlignement/index.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/BaselineAlignement/index.js @@ -8,10 +8,8 @@ import styled from 'styled-components'; // I create it to temporary fix the baseline alignment until we have the design system. const BaselineAlignment = styled.div` - padding-top: ${({ size, top }) => top && size}; - padding-right: ${({ size, right }) => right && size}; - padding-bottom: ${({ size, bottom }) => bottom && size}; - padding-left: ${({ size, left }) => left && size}; + padding: ${({ size, top }) => top && size} ${({ size, right }) => right && size} + ${({ size, bottom }) => bottom && size} ${({ size, left }) => left && size}; `; BaselineAlignment.defaultProps = { diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/BoundRoute/Components.js b/packages/strapi-plugin-users-permissions/admin/src/components/BoundRoute/Components.js index e087d3d4..cb32a0d1 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/BoundRoute/Components.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/BoundRoute/Components.js @@ -49,7 +49,7 @@ const Verb = styled.div` justify-content: center; padding: 0 1rem; border-radius: 3px; - color: #ffffff; + color: #fff; font-size: 12px; font-weight: ${({ theme }) => theme.main.fontWeights.bold}; text-transform: uppercase; diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/FormBloc/index.js b/packages/strapi-plugin-users-permissions/admin/src/components/FormBloc/index.js index ac572ec8..35f51062 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/FormBloc/index.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/FormBloc/index.js @@ -6,41 +6,43 @@ import BaselineAlignement from '../BaselineAlignement'; import Bloc from '../Bloc'; function FormBloc({ children, actions, isLoading, title, subtitle }) { - return - - - {isLoading ? ( - <> - - - - ) : ( - <> - {title && ( - <> - - - - - {title} - - {subtitle && ( - - {subtitle} + return ( + + + + {isLoading ? ( + <> + + + + ) : ( + <> + {title && ( + <> + + + + + {title} - )} - - {actions} - - - - - )} - {children} - - )} - - + {subtitle && ( + + {subtitle} + + )} + + {actions} + + + + + )} + {children} + + )} + + + ); } FormBloc.defaultProps = { diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/ListRow/Components.js b/packages/strapi-plugin-users-permissions/admin/src/components/ListRow/Components.js index 3256501e..46fcc64d 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/ListRow/Components.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/ListRow/Components.js @@ -2,8 +2,8 @@ import styled from 'styled-components'; const Container = styled.div` margin: 0 3.2rem 0 1.9rem; - padding: 0 1.4rem 0 0rem; - border-bottom: 1px solid rgba(14, 22, 34, 0.04); + padding: 0 1.4rem 0 0; + border-bottom: 1px solid rgb(14 22 34 / 4%); color: #333740; font-size: 1.3rem; > div { diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/Permissions/PermissionRow/CheckboxWrapper.js b/packages/strapi-plugin-users-permissions/admin/src/components/Permissions/PermissionRow/CheckboxWrapper.js index 17bef5e2..cb586402 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/Permissions/PermissionRow/CheckboxWrapper.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/Permissions/PermissionRow/CheckboxWrapper.js @@ -16,12 +16,14 @@ const CheckboxWrapper = styled.div` font-size: 1.4rem; color: ${({ theme }) => theme.main.colors.greyDark}; } + cursor: pointer; } &:hover { ${PolicyWrapper} { opacity: 1; } + background-color: ${({ theme }) => theme.main.colors.mediumGrey}; } ${({ isActive, theme }) => diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/Permissions/PermissionRow/SubCategory/SubCategoryWrapper.js b/packages/strapi-plugin-users-permissions/admin/src/components/Permissions/PermissionRow/SubCategory/SubCategoryWrapper.js index d54411b1..ac2be6d9 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/Permissions/PermissionRow/SubCategory/SubCategoryWrapper.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/Permissions/PermissionRow/SubCategory/SubCategoryWrapper.js @@ -4,7 +4,7 @@ import styled from 'styled-components'; const SubCategoryWrapper = styled.div` padding-bottom: 2.6rem; input[type='checkbox'] { - &:after { + &::after { color: ${({ theme }) => theme.main.colors.mediumBlue}; } } diff --git a/packages/strapi-plugin-users-permissions/admin/src/components/Permissions/PermissionRow/SubCategory/index.js b/packages/strapi-plugin-users-permissions/admin/src/components/Permissions/PermissionRow/SubCategory/index.js index 506a8a41..728483f5 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/components/Permissions/PermissionRow/SubCategory/index.js +++ b/packages/strapi-plugin-users-permissions/admin/src/components/Permissions/PermissionRow/SubCategory/index.js @@ -15,7 +15,7 @@ const Border = styled.div` flex: 1; align-self: center; border-top: 1px solid #f6f6f6; - padding: 0px 10px; + padding: 0 10px; `; function SubCategory({ subCategory }) { diff --git a/packages/strapi-plugin-users-permissions/admin/src/containers/Roles/ProtectedCreatePage/index.js b/packages/strapi-plugin-users-permissions/admin/src/containers/Roles/ProtectedCreatePage/index.js index 8b725206..e485d0bf 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/containers/Roles/ProtectedCreatePage/index.js +++ b/packages/strapi-plugin-users-permissions/admin/src/containers/Roles/ProtectedCreatePage/index.js @@ -4,9 +4,11 @@ import pluginPermissions from '../../../permissions'; import RolesCreatePage from '../CreatePage'; function ProtectedRolesCreatePage() { - return - - + return ( + + + + ); } export default ProtectedRolesCreatePage; diff --git a/packages/strapi-plugin-users-permissions/admin/src/containers/Roles/ProtectedEditPage/index.js b/packages/strapi-plugin-users-permissions/admin/src/containers/Roles/ProtectedEditPage/index.js index 00471bf1..5b87fe6c 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/containers/Roles/ProtectedEditPage/index.js +++ b/packages/strapi-plugin-users-permissions/admin/src/containers/Roles/ProtectedEditPage/index.js @@ -4,9 +4,11 @@ import pluginPermissions from '../../../permissions'; import RolesEditPage from '../EditPage'; function ProtectedRolesEditPage() { - return - - + return ( + + + + ); } export default ProtectedRolesEditPage; diff --git a/yarn.lock b/yarn.lock index 1de8492d..90ae7b64 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1572,7 +1572,7 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.14.0, @babel/core@npm:^7.17.9": +"@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.14.0": version: 7.20.12 resolution: "@babel/core@npm:7.20.12" dependencies: @@ -1965,7 +1965,7 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.13, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.8.3": +"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.13, @babel/parser@npm:^7.20.7": version: 7.20.13 resolution: "@babel/parser@npm:7.20.13" bin: @@ -3009,7 +3009,7 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.20.10, @babel/traverse@npm:^7.20.12, @babel/traverse@npm:^7.20.13, @babel/traverse@npm:^7.20.5, @babel/traverse@npm:^7.20.7, @babel/traverse@npm:^7.4.5, @babel/traverse@npm:^7.7.2, @babel/traverse@npm:^7.8.3": +"@babel/traverse@npm:^7.20.10, @babel/traverse@npm:^7.20.12, @babel/traverse@npm:^7.20.13, @babel/traverse@npm:^7.20.5, @babel/traverse@npm:^7.20.7, @babel/traverse@npm:^7.4.5, @babel/traverse@npm:^7.7.2": version: 7.20.13 resolution: "@babel/traverse@npm:7.20.13" dependencies: @@ -3175,6 +3175,41 @@ __metadata: languageName: node linkType: hard +"@csstools/css-parser-algorithms@npm:^2.5.0": + version: 2.5.0 + resolution: "@csstools/css-parser-algorithms@npm:2.5.0" + peerDependencies: + "@csstools/css-tokenizer": ^2.2.3 + checksum: 10c0/31b4a523d956e204af9842183678cca5a88ad76551d54dcb6083f8a6f2dfd8fdec6c09bca5410842af54b90997308bebee7593c17dbc1a4e951453b54bd3f024 + languageName: node + linkType: hard + +"@csstools/css-tokenizer@npm:^2.2.3": + version: 2.2.3 + resolution: "@csstools/css-tokenizer@npm:2.2.3" + checksum: 10c0/557266ec52e8b36c19008a5bbd7151effba085cdd6d68270c01afebf914981caac698eda754b2a530a8a9947a3dd70e3f3a39a5e037c4170bb2a055a92754acb + languageName: node + linkType: hard + +"@csstools/media-query-list-parser@npm:^2.1.7": + version: 2.1.7 + resolution: "@csstools/media-query-list-parser@npm:2.1.7" + peerDependencies: + "@csstools/css-parser-algorithms": ^2.5.0 + "@csstools/css-tokenizer": ^2.2.3 + checksum: 10c0/433aef06b00f1d402fd24074a1919b8e2de94245a3b780da6466c8cc9e0f3cc93d2db930f0fce36c7d6908cd50b626cd61e803d3f62dddad79eeb742858028ef + languageName: node + linkType: hard + +"@csstools/selector-specificity@npm:^3.0.1": + version: 3.0.1 + resolution: "@csstools/selector-specificity@npm:3.0.1" + peerDependencies: + postcss-selector-parser: ^6.0.13 + checksum: 10c0/4280f494726d5e38de74e28dee2ff74ec86244560dff4edeec3ddff3ac73c774c19535bd1bb70cad77949bfb359cf87e977d0ec3264591e3b7260342a20dd84f + languageName: node + linkType: hard + "@emotion/babel-plugin@npm:^11.10.5": version: 11.10.5 resolution: "@emotion/babel-plugin@npm:11.10.5" @@ -5603,31 +5638,6 @@ __metadata: languageName: node linkType: hard -"@stylelint/postcss-css-in-js@npm:^0.37.2": - version: 0.37.3 - resolution: "@stylelint/postcss-css-in-js@npm:0.37.3" - dependencies: - "@babel/core": "npm:^7.17.9" - peerDependencies: - postcss: ">=7.0.0" - postcss-syntax: ">=0.36.2" - checksum: 10c0/cd439882a3b8b7601394e244bdb74f8d90de3ceb12aabf8611779306192f355b766f5ead9bc0a3c9404517986d77a907b6fc6e42710f8a7d0915f9b254e1c721 - languageName: node - linkType: hard - -"@stylelint/postcss-markdown@npm:^0.36.2": - version: 0.36.2 - resolution: "@stylelint/postcss-markdown@npm:0.36.2" - dependencies: - remark: "npm:^13.0.0" - unist-util-find-all-after: "npm:^3.0.2" - peerDependencies: - postcss: ">=7.0.0" - postcss-syntax: ">=0.36.2" - checksum: 10c0/6c6fe3a1af4a0a3823686bb5b8d9cbc9f4b52abdf62269338de1bcf906aae29e3a231740febcb2f9cba9d31da0d4f48086284ed6b4c43655273a7a60ebf76e80 - languageName: node - linkType: hard - "@swc/core-darwin-arm64@npm:1.3.18": version: 1.3.18 resolution: "@swc/core-darwin-arm64@npm:1.3.18" @@ -6218,15 +6228,6 @@ __metadata: languageName: node linkType: hard -"@types/mdast@npm:^3.0.0": - version: 3.0.10 - resolution: "@types/mdast@npm:3.0.10" - dependencies: - "@types/unist": "npm:*" - checksum: 10c0/375f08b3910505291b2815d9edf55dca63c6c4ec58dd33c866521e68905fd4e8fe83b397e167af2cdd3799b851a7e02817d58610cfb814aee20bf3c52d87be9b - languageName: node - linkType: hard - "@types/mime@npm:*": version: 3.0.1 resolution: "@types/mime@npm:3.0.1" @@ -6439,13 +6440,6 @@ __metadata: languageName: node linkType: hard -"@types/unist@npm:*, @types/unist@npm:^2.0.0, @types/unist@npm:^2.0.2": - version: 2.0.6 - resolution: "@types/unist@npm:2.0.6" - checksum: 10c0/8690789328e8e10c487334341fcf879fd49f8987c98ce49849f9871052f95d87477735171bb661e6f551bdb95235e015dfdad1867ca1d9b5b88a053f72ac40eb - languageName: node - linkType: hard - "@types/webidl-conversions@npm:*": version: 7.0.0 resolution: "@types/webidl-conversions@npm:7.0.0" @@ -8202,13 +8196,6 @@ __metadata: languageName: node linkType: hard -"bail@npm:^1.0.0": - version: 1.0.5 - resolution: "bail@npm:1.0.5" - checksum: 10c0/4cf7d0b5c82fdc69590b3fe85c17c4ec37647681b20875551fd6187a85c122b20178dc118001d3ebd5d0ab3dc0e95637c71f889f481882ee761db43c6b16fa05 - languageName: node - linkType: hard - "balanced-match@npm:^1.0.0": version: 1.0.2 resolution: "balanced-match@npm:1.0.2" @@ -9144,27 +9131,6 @@ __metadata: languageName: node linkType: hard -"character-entities-legacy@npm:^1.0.0": - version: 1.1.4 - resolution: "character-entities-legacy@npm:1.1.4" - checksum: 10c0/ea4ca9c29887335eed86d78fc67a640168342b1274da84c097abb0575a253d1265281a5052f9a863979e952bcc267b4ecaaf4fe233a7e1e0d8a47806c65b96c7 - languageName: node - linkType: hard - -"character-entities@npm:^1.0.0": - version: 1.2.4 - resolution: "character-entities@npm:1.2.4" - checksum: 10c0/ad015c3d7163563b8a0ee1f587fb0ef305ef344e9fd937f79ca51cccc233786a01d591d989d5bf7b2e66b528ac9efba47f3b1897358324e69932f6d4b25adfe1 - languageName: node - linkType: hard - -"character-reference-invalid@npm:^1.0.0": - version: 1.1.4 - resolution: "character-reference-invalid@npm:1.1.4" - checksum: 10c0/29f05081c5817bd1e975b0bf61e77b60a40f62ad371d0f0ce0fdb48ab922278bc744d1fbe33771dced751887a8403f265ff634542675c8d7375f6ff4811efd0e - languageName: node - linkType: hard - "chardet@npm:^0.7.0": version: 0.7.0 resolution: "chardet@npm:0.7.0" @@ -9486,15 +9452,6 @@ __metadata: languageName: node linkType: hard -"clone-regexp@npm:^2.1.0": - version: 2.2.0 - resolution: "clone-regexp@npm:2.2.0" - dependencies: - is-regexp: "npm:^2.0.0" - checksum: 10c0/658f0110b057c1a80be52423f2d93ffb4fc690224abcba6df9cea04230e6ad19924a6dd04942749f4550a728447a982b10106392cda58315de81833ad373c3d2 - languageName: node - linkType: hard - "clone-response@npm:^1.0.2": version: 1.0.3 resolution: "clone-response@npm:1.0.3" @@ -9694,6 +9651,13 @@ __metadata: languageName: node linkType: hard +"colord@npm:^2.9.3": + version: 2.9.3 + resolution: "colord@npm:2.9.3" + checksum: 10c0/9699e956894d8996b28c686afe8988720785f476f59335c80ce852ded76ab3ebe252703aec53d9bef54f6219aea6b960fb3d9a8300058a1d0c0d4026460cd110 + languageName: node + linkType: hard + "colorette@npm:2.0.19, colorette@npm:^2.0.16, colorette@npm:^2.0.17, colorette@npm:^2.0.7": version: 2.0.19 resolution: "colorette@npm:2.0.19" @@ -10267,6 +10231,23 @@ __metadata: languageName: node linkType: hard +"cosmiconfig@npm:^9.0.0": + version: 9.0.0 + resolution: "cosmiconfig@npm:9.0.0" + dependencies: + env-paths: "npm:^2.2.1" + import-fresh: "npm:^3.3.0" + js-yaml: "npm:^4.1.0" + parse-json: "npm:^5.2.0" + peerDependencies: + typescript: ">=4.9.5" + peerDependenciesMeta: + typescript: + optional: true + checksum: 10c0/1c1703be4f02a250b1d6ca3267e408ce16abfe8364193891afc94c2d5c060b69611fdc8d97af74b7e6d5d1aac0ab2fb94d6b079573146bc2d756c2484ce5f0ee + languageName: node + linkType: hard + "crc@npm:^3.8.0": version: 3.8.0 resolution: "crc@npm:3.8.0" @@ -10431,6 +10412,13 @@ __metadata: languageName: node linkType: hard +"css-functions-list@npm:^3.2.1": + version: 3.2.1 + resolution: "css-functions-list@npm:3.2.1" + checksum: 10c0/e6e2d9580437ad6df9f2cf18cff3f941691ec5cbbaebd4cb17a5da40d8d5dac50004807ddd05c00a121d2f21a224e2c5d339fe8e13614af21c00181d7d1c22b9 + languageName: node + linkType: hard + "css-loader@npm:^2.1.1": version: 2.1.1 resolution: "css-loader@npm:2.1.1" @@ -10552,6 +10540,16 @@ __metadata: languageName: node linkType: hard +"css-tree@npm:^2.3.1": + version: 2.3.1 + resolution: "css-tree@npm:2.3.1" + dependencies: + mdn-data: "npm:2.0.30" + source-map-js: "npm:^1.0.1" + checksum: 10c0/6f8c1a11d5e9b14bf02d10717fc0351b66ba12594166f65abfbd8eb8b5b490dd367f5c7721db241a3c792d935fc6751fbc09f7e1598d421477ad9fadc30f4f24 + languageName: node + linkType: hard + "css-what@npm:^3.2.1": version: 3.4.2 resolution: "css-what@npm:3.4.2" @@ -10802,7 +10800,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:*, debug@npm:4, debug@npm:4.3.4, debug@npm:4.x, debug@npm:^4.0.0, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4": +"debug@npm:*, debug@npm:4, debug@npm:4.3.4, debug@npm:4.x, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4": version: 4.3.4 resolution: "debug@npm:4.3.4" dependencies: @@ -11426,7 +11424,7 @@ __metadata: languageName: node linkType: hard -"domelementtype@npm:1, domelementtype@npm:^1.3.1": +"domelementtype@npm:1": version: 1.3.1 resolution: "domelementtype@npm:1.3.1" checksum: 10c0/6d4f5761060a21eaf3c96545501e9d188745c7e1c31b8d141bf15d8748feeadba868f4ea32877751b8678b286fb1afbe6ae905ca3fb8f0214d8322e482cdbec0 @@ -11449,15 +11447,6 @@ __metadata: languageName: node linkType: hard -"domhandler@npm:^2.3.0": - version: 2.4.2 - resolution: "domhandler@npm:2.4.2" - dependencies: - domelementtype: "npm:1" - checksum: 10c0/6670cab73e97e3c6771dcf22b537db3f6a0be0ad6b370f03bb5f1b585d3b563d326787fdabe1190b7ca9d81c804e9b3f8a1431159c27c44f6c05f94afa92be2d - languageName: node - linkType: hard - "domhandler@npm:^4.0.0, domhandler@npm:^4.2.0, domhandler@npm:^4.3.1": version: 4.3.1 resolution: "domhandler@npm:4.3.1" @@ -11476,7 +11465,7 @@ __metadata: languageName: node linkType: hard -"domutils@npm:^1.5.1, domutils@npm:^1.7.0": +"domutils@npm:^1.7.0": version: 1.7.0 resolution: "domutils@npm:1.7.0" dependencies: @@ -11757,13 +11746,6 @@ __metadata: languageName: node linkType: hard -"entities@npm:^1.1.1": - version: 1.1.2 - resolution: "entities@npm:1.1.2" - checksum: 10c0/5b12fa8c4fb942f88af6f8791bbe7be0a59ebd91c8933cee091d94455efd1eeb200418c7b1bc8dd0f74cdd4db8cf4538eb043db14cfd1919130c25d8c6095215 - languageName: node - linkType: hard - "entities@npm:^2.0.0": version: 2.2.0 resolution: "entities@npm:2.2.0" @@ -11785,7 +11767,7 @@ __metadata: languageName: node linkType: hard -"env-paths@npm:^2.2.0": +"env-paths@npm:^2.2.0, env-paths@npm:^2.2.1": version: 2.2.1 resolution: "env-paths@npm:2.2.1" checksum: 10c0/285325677bf00e30845e330eec32894f5105529db97496ee3f598478e50f008c5352a41a30e5e72ec9de8a542b5a570b85699cd63bd2bc646dbcb9f311d83bc4 @@ -12740,15 +12722,6 @@ __metadata: languageName: node linkType: hard -"execall@npm:^2.0.0": - version: 2.0.0 - resolution: "execall@npm:2.0.0" - dependencies: - clone-regexp: "npm:^2.1.0" - checksum: 10c0/ffcb293c272dcff4812b69953fedac2b681c2cdd73062b5a6ff47491cdd5a324d8989fc485b0ee1553316315be3fdd58333e0ec7b8f282e9c605289d528cbb81 - languageName: node - linkType: hard - "exit@npm:^0.1.2": version: 0.1.2 resolution: "exit@npm:0.1.2" @@ -12927,7 +12900,7 @@ __metadata: languageName: node linkType: hard -"fast-glob@npm:^3.2.5, fast-glob@npm:^3.2.9": +"fast-glob@npm:^3.2.9": version: 3.2.12 resolution: "fast-glob@npm:3.2.12" dependencies: @@ -12940,6 +12913,19 @@ __metadata: languageName: node linkType: hard +"fast-glob@npm:^3.3.2": + version: 3.3.2 + resolution: "fast-glob@npm:3.3.2" + dependencies: + "@nodelib/fs.stat": "npm:^2.0.2" + "@nodelib/fs.walk": "npm:^1.2.3" + glob-parent: "npm:^5.1.2" + merge2: "npm:^1.3.0" + micromatch: "npm:^4.0.4" + checksum: 10c0/42baad7b9cd40b63e42039132bde27ca2cb3a4950d0a0f9abe4639ea1aa9d3e3b40f98b1fe31cbc0cc17b664c9ea7447d911a152fa34ec5b72977b125a6fc845 + languageName: node + linkType: hard + "fast-json-stable-stringify@npm:^2.0.0, fast-json-stable-stringify@npm:^2.1.0": version: 2.1.0 resolution: "fast-json-stable-stringify@npm:2.1.0" @@ -12979,7 +12965,7 @@ __metadata: languageName: node linkType: hard -"fastest-levenshtein@npm:^1.0.12": +"fastest-levenshtein@npm:^1.0.16": version: 1.0.16 resolution: "fastest-levenshtein@npm:1.0.16" checksum: 10c0/7e3d8ae812a7f4fdf8cad18e9cde436a39addf266a5986f653ea0d81e0de0900f50c0f27c6d5aff3f686bcb48acbd45be115ae2216f36a6a13a7dbbf5cad878b @@ -13077,6 +13063,15 @@ __metadata: languageName: node linkType: hard +"file-entry-cache@npm:^8.0.0": + version: 8.0.0 + resolution: "file-entry-cache@npm:8.0.0" + dependencies: + flat-cache: "npm:^4.0.0" + checksum: 10c0/9e2b5938b1cd9b6d7e3612bdc533afd4ac17b2fc646569e9a8abbf2eb48e5eb8e316bc38815a3ef6a1b456f4107f0d0f055a614ca613e75db6bf9ff4d72c1638 + languageName: node + linkType: hard + "file-loader@npm:^6.2.0": version: 6.2.0 resolution: "file-loader@npm:6.2.0" @@ -13244,6 +13239,17 @@ __metadata: languageName: node linkType: hard +"flat-cache@npm:^4.0.0": + version: 4.0.0 + resolution: "flat-cache@npm:4.0.0" + dependencies: + flatted: "npm:^3.2.9" + keyv: "npm:^4.5.4" + rimraf: "npm:^5.0.5" + checksum: 10c0/8f99e27bb3de94e91e7b4ca5120488cdc2b7f8cd952a538f1a566101963057eb42ca318e9fac0d36987dcca34316ff04b61c1dc3dcc8084f6f5e801a52a8e547 + languageName: node + linkType: hard + "flat@npm:^5.0.2": version: 5.0.2 resolution: "flat@npm:5.0.2" @@ -13260,6 +13266,13 @@ __metadata: languageName: node linkType: hard +"flatted@npm:^3.2.9": + version: 3.2.9 + resolution: "flatted@npm:3.2.9" + checksum: 10c0/5c91c5a0a21bbc0b07b272231e5b4efe6b822bcb4ad317caf6bb06984be4042a9e9045026307da0fdb4583f1f545e317a67ef1231a59e71f7fced3cc429cfc53 + languageName: node + linkType: hard + "flush-write-stream@npm:^1.0.0": version: 1.1.1 resolution: "flush-write-stream@npm:1.1.1" @@ -13759,13 +13772,6 @@ __metadata: languageName: node linkType: hard -"get-stdin@npm:^8.0.0": - version: 8.0.0 - resolution: "get-stdin@npm:8.0.0" - checksum: 10c0/b71b72b83928221052f713b3b6247ebf1ceaeb4ef76937778557537fd51ad3f586c9e6a7476865022d9394b39b74eed1dc7514052fa74d80625276253571b76f - languageName: node - linkType: hard - "get-stream@npm:6.0.0": version: 6.0.0 resolution: "get-stream@npm:6.0.0" @@ -14011,7 +14017,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:^10.2.2, glob@npm:^10.3.10": +"glob@npm:^10.2.2, glob@npm:^10.3.10, glob@npm:^10.3.7": version: 10.3.10 resolution: "glob@npm:10.3.10" dependencies: @@ -14157,7 +14163,7 @@ __metadata: languageName: node linkType: hard -"globby@npm:11.1.0, globby@npm:^11.0.3": +"globby@npm:11.1.0, globby@npm:^11.1.0": version: 11.1.0 resolution: "globby@npm:11.1.0" dependencies: @@ -14191,17 +14197,6 @@ __metadata: languageName: node linkType: hard -"gonzales-pe@npm:^4.3.0": - version: 4.3.0 - resolution: "gonzales-pe@npm:4.3.0" - dependencies: - minimist: "npm:^1.2.5" - bin: - gonzales: bin/gonzales.js - checksum: 10c0/b99a6ef4bf28ca0b0adcc0b42fd0179676ee8bfe1d3e3c0025d7d38ba35a3f2d5b1d4beb16101a7fc7cb2dbda1ec045bbce0932697095df41d729bac1703476f - languageName: node - linkType: hard - "gopd@npm:^1.0.1": version: 1.0.1 resolution: "gopd@npm:1.0.1" @@ -14878,10 +14873,10 @@ __metadata: languageName: node linkType: hard -"html-tags@npm:^3.1.0": - version: 3.2.0 - resolution: "html-tags@npm:3.2.0" - checksum: 10c0/fc8ac525e193354bf51b64f0e32a729a2e222b6c0f34cedab0259a35ddc5b7e31ddb556b516ea1a5725339a1085098a5f47ff385a3fa50291523d426b54012da +"html-tags@npm:^3.3.1": + version: 3.3.1 + resolution: "html-tags@npm:3.3.1" + checksum: 10c0/680165e12baa51bad7397452d247dbcc5a5c29dac0e6754b1187eee3bf26f514bc1907a431dd2f7eb56207611ae595ee76a0acc8eaa0d931e72c791dd6463d79 languageName: node linkType: hard @@ -14902,20 +14897,6 @@ __metadata: languageName: node linkType: hard -"htmlparser2@npm:^3.10.0": - version: 3.10.1 - resolution: "htmlparser2@npm:3.10.1" - dependencies: - domelementtype: "npm:^1.3.1" - domhandler: "npm:^2.3.0" - domutils: "npm:^1.5.1" - entities: "npm:^1.1.1" - inherits: "npm:^2.0.1" - readable-stream: "npm:^3.1.1" - checksum: 10c0/b1424536ff062088501efa06a2afd478545d3134a5ad2e28bbe02dc2d092784982286b90f1c87fa3d86692958dbfb8936352dfd71d1cb2ff7cb61208c00fcdb1 - languageName: node - linkType: hard - "htmlparser2@npm:^6.0.0, htmlparser2@npm:^6.1.0": version: 6.1.0 resolution: "htmlparser2@npm:6.1.0" @@ -15254,13 +15235,20 @@ __metadata: languageName: node linkType: hard -"ignore@npm:^5.0.4, ignore@npm:^5.1.1, ignore@npm:^5.1.8, ignore@npm:^5.2.0": +"ignore@npm:^5.0.4, ignore@npm:^5.1.1, ignore@npm:^5.2.0": version: 5.2.4 resolution: "ignore@npm:5.2.4" checksum: 10c0/7c7cd90edd9fea6e037f9b9da4b01bf0a86b198ce78345f9bbd983929d68ff14830be31111edc5d70c264921f4962404d75b7262b4d9cc3bc12381eccbd03096 languageName: node linkType: hard +"ignore@npm:^5.3.0": + version: 5.3.1 + resolution: "ignore@npm:5.3.1" + checksum: 10c0/703f7f45ffb2a27fb2c5a8db0c32e7dee66b33a225d28e8db4e1be6474795f606686a6e3bcc50e1aa12f2042db4c9d4a7d60af3250511de74620fbed052ea4cd + languageName: node + linkType: hard + "immer@npm:9.0.16": version: 9.0.16 resolution: "immer@npm:9.0.16" @@ -15338,13 +15326,6 @@ __metadata: languageName: node linkType: hard -"import-lazy@npm:^4.0.0": - version: 4.0.0 - resolution: "import-lazy@npm:4.0.0" - checksum: 10c0/a3520313e2c31f25c0b06aa66d167f329832b68a4f957d7c9daf6e0fa41822b6e84948191648b9b9d8ca82f94740cdf15eecf2401a5b42cd1c33fd84f2225cca - languageName: node - linkType: hard - "import-local@npm:3.1.0, import-local@npm:^3.0.2": version: 3.1.0 resolution: "import-local@npm:3.1.0" @@ -15731,23 +15712,6 @@ __metadata: languageName: node linkType: hard -"is-alphabetical@npm:^1.0.0": - version: 1.0.4 - resolution: "is-alphabetical@npm:1.0.4" - checksum: 10c0/1505b1de5a1fd74022c05fb21b0e683a8f5229366bac8dc4d34cf6935bcfd104d1125a5e6b083fb778847629f76e5bdac538de5367bdf2b927a1356164e23985 - languageName: node - linkType: hard - -"is-alphanumerical@npm:^1.0.0": - version: 1.0.4 - resolution: "is-alphanumerical@npm:1.0.4" - dependencies: - is-alphabetical: "npm:^1.0.0" - is-decimal: "npm:^1.0.0" - checksum: 10c0/d623abae7130a7015c6bf33d99151d4e7005572fd170b86568ff4de5ae86ac7096608b87dd4a1d4dbbd497e392b6396930ba76c9297a69455909cebb68005905 - languageName: node - linkType: hard - "is-arguments@npm:^1.0.4, is-arguments@npm:^1.1.1": version: 1.1.1 resolution: "is-arguments@npm:1.1.1" @@ -15837,7 +15801,7 @@ __metadata: languageName: node linkType: hard -"is-buffer@npm:^2.0.0, is-buffer@npm:^2.0.5": +"is-buffer@npm:^2.0.5": version: 2.0.5 resolution: "is-buffer@npm:2.0.5" checksum: 10c0/e603f6fced83cf94c53399cff3bda1a9f08e391b872b64a73793b0928be3e5f047f2bcece230edb7632eaea2acdbfcb56c23b33d8a20c820023b230f1485679a @@ -15928,13 +15892,6 @@ __metadata: languageName: node linkType: hard -"is-decimal@npm:^1.0.0": - version: 1.0.4 - resolution: "is-decimal@npm:1.0.4" - checksum: 10c0/a4ad53c4c5c4f5a12214e7053b10326711f6a71f0c63ba1314a77bd71df566b778e4ebd29f9fb6815f07a4dc50c3767fb19bd6fc9fa05e601410f1d64ffeac48 - languageName: node - linkType: hard - "is-descriptor@npm:^0.1.0": version: 0.1.6 resolution: "is-descriptor@npm:0.1.6" @@ -16051,13 +16008,6 @@ __metadata: languageName: node linkType: hard -"is-hexadecimal@npm:^1.0.0": - version: 1.0.4 - resolution: "is-hexadecimal@npm:1.0.4" - checksum: 10c0/ec4c64e5624c0f240922324bc697e166554f09d3ddc7633fc526084502626445d0a871fbd8cae52a9844e83bd0bb414193cc5a66806d7b2867907003fc70c5ea - languageName: node - linkType: hard - "is-interactive@npm:^1.0.0": version: 1.0.0 resolution: "is-interactive@npm:1.0.0" @@ -16164,13 +16114,6 @@ __metadata: languageName: node linkType: hard -"is-plain-obj@npm:^2.0.0": - version: 2.1.0 - resolution: "is-plain-obj@npm:2.1.0" - checksum: 10c0/e5c9814cdaa627a9ad0a0964ded0e0491bfd9ace405c49a5d63c88b30a162f1512c069d5b80997893c4d0181eadc3fed02b4ab4b81059aba5620bfcdfdeb9c53 - languageName: node - linkType: hard - "is-plain-object@npm:^2.0.3, is-plain-object@npm:^2.0.4": version: 2.0.4 resolution: "is-plain-object@npm:2.0.4" @@ -16204,13 +16147,6 @@ __metadata: languageName: node linkType: hard -"is-regexp@npm:^2.0.0": - version: 2.1.0 - resolution: "is-regexp@npm:2.1.0" - checksum: 10c0/f3fb0233be913e271527be74a1830ec10183dff609b05c1793bc14c3d0b86940f3757b070f79bc6a9fe9abfecaba35422fe4832a77522058be393508a15576c2 - languageName: node - linkType: hard - "is-resolvable@npm:^1.0.0": version: 1.1.0 resolution: "is-resolvable@npm:1.1.0" @@ -17531,6 +17467,15 @@ __metadata: languageName: node linkType: hard +"keyv@npm:^4.5.4": + version: 4.5.4 + resolution: "keyv@npm:4.5.4" + dependencies: + json-buffer: "npm:3.0.1" + checksum: 10c0/aa52f3c5e18e16bb6324876bb8b59dd02acf782a4b789c7b2ae21107fab95fab3890ed448d4f8dba80ce05391eeac4bfabb4f02a20221342982f806fa2cf271e + languageName: node + linkType: hard + "killable@npm:^1.0.1": version: 1.0.1 resolution: "killable@npm:1.0.1" @@ -17616,10 +17561,10 @@ __metadata: languageName: node linkType: hard -"known-css-properties@npm:^0.21.0": - version: 0.21.0 - resolution: "known-css-properties@npm:0.21.0" - checksum: 10c0/bd406bda0b580de5c3e99275863b7f2319057837c1166758eac6cfce5a1430094b42270e26f62ce94c8ffa287bdfbe374b5b47492c7050de955bb1a221f3e905 +"known-css-properties@npm:^0.29.0": + version: 0.29.0 + resolution: "known-css-properties@npm:0.29.0" + checksum: 10c0/f66e9992097b8f54e97dbe729943d4a11b8d3ba15f68dbb3deb8bb0122cb89c22c90c9221ecb1e3f2e236838fe3c0faae319b43908c81b6e254ac43cafde2906 languageName: node linkType: hard @@ -18479,13 +18424,6 @@ __metadata: languageName: node linkType: hard -"longest-streak@npm:^2.0.0": - version: 2.0.4 - resolution: "longest-streak@npm:2.0.4" - checksum: 10c0/918fb5104cde537757f44431776d6d828bc091a63ca38a3b3e59a08b88498b4421bf5fd9823ef22b4d186f0234d9943087fa96bd6117d26dedcf6008480fd46a - languageName: node - linkType: hard - "loose-envify@npm:^1.0.0, loose-envify@npm:^1.1.0, loose-envify@npm:^1.2.0, loose-envify@npm:^1.3.1, loose-envify@npm:^1.4.0": version: 1.4.0 resolution: "loose-envify@npm:1.4.0" @@ -18870,40 +18808,6 @@ __metadata: languageName: node linkType: hard -"mdast-util-from-markdown@npm:^0.8.0": - version: 0.8.5 - resolution: "mdast-util-from-markdown@npm:0.8.5" - dependencies: - "@types/mdast": "npm:^3.0.0" - mdast-util-to-string: "npm:^2.0.0" - micromark: "npm:~2.11.0" - parse-entities: "npm:^2.0.0" - unist-util-stringify-position: "npm:^2.0.0" - checksum: 10c0/86e7589e574378817c180f10ab602db844b6b71b7b1769314947a02ef42ac5c1435f5163d02a975ae8cdab8b6e6176acbd9188da1848ddd5f0d5e09d0291c870 - languageName: node - linkType: hard - -"mdast-util-to-markdown@npm:^0.6.0": - version: 0.6.5 - resolution: "mdast-util-to-markdown@npm:0.6.5" - dependencies: - "@types/unist": "npm:^2.0.0" - longest-streak: "npm:^2.0.0" - mdast-util-to-string: "npm:^2.0.0" - parse-entities: "npm:^2.0.0" - repeat-string: "npm:^1.0.0" - zwitch: "npm:^1.0.0" - checksum: 10c0/716035b75a50394298eb31acee60a20d06310c7ebf83a3009908714d8c4058d636344932c9c054f1a26e8c6c20e2aafda3b87e003c16037b3e16b2d260a87463 - languageName: node - linkType: hard - -"mdast-util-to-string@npm:^2.0.0": - version: 2.0.0 - resolution: "mdast-util-to-string@npm:2.0.0" - checksum: 10c0/a4231085133cdfec24644b694c13661e5a01d26716be0105b6792889faa04b8030e4abbf72d4be3363098b2b38b2b98f1f1f1f0858eb6580dc04e2aca1436a37 - languageName: node - linkType: hard - "mdn-data@npm:2.0.14": version: 2.0.14 resolution: "mdn-data@npm:2.0.14" @@ -18911,6 +18815,13 @@ __metadata: languageName: node linkType: hard +"mdn-data@npm:2.0.30": + version: 2.0.30 + resolution: "mdn-data@npm:2.0.30" + checksum: 10c0/a2c472ea16cee3911ae742593715aa4c634eb3d4b9f1e6ada0902aa90df13dcbb7285d19435f3ff213ebaa3b2e0c0265c1eb0e3fb278fda7f8919f046a410cd9 + languageName: node + linkType: hard + "mdn-data@npm:2.0.4": version: 2.0.4 resolution: "mdn-data@npm:2.0.4" @@ -18973,6 +18884,13 @@ __metadata: languageName: node linkType: hard +"meow@npm:^13.1.0": + version: 13.2.0 + resolution: "meow@npm:13.2.0" + checksum: 10c0/d5b339ae314715bcd0b619dd2f8a266891928e21526b4800d49b4fba1cc3fff7e2c1ff5edd3344149fac841bc2306157f858e8c4d5eaee4d52ce52ad925664ce + languageName: node + linkType: hard + "meow@npm:^8.1.2": version: 8.1.2 resolution: "meow@npm:8.1.2" @@ -18992,26 +18910,6 @@ __metadata: languageName: node linkType: hard -"meow@npm:^9.0.0": - version: 9.0.0 - resolution: "meow@npm:9.0.0" - dependencies: - "@types/minimist": "npm:^1.2.0" - camelcase-keys: "npm:^6.2.2" - decamelize: "npm:^1.2.0" - decamelize-keys: "npm:^1.1.0" - hard-rejection: "npm:^2.1.0" - minimist-options: "npm:4.1.0" - normalize-package-data: "npm:^3.0.0" - read-pkg-up: "npm:^7.0.1" - redent: "npm:^3.0.0" - trim-newlines: "npm:^3.0.0" - type-fest: "npm:^0.18.0" - yargs-parser: "npm:^20.2.3" - checksum: 10c0/998955ecff999dc3f3867ef3b51999218212497f27d75b9cbe10bdb73aac4ee308d484f7801fd1b3cfa4172819065f65f076ca018c1412fab19d0ea486648722 - languageName: node - linkType: hard - "merge-descriptors@npm:1.0.1": version: 1.0.1 resolution: "merge-descriptors@npm:1.0.1" @@ -19040,16 +18938,6 @@ __metadata: languageName: node linkType: hard -"micromark@npm:~2.11.0": - version: 2.11.4 - resolution: "micromark@npm:2.11.4" - dependencies: - debug: "npm:^4.0.0" - parse-entities: "npm:^2.0.0" - checksum: 10c0/67307cbacae621ab1eb23e333a5addc7600cf97d3b40cad22fc1c2d03d734d6d9cbc3f5a7e5d655a8c0862a949abe590ab7cfa96be366bfe09e239a94e6eea55 - languageName: node - linkType: hard - "micromatch@npm:^3.0.4, micromatch@npm:^3.1.10, micromatch@npm:^3.1.4": version: 3.1.10 resolution: "micromatch@npm:3.1.10" @@ -19071,7 +18959,7 @@ __metadata: languageName: node linkType: hard -"micromatch@npm:^4.0.2, micromatch@npm:^4.0.4, micromatch@npm:^4.0.5": +"micromatch@npm:^4.0.4, micromatch@npm:^4.0.5": version: 4.0.5 resolution: "micromatch@npm:4.0.5" dependencies: @@ -19719,6 +19607,15 @@ __metadata: languageName: node linkType: hard +"nanoid@npm:^3.3.7": + version: 3.3.7 + resolution: "nanoid@npm:3.3.7" + bin: + nanoid: bin/nanoid.cjs + checksum: 10c0/e3fb661aa083454f40500473bb69eedb85dc160e763150b9a2c567c7e9ff560ce028a9f833123b618a6ea742e311138b591910e795614a629029e86e180660f3 + languageName: node + linkType: hard + "nanomatch@npm:^1.2.9": version: 1.2.13 resolution: "nanomatch@npm:1.2.13" @@ -20159,13 +20056,6 @@ __metadata: languageName: node linkType: hard -"normalize-selector@npm:^0.2.0": - version: 0.2.0 - resolution: "normalize-selector@npm:0.2.0" - checksum: 10c0/2fb1fb495796b9aadee9c5ef20de9f89d91c807a44bb853883eb2dc088dcfdf98d353178774807632fe34de28a4c480f7256a51f6dfed4db112e2b1dabe26ced - languageName: node - linkType: hard - "normalize-url@npm:^3.0.0": version: 3.3.0 resolution: "normalize-url@npm:3.3.0" @@ -21241,20 +21131,6 @@ __metadata: languageName: node linkType: hard -"parse-entities@npm:^2.0.0": - version: 2.0.0 - resolution: "parse-entities@npm:2.0.0" - dependencies: - character-entities: "npm:^1.0.0" - character-entities-legacy: "npm:^1.0.0" - character-reference-invalid: "npm:^1.0.0" - is-alphanumerical: "npm:^1.0.0" - is-decimal: "npm:^1.0.0" - is-hexadecimal: "npm:^1.0.0" - checksum: 10c0/f85a22c0ea406ff26b53fdc28641f01cc36fa49eb2e3135f02693286c89ef0bcefc2262d99b3688e20aac2a14fd10b75c518583e875c1b9fe3d1f937795e0854 - languageName: node - linkType: hard - "parse-json@npm:^4.0.0": version: 4.0.0 resolution: "parse-json@npm:4.0.0" @@ -21885,27 +21761,6 @@ __metadata: languageName: node linkType: hard -"postcss-html@npm:^0.36.0": - version: 0.36.0 - resolution: "postcss-html@npm:0.36.0" - dependencies: - htmlparser2: "npm:^3.10.0" - peerDependencies: - postcss: ">=5.0.0" - postcss-syntax: ">=0.36.0" - checksum: 10c0/973f5fc9115c8ea5dff51f91ec5dad4db1cccdfc052126fd1e96109146d297ee7e404f80642ebe493e747f10e2ccfc1331be729c41a22b97a8a3c480d0d71f94 - languageName: node - linkType: hard - -"postcss-less@npm:^3.1.4": - version: 3.1.4 - resolution: "postcss-less@npm:3.1.4" - dependencies: - postcss: "npm:^7.0.14" - checksum: 10c0/86ee6d4540511bef2298b2012dd3be7fc9109364566af88bed96926cd1696626428e41542fc8f05e40629465378c83b03052af74907cb173927f563addaad5e0 - languageName: node - linkType: hard - "postcss-load-config@npm:^2.1.0": version: 2.1.2 resolution: "postcss-load-config@npm:2.1.2" @@ -21916,13 +21771,6 @@ __metadata: languageName: node linkType: hard -"postcss-media-query-parser@npm:^0.2.3": - version: 0.2.3 - resolution: "postcss-media-query-parser@npm:0.2.3" - checksum: 10c0/252c8cf24f0e9018516b0d70b7b3d6f5b52e81c4bab2164b49a4e4c1b87bb11f5dbe708c0076990665cb24c70d5fd2f3aee9c922b0f67c7c619e051801484688 - languageName: node - linkType: hard - "postcss-merge-longhand@npm:^4.0.11": version: 4.0.11 resolution: "postcss-merge-longhand@npm:4.0.11" @@ -22230,31 +22078,12 @@ __metadata: languageName: node linkType: hard -"postcss-safe-parser@npm:^4.0.2": - version: 4.0.2 - resolution: "postcss-safe-parser@npm:4.0.2" - dependencies: - postcss: "npm:^7.0.26" - checksum: 10c0/166f0f53fdb23cb478bafc43a508f49456db750d859c26c975fbc54f27071746b2a5bc6a9022fa795e28ce5a61420d65cf5bec6af93f66fb66511fc0d63ab61a - languageName: node - linkType: hard - -"postcss-sass@npm:^0.4.4": - version: 0.4.4 - resolution: "postcss-sass@npm:0.4.4" - dependencies: - gonzales-pe: "npm:^4.3.0" - postcss: "npm:^7.0.21" - checksum: 10c0/b2286633758bc195fa2ad243263f08a7507437e8224d20812664ad02999ba04c961989068a71d4e55f7179e1a753c332b62750037717ec6c5fff1e3d3a263fe7 - languageName: node - linkType: hard - -"postcss-scss@npm:^2.1.1": - version: 2.1.1 - resolution: "postcss-scss@npm:2.1.1" - dependencies: - postcss: "npm:^7.0.6" - checksum: 10c0/35f92ab0afca2ad4a619b4079b8276f665df138d5c7158db900303882206c87a42fc66f0a83ed60e8c5885ab5276f71e9abb50af937a48534ce5877d178a9169 +"postcss-safe-parser@npm:^7.0.0": + version: 7.0.0 + resolution: "postcss-safe-parser@npm:7.0.0" + peerDependencies: + postcss: ^8.4.31 + checksum: 10c0/4217afd8ce2809e959dc365e4675f499303cc6b91f94db06c8164422822db2d3b3124df701ee2234db4127ad05619b016bfb9c2bccae9bf9cf898a396f1632c9 languageName: node linkType: hard @@ -22269,7 +22098,7 @@ __metadata: languageName: node linkType: hard -"postcss-selector-parser@npm:^6.0.0, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.5": +"postcss-selector-parser@npm:^6.0.0, postcss-selector-parser@npm:^6.0.2": version: 6.0.11 resolution: "postcss-selector-parser@npm:6.0.11" dependencies: @@ -22279,6 +22108,27 @@ __metadata: languageName: node linkType: hard +"postcss-selector-parser@npm:^6.0.15": + version: 6.0.15 + resolution: "postcss-selector-parser@npm:6.0.15" + dependencies: + cssesc: "npm:^3.0.0" + util-deprecate: "npm:^1.0.2" + checksum: 10c0/48b425d6cef497bcf6b7d136f6fd95cfca43026955e07ec9290d3c15457de3a862dbf251dd36f42c07a0d5b5ab6f31e41acefeff02528995a989b955505e440b + languageName: node + linkType: hard + +"postcss-styled-syntax@npm:0.6.4": + version: 0.6.4 + resolution: "postcss-styled-syntax@npm:0.6.4" + dependencies: + typescript: "npm:^5.3.3" + peerDependencies: + postcss: ^8.4.21 + checksum: 10c0/0f51e592d38a19bf667257b69850bab63888e56947cd0b89f19de78e2a1e46cdaf687a327824e2b0511274e24989bb00b8897b5cdee4987d3b392fe3fb2c42a6 + languageName: node + linkType: hard + "postcss-svgo@npm:^4.0.3": version: 4.0.3 resolution: "postcss-svgo@npm:4.0.3" @@ -22290,15 +22140,6 @@ __metadata: languageName: node linkType: hard -"postcss-syntax@npm:^0.36.2": - version: 0.36.2 - resolution: "postcss-syntax@npm:0.36.2" - peerDependencies: - postcss: ">=5.0.0" - checksum: 10c0/28efff15190403d7ef3dbaad7e6647e2e5bd8aea5bf70fec406a8f60dc858d86bb861947fe9cbfe448ac00aaa4028904264072405cf6c69f8336a6df00b93a97 - languageName: node - linkType: hard - "postcss-unique-selectors@npm:^4.0.1": version: 4.0.1 resolution: "postcss-unique-selectors@npm:4.0.1" @@ -22317,7 +22158,7 @@ __metadata: languageName: node linkType: hard -"postcss-value-parser@npm:^4.0.2, postcss-value-parser@npm:^4.1.0": +"postcss-value-parser@npm:^4.0.2, postcss-value-parser@npm:^4.1.0, postcss-value-parser@npm:^4.2.0": version: 4.2.0 resolution: "postcss-value-parser@npm:4.2.0" checksum: 10c0/f4142a4f56565f77c1831168e04e3effd9ffcc5aebaf0f538eee4b2d465adfd4b85a44257bb48418202a63806a7da7fe9f56c330aebb3cac898e46b4cbf49161 @@ -22346,7 +22187,7 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^7.0.0, postcss@npm:^7.0.1, postcss@npm:^7.0.14, postcss@npm:^7.0.2, postcss@npm:^7.0.21, postcss@npm:^7.0.26, postcss@npm:^7.0.27, postcss@npm:^7.0.32, postcss@npm:^7.0.35, postcss@npm:^7.0.5, postcss@npm:^7.0.6": +"postcss@npm:^7.0.0, postcss@npm:^7.0.1, postcss@npm:^7.0.14, postcss@npm:^7.0.27, postcss@npm:^7.0.32, postcss@npm:^7.0.5, postcss@npm:^7.0.6": version: 7.0.39 resolution: "postcss@npm:7.0.39" dependencies: @@ -22367,6 +22208,17 @@ __metadata: languageName: node linkType: hard +"postcss@npm:^8.4.33": + version: 8.4.35 + resolution: "postcss@npm:8.4.35" + dependencies: + nanoid: "npm:^3.3.7" + picocolors: "npm:^1.0.0" + source-map-js: "npm:^1.0.2" + checksum: 10c0/e8dd04e48001eb5857abc9475365bf08f4e508ddf9bc0b8525449a95d190f10d025acebc5b56ac2e94b3c7146790e4ae78989bb9633cb7ee20d1cc9b7dc909b2 + languageName: node + linkType: hard + "postgres-array@npm:~2.0.0": version: 2.0.0 resolution: "postgres-array@npm:2.0.0" @@ -23968,35 +23820,6 @@ __metadata: languageName: node linkType: hard -"remark-parse@npm:^9.0.0": - version: 9.0.0 - resolution: "remark-parse@npm:9.0.0" - dependencies: - mdast-util-from-markdown: "npm:^0.8.0" - checksum: 10c0/7523b2a2e3c7a80f7530b4d5615e8862890abe321cdc4f6f7b103c70ceb4b3eca14cc71127149f05d5e29ed521b0c7505af9f11b1293921cf7cdf6d794104a21 - languageName: node - linkType: hard - -"remark-stringify@npm:^9.0.0": - version: 9.0.1 - resolution: "remark-stringify@npm:9.0.1" - dependencies: - mdast-util-to-markdown: "npm:^0.6.0" - checksum: 10c0/3d3b3736f993f94b66f7af60f9d20481e1bd6d262a7c141809d3bb1b3a5eaea3a5f51b56672aad57f0c7d43654448f95254ed4e9fab53964cafe0dce6dfa87ae - languageName: node - linkType: hard - -"remark@npm:^13.0.0": - version: 13.0.0 - resolution: "remark@npm:13.0.0" - dependencies: - remark-parse: "npm:^9.0.0" - remark-stringify: "npm:^9.0.0" - unified: "npm:^9.1.0" - checksum: 10c0/5b49c79d24e6bc2b02f62feff38fc772ebb0ede49465bc4e038856ffc002fcf54a628eb7b71814f837131344c2f35397bad6767140a18450085990a16fb1397c - languageName: node - linkType: hard - "remove-accents@npm:0.4.2": version: 0.4.2 resolution: "remove-accents@npm:0.4.2" @@ -24031,7 +23854,7 @@ __metadata: languageName: node linkType: hard -"repeat-string@npm:^1.0.0, repeat-string@npm:^1.6.1": +"repeat-string@npm:^1.6.1": version: 1.6.1 resolution: "repeat-string@npm:1.6.1" checksum: 10c0/87fa21bfdb2fbdedc44b9a5b118b7c1239bdd2c2c1e42742ef9119b7d412a5137a1d23f1a83dc6bb686f4f27429ac6f542e3d923090b44181bafa41e8ac0174d @@ -24459,6 +24282,17 @@ __metadata: languageName: node linkType: hard +"rimraf@npm:^5.0.5": + version: 5.0.5 + resolution: "rimraf@npm:5.0.5" + dependencies: + glob: "npm:^10.3.7" + bin: + rimraf: dist/esm/bin.mjs + checksum: 10c0/d50dbe724f33835decd88395b25ed35995077c60a50ae78ded06e0185418914e555817aad1b4243edbff2254548c2f6ad6f70cc850040bebb4da9e8cc016f586 + languageName: node + linkType: hard + "ripemd160@npm:^2.0.0, ripemd160@npm:^2.0.1": version: 2.0.2 resolution: "ripemd160@npm:2.0.2" @@ -25518,7 +25352,7 @@ __metadata: languageName: node linkType: hard -"source-map-js@npm:^1.0.2": +"source-map-js@npm:^1.0.1, source-map-js@npm:^1.0.2": version: 1.0.2 resolution: "source-map-js@npm:1.0.2" checksum: 10c0/32f2dfd1e9b7168f9a9715eb1b4e21905850f3b50cf02cf476e47e4eebe8e6b762b63a64357896aa29b37e24922b4282df0f492e0d2ace572b43d15525976ff8 @@ -25675,15 +25509,6 @@ __metadata: languageName: node linkType: hard -"specificity@npm:^0.4.1": - version: 0.4.1 - resolution: "specificity@npm:0.4.1" - bin: - specificity: ./bin/specificity - checksum: 10c0/5da85a05052b55e344cb0f5bce5d07cbabbbe8945da176a481589db5a13e9fbcfa879ceb075cf564b94e680fae0a2ab14ea55cc87496b86a6d5122545946d7c2 - languageName: node - linkType: hard - "split-string@npm:^3.0.1, split-string@npm:^3.0.2": version: 3.1.0 resolution: "split-string@npm:3.1.0" @@ -25951,6 +25776,7 @@ __metadata: lint-staged: "npm:13.0.3" lodash: "npm:4.17.21" npm-run-all: "npm:^4.1.5" + postcss-styled-syntax: "npm:0.6.4" prettier: "npm:~3.2.5" qs: "npm:6.11.0" react-test-renderer: "npm:^17.0.2" @@ -25958,10 +25784,8 @@ __metadata: request-promise-native: "npm:^1.0.9" rimraf: "npm:3.0.2" snyk: "npm:^1.566.0" - stylelint: "npm:13.13.1" - stylelint-config-recommended: "npm:3.0.0" - stylelint-config-styled-components: "npm:0.1.1" - stylelint-processor-styled-components: "npm:1.10.0" + stylelint: "npm:16.2.1" + stylelint-config-standard: "npm:36.0.0" supertest: "npm:5.0.0" wait-on: "npm:^3.2.0" yargs: "npm:17.6.2" @@ -26055,7 +25879,7 @@ __metadata: languageName: node linkType: hard -"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.0.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.2, string-width@npm:^4.2.3": +"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.0.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3": version: 4.2.3 resolution: "string-width@npm:4.2.3" dependencies: @@ -26261,6 +26085,15 @@ __metadata: languageName: node linkType: hard +"strip-ansi@npm:^7.1.0": + version: 7.1.0 + resolution: "strip-ansi@npm:7.1.0" + dependencies: + ansi-regex: "npm:^6.0.1" + checksum: 10c0/a198c3762e8832505328cbf9e8c8381de14a4fa50a4f9b2160138158ea88c0f5549fb50cb13c651c3088f47e63a108b34622ec18c0499b6c8c3a5ddf6b305ac4 + languageName: node + linkType: hard + "strip-bom@npm:^3.0.0": version: 3.0.0 resolution: "strip-bom@npm:3.0.0" @@ -26356,13 +26189,6 @@ __metadata: languageName: node linkType: hard -"style-search@npm:^0.1.0": - version: 0.1.0 - resolution: "style-search@npm:0.1.0" - checksum: 10c0/9e5cb735e5dc4fc2f8c61bebdf211d5352f1cf01511a64da12bb726a01e8c6948c50d357eb8fd7893d44b4e3189655bdddcf8ab338f9d508fe89a8942c650b14 - languageName: node - linkType: hard - "styled-components@npm:^5.2.3": version: 5.3.6 resolution: "styled-components@npm:5.3.6" @@ -26396,89 +26222,71 @@ __metadata: languageName: node linkType: hard -"stylelint-config-recommended@npm:3.0.0": - version: 3.0.0 - resolution: "stylelint-config-recommended@npm:3.0.0" +"stylelint-config-recommended@npm:^14.0.0": + version: 14.0.0 + resolution: "stylelint-config-recommended@npm:14.0.0" peerDependencies: - stylelint: ">=10.1.0" - checksum: 10c0/311da3b8aa174e7864e4965508b8a8044c6a87c7f1a59a2d214faf29e56d3d116a13c538647d7463a9c64729841e165ad2dd92db2bc484786d9c4d9a7663f050 + stylelint: ^16.0.0 + checksum: 10c0/4ad15c36e8c03291aa7bbe4b672ebfb0f46ab698e7580a0da8d29644046d102d7f31dbf00a2a6eab94b565c390c6fb0d5d528737b83ac3acf6dc2ef085a90b11 languageName: node linkType: hard -"stylelint-config-styled-components@npm:0.1.1": - version: 0.1.1 - resolution: "stylelint-config-styled-components@npm:0.1.1" - checksum: 10c0/0406e22c917bab691debdc50cd2f6f2d34b651b907365845639ea4b14532530bd3499abd90dded454fb8da2cb04ac231936a3fa89701d3444af09568e0aa4819 - languageName: node - linkType: hard - -"stylelint-processor-styled-components@npm:1.10.0": - version: 1.10.0 - resolution: "stylelint-processor-styled-components@npm:1.10.0" +"stylelint-config-standard@npm:36.0.0": + version: 36.0.0 + resolution: "stylelint-config-standard@npm:36.0.0" dependencies: - "@babel/parser": "npm:^7.8.3" - "@babel/traverse": "npm:^7.8.3" - micromatch: "npm:^4.0.2" - postcss: "npm:^7.0.26" - checksum: 10c0/a331f9de5d7c4a041084a82e49fe578d249189c8c82edb2df43712a330245c263a50dc05384a35ddb7c9c4b62ae100695ce974fad8981f1ad37d637a8c5eb568 + stylelint-config-recommended: "npm:^14.0.0" + peerDependencies: + stylelint: ^16.1.0 + checksum: 10c0/1fc9adddfc5cf0a1d7a443182a0731712a3950ace72a24081b4ede2b0bb6fc1eebd003c009f1d8d06c3a64ba9b31b0ed12512db2f91c8fa549238d8341580e4b languageName: node linkType: hard -"stylelint@npm:13.13.1": - version: 13.13.1 - resolution: "stylelint@npm:13.13.1" +"stylelint@npm:16.2.1": + version: 16.2.1 + resolution: "stylelint@npm:16.2.1" dependencies: - "@stylelint/postcss-css-in-js": "npm:^0.37.2" - "@stylelint/postcss-markdown": "npm:^0.36.2" - autoprefixer: "npm:^9.8.6" + "@csstools/css-parser-algorithms": "npm:^2.5.0" + "@csstools/css-tokenizer": "npm:^2.2.3" + "@csstools/media-query-list-parser": "npm:^2.1.7" + "@csstools/selector-specificity": "npm:^3.0.1" balanced-match: "npm:^2.0.0" - chalk: "npm:^4.1.1" - cosmiconfig: "npm:^7.0.0" - debug: "npm:^4.3.1" - execall: "npm:^2.0.0" - fast-glob: "npm:^3.2.5" - fastest-levenshtein: "npm:^1.0.12" - file-entry-cache: "npm:^6.0.1" - get-stdin: "npm:^8.0.0" + colord: "npm:^2.9.3" + cosmiconfig: "npm:^9.0.0" + css-functions-list: "npm:^3.2.1" + css-tree: "npm:^2.3.1" + debug: "npm:^4.3.4" + fast-glob: "npm:^3.3.2" + fastest-levenshtein: "npm:^1.0.16" + file-entry-cache: "npm:^8.0.0" global-modules: "npm:^2.0.0" - globby: "npm:^11.0.3" + globby: "npm:^11.1.0" globjoin: "npm:^0.1.4" - html-tags: "npm:^3.1.0" - ignore: "npm:^5.1.8" - import-lazy: "npm:^4.0.0" + html-tags: "npm:^3.3.1" + ignore: "npm:^5.3.0" imurmurhash: "npm:^0.1.4" - known-css-properties: "npm:^0.21.0" - lodash: "npm:^4.17.21" - log-symbols: "npm:^4.1.0" + is-plain-object: "npm:^5.0.0" + known-css-properties: "npm:^0.29.0" mathml-tag-names: "npm:^2.1.3" - meow: "npm:^9.0.0" - micromatch: "npm:^4.0.4" - normalize-selector: "npm:^0.2.0" - postcss: "npm:^7.0.35" - postcss-html: "npm:^0.36.0" - postcss-less: "npm:^3.1.4" - postcss-media-query-parser: "npm:^0.2.3" + meow: "npm:^13.1.0" + micromatch: "npm:^4.0.5" + normalize-path: "npm:^3.0.0" + picocolors: "npm:^1.0.0" + postcss: "npm:^8.4.33" postcss-resolve-nested-selector: "npm:^0.1.1" - postcss-safe-parser: "npm:^4.0.2" - postcss-sass: "npm:^0.4.4" - postcss-scss: "npm:^2.1.1" - postcss-selector-parser: "npm:^6.0.5" - postcss-syntax: "npm:^0.36.2" - postcss-value-parser: "npm:^4.1.0" + postcss-safe-parser: "npm:^7.0.0" + postcss-selector-parser: "npm:^6.0.15" + postcss-value-parser: "npm:^4.2.0" resolve-from: "npm:^5.0.0" - slash: "npm:^3.0.0" - specificity: "npm:^0.4.1" - string-width: "npm:^4.2.2" - strip-ansi: "npm:^6.0.0" - style-search: "npm:^0.1.0" - sugarss: "npm:^2.0.0" + string-width: "npm:^4.2.3" + strip-ansi: "npm:^7.1.0" + supports-hyperlinks: "npm:^3.0.0" svg-tags: "npm:^1.0.0" - table: "npm:^6.6.0" - v8-compile-cache: "npm:^2.3.0" - write-file-atomic: "npm:^3.0.3" + table: "npm:^6.8.1" + write-file-atomic: "npm:^5.0.1" bin: - stylelint: bin/stylelint.js - checksum: 10c0/63ac72d99c95671f6ecf16f82290088393829a5964179dffb53d9723394cf39df0eede8829534658b6f091dfa020084859df7dfbbf321581671d835b6f619178 + stylelint: bin/stylelint.mjs + checksum: 10c0/eeaba06885e542c832e5cffc07b2d0dabdc5a72e6ad4d6cb3d01dcc260c29a712b0b935cbd40e059abd68a100e0563fbc617fc4c9bef3b14ecaf6eea651d9d9d languageName: node linkType: hard @@ -26504,15 +26312,6 @@ __metadata: languageName: node linkType: hard -"sugarss@npm:^2.0.0": - version: 2.0.0 - resolution: "sugarss@npm:2.0.0" - dependencies: - postcss: "npm:^7.0.2" - checksum: 10c0/d2a05b0f25ff2e8c518d4eabf29227558d7adf795748c5b0311b8b6036dcb492027235a1a2ec81c7bc906a20f58598945f1c0c3e7fbde1ecb31b4505a941976d - languageName: node - linkType: hard - "superagent@npm:6.1.0": version: 6.1.0 resolution: "superagent@npm:6.1.0" @@ -26576,7 +26375,7 @@ __metadata: languageName: node linkType: hard -"supports-color@npm:^7.1.0": +"supports-color@npm:^7.0.0, supports-color@npm:^7.1.0": version: 7.2.0 resolution: "supports-color@npm:7.2.0" dependencies: @@ -26594,6 +26393,16 @@ __metadata: languageName: node linkType: hard +"supports-hyperlinks@npm:^3.0.0": + version: 3.0.0 + resolution: "supports-hyperlinks@npm:3.0.0" + dependencies: + has-flag: "npm:^4.0.0" + supports-color: "npm:^7.0.0" + checksum: 10c0/36aaa55e67645dded8e0f846fd81d7dd05ce82ea81e62347f58d86213577eb627b2b45298656ce7a70e7155e39f071d0d3f83be91e112aed801ebaa8db1ef1d0 + languageName: node + linkType: hard + "supports-preserve-symlinks-flag@npm:^1.0.0": version: 1.0.0 resolution: "supports-preserve-symlinks-flag@npm:1.0.0" @@ -26661,7 +26470,7 @@ __metadata: languageName: node linkType: hard -"table@npm:^6.6.0": +"table@npm:^6.8.1": version: 6.8.1 resolution: "table@npm:6.8.1" dependencies: @@ -27102,13 +26911,6 @@ __metadata: languageName: node linkType: hard -"trough@npm:^1.0.0": - version: 1.0.5 - resolution: "trough@npm:1.0.5" - checksum: 10c0/f036d0d7f9bc7cfe5ee650d70b57bb1f048f3292adf6c81bb9b228e546b2b2e5b74ea04a060d21472108a8cda05ec4814bbe86f87ee35c182c50cb41b5c1810a - languageName: node - linkType: hard - "ts-invariant@npm:^0.4.0": version: 0.4.4 resolution: "ts-invariant@npm:0.4.4" @@ -27375,7 +27177,7 @@ __metadata: languageName: node linkType: hard -"typescript@npm:>=3 < 6": +"typescript@npm:>=3 < 6, typescript@npm:^5.3.3": version: 5.3.3 resolution: "typescript@npm:5.3.3" bin: @@ -27385,7 +27187,7 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@npm%3A>=3 < 6#optional!builtin": +"typescript@patch:typescript@npm%3A>=3 < 6#optional!builtin, typescript@patch:typescript@npm%3A^5.3.3#optional!builtin": version: 5.3.3 resolution: "typescript@patch:typescript@npm%3A5.3.3#optional!builtin::version=5.3.3&hash=e012d7" bin: @@ -27473,20 +27275,6 @@ __metadata: languageName: node linkType: hard -"unified@npm:^9.1.0": - version: 9.2.2 - resolution: "unified@npm:9.2.2" - dependencies: - bail: "npm:^1.0.0" - extend: "npm:^3.0.0" - is-buffer: "npm:^2.0.0" - is-plain-obj: "npm:^2.0.0" - trough: "npm:^1.0.0" - vfile: "npm:^4.0.0" - checksum: 10c0/a66d71b039c24626802a4664a1f3210f29ab1f75b89fd41933e6ab00561e1ec43a5bec6de32c7ebc86544e5f00ef5836e8fe79a823e81e35825de4e35823eda9 - languageName: node - linkType: hard - "union-value@npm:^1.0.0": version: 1.0.1 resolution: "union-value@npm:1.0.1" @@ -27558,31 +27346,6 @@ __metadata: languageName: node linkType: hard -"unist-util-find-all-after@npm:^3.0.2": - version: 3.0.2 - resolution: "unist-util-find-all-after@npm:3.0.2" - dependencies: - unist-util-is: "npm:^4.0.0" - checksum: 10c0/aea35c52015e444317bfb2af5c40151ee27e3b7be6b8bd40858d7480ba911309e873ef9011a32b06ee6bd189c20cfbe42e9346aa5a081813d4f68d34b7eacef9 - languageName: node - linkType: hard - -"unist-util-is@npm:^4.0.0": - version: 4.1.0 - resolution: "unist-util-is@npm:4.1.0" - checksum: 10c0/21ca3d7bacc88853b880b19cb1b133a056c501617d7f9b8cce969cd8b430ed7e1bc416a3a11b02540d5de6fb86807e169d00596108a459d034cf5faec97c055e - languageName: node - linkType: hard - -"unist-util-stringify-position@npm:^2.0.0": - version: 2.0.3 - resolution: "unist-util-stringify-position@npm:2.0.3" - dependencies: - "@types/unist": "npm:^2.0.2" - checksum: 10c0/46fa03f840df173b7f032cbfffdb502fb05b79b3fb5451681c796cf4985d9087a537833f5afb75d55e79b46bbbe4b3d81dd75a1062f9289091c526aebe201d5d - languageName: node - linkType: hard - "universal-user-agent@npm:^6.0.0": version: 6.0.0 resolution: "universal-user-agent@npm:6.0.0" @@ -27846,7 +27609,7 @@ __metadata: languageName: node linkType: hard -"v8-compile-cache@npm:^2.1.1, v8-compile-cache@npm:^2.3.0": +"v8-compile-cache@npm:^2.1.1": version: 2.3.0 resolution: "v8-compile-cache@npm:2.3.0" checksum: 10c0/b2d866febf943fbbf0b5e8d43ae9a9b0dacd11dd76e6a9c8e8032268f0136f081e894a2723774ae2d86befa994be4d4046b0717d82df4f3a10e067994ad5c688 @@ -27935,28 +27698,6 @@ __metadata: languageName: node linkType: hard -"vfile-message@npm:^2.0.0": - version: 2.0.4 - resolution: "vfile-message@npm:2.0.4" - dependencies: - "@types/unist": "npm:^2.0.0" - unist-util-stringify-position: "npm:^2.0.0" - checksum: 10c0/ce50d90e0e5dc8f995f39602dd2404f1756388a54209c983d259b17c15e6f262a53546977a638065bc487d0657799fa96f4c1ba6b2915d9724a4968e9c7ff1c8 - languageName: node - linkType: hard - -"vfile@npm:^4.0.0": - version: 4.2.1 - resolution: "vfile@npm:4.2.1" - dependencies: - "@types/unist": "npm:^2.0.0" - is-buffer: "npm:^2.0.0" - unist-util-stringify-position: "npm:^2.0.0" - vfile-message: "npm:^2.0.0" - checksum: 10c0/4816aecfedc794ba4d3131abff2032ef0e825632cfa8cd20dd9d83819ef260589924f4f3e8fa30e06da2d8e60d7ec8ef7d0af93e0483df62890738258daf098a - languageName: node - linkType: hard - "video-react@npm:^0.16.0": version: 0.16.0 resolution: "video-react@npm:0.16.0" @@ -28535,7 +28276,7 @@ __metadata: languageName: node linkType: hard -"write-file-atomic@npm:5.0.1": +"write-file-atomic@npm:5.0.1, write-file-atomic@npm:^5.0.1": version: 5.0.1 resolution: "write-file-atomic@npm:5.0.1" dependencies: @@ -28556,7 +28297,7 @@ __metadata: languageName: node linkType: hard -"write-file-atomic@npm:^3.0.0, write-file-atomic@npm:^3.0.3": +"write-file-atomic@npm:^3.0.0": version: 3.0.3 resolution: "write-file-atomic@npm:3.0.3" dependencies: @@ -28887,10 +28628,3 @@ __metadata: checksum: 10c0/71cc2f2bbb537300c3f569e25693d37b3bc91f225cefce251a71c30bc6bb3e7f8e9420ca0eb57f2ac9e492b085b8dfa075fd1e8195c40b83c951dd59c6e4fbf8 languageName: node linkType: hard - -"zwitch@npm:^1.0.0": - version: 1.0.5 - resolution: "zwitch@npm:1.0.5" - checksum: 10c0/26dc7d32e5596824b565db1da9650d00d32659c1211195bef50c25c60820f9c942aa7abefe678fc1ed0b97c1755036ac1bde5f97881d7d0e73e04e02aca56957 - languageName: node - linkType: hard