Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into security/adminRateLimit
- Loading branch information
Showing
203 changed files
with
5,811 additions
and
4,826 deletions.
There are no files selected for viewing
11 changes: 0 additions & 11 deletions
11
packages/core/admin/admin/src/components/GlobalStyle/index.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 0 additions & 8 deletions
8
packages/core/admin/admin/src/content-manager/components/BackHeader/index.js
This file was deleted.
Oops, something went wrong.
28 changes: 0 additions & 28 deletions
28
packages/core/admin/admin/src/content-manager/components/Block/components.js
This file was deleted.
Oops, something went wrong.
43 changes: 0 additions & 43 deletions
43
packages/core/admin/admin/src/content-manager/components/Block/index.js
This file was deleted.
Oops, something went wrong.
49 changes: 49 additions & 0 deletions
49
packages/core/admin/admin/src/content-manager/components/ComponentIcon/ComponentIcon.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
import PropTypes from 'prop-types'; | ||
import React from 'react'; | ||
import styled from 'styled-components'; | ||
|
||
import { Flex } from '@strapi/design-system'; | ||
|
||
const WIDTH_S = 5; | ||
const WIDTH_M = 8; | ||
|
||
const Wrapper = styled(Flex)` | ||
border-radius: ${({ showBackground }) => (showBackground ? `50%` : 0)}; | ||
color: ${({ theme }) => theme.colors.neutral600}; | ||
height: ${({ theme, size }) => theme.spaces[size === 'S' ? WIDTH_S : WIDTH_M]}; | ||
width: ${({ theme, size }) => theme.spaces[size === 'S' ? WIDTH_S : WIDTH_M]}; | ||
svg { | ||
height: ${({ theme, size }) => theme.spaces[size === 'S' ? WIDTH_S - 2 : WIDTH_M - 3]}; | ||
width: ${({ theme, size }) => theme.spaces[size === 'S' ? WIDTH_S - 2 : WIDTH_M - 3]}; | ||
} | ||
`; | ||
|
||
export function ComponentIcon({ showBackground = true, size = 'M' }) { | ||
return ( | ||
<Wrapper | ||
alignItems="center" | ||
background={showBackground ? 'neutral200' : null} | ||
justifyContent="center" | ||
size={size} | ||
showBackground={showBackground} | ||
> | ||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"> | ||
<path | ||
d="M216.3 2c4.8-2.6 10.5-2.6 15.3 0L422.3 106c5.1 2.8 8.3 8.2 8.3 14s-3.2 11.2-8.3 14L231.7 238c-4.8 2.6-10.5 2.6-15.3 0L25.7 134c-5.1-2.8-8.3-8.2-8.3-14s3.2-11.2 8.3-14L216.3 2zM23.7 170l176 96c5.1 2.8 8.3 8.2 8.3 14V496c0 5.6-3 10.9-7.8 13.8s-10.9 3-15.8 .3L8.3 414C3.2 411.2 0 405.9 0 400V184c0-5.6 3-10.9 7.8-13.8s10.9-3 15.8-.3zm400.7 0c5-2.7 11-2.6 15.8 .3s7.8 8.1 7.8 13.8V400c0 5.9-3.2 11.2-8.3 14l-176 96c-5 2.7-11 2.6-15.8-.3s-7.8-8.1-7.8-13.8V280c0-5.9 3.2-11.2 8.3-14l176-96z" | ||
fill="currentColor" | ||
/> | ||
</svg> | ||
</Wrapper> | ||
); | ||
} | ||
|
||
ComponentIcon.defaultProps = { | ||
showBackground: true, | ||
size: 'M', | ||
}; | ||
|
||
ComponentIcon.propTypes = { | ||
showBackground: PropTypes.bool, | ||
size: PropTypes.string, | ||
}; |
1 change: 1 addition & 0 deletions
1
packages/core/admin/admin/src/content-manager/components/ComponentIcon/index.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
export * from './ComponentIcon'; |
7 changes: 0 additions & 7 deletions
7
packages/core/admin/admin/src/content-manager/components/Container/index.js
This file was deleted.
Oops, something went wrong.
77 changes: 0 additions & 77 deletions
77
packages/core/admin/admin/src/content-manager/components/CustomInputCheckbox/components.js
This file was deleted.
Oops, something went wrong.
53 changes: 0 additions & 53 deletions
53
packages/core/admin/admin/src/content-manager/components/CustomInputCheckbox/index.js
This file was deleted.
Oops, something went wrong.
63 changes: 0 additions & 63 deletions
63
packages/core/admin/admin/src/content-manager/components/DynamicComponentCard/Wrapper.js
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.