diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/AddComponentButton/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/AddComponentButton/index.js index ddde5f57fa..dc488762ae 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/AddComponentButton/index.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/AddComponentButton/index.js @@ -29,8 +29,12 @@ const StyledAddIcon = styled(PlusCircle)` const StyledButton = styled(BaseButton)` border-radius: 26px; + border-color: ${({ theme }) => theme.colors.neutral150}; background: ${({ theme }) => theme.colors.neutral0}; - padding: ${({ theme }) => theme.spaces[3]}; + padding-top: ${({ theme }) => theme.spaces[3]}; + padding-right: ${({ theme }) => theme.spaces[4]}; + padding-bottom: ${({ theme }) => theme.spaces[3]}; + padding-left: ${({ theme }) => theme.spaces[4]}; box-shadow: ${({ theme }) => theme.shadows.filterShadow}; diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/AddComponentButton/tests/__snapshots__/index.test.js.snap b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/AddComponentButton/tests/__snapshots__/index.test.js.snap index 1610d18ee9..b57fd43083 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/AddComponentButton/tests/__snapshots__/index.test.js.snap +++ b/packages/core/admin/admin/src/content-manager/components/DynamicZone/components/AddComponentButton/tests/__snapshots__/index.test.js.snap @@ -135,8 +135,12 @@ exports[` displays the name of the dz when the label is em .c2 { border-radius: 26px; + border-color: #eaeaef; background: #ffffff; - padding: 12px; + padding-top: 12px; + padding-right: 16px; + padding-bottom: 12px; + padding-left: 16px; box-shadow: 0px 1px 4px rgba(33,33,52,0.1); } @@ -390,8 +394,12 @@ exports[` renders and matches the snapshot 1`] = ` .c2 { border-radius: 26px; + border-color: #eaeaef; background: #ffffff; - padding: 12px; + padding-top: 12px; + padding-right: 16px; + padding-bottom: 12px; + padding-left: 16px; box-shadow: 0px 1px 4px rgba(33,33,52,0.1); } @@ -645,8 +653,12 @@ exports[` renders and matches the snapshot when the isOpen .c2 { border-radius: 26px; + border-color: #eaeaef; background: #ffffff; - padding: 12px; + padding-top: 12px; + padding-right: 16px; + padding-bottom: 12px; + padding-left: 16px; box-shadow: 0px 1px 4px rgba(33,33,52,0.1); } diff --git a/packages/core/admin/admin/src/content-manager/pages/EditView/index.js b/packages/core/admin/admin/src/content-manager/pages/EditView/index.js index b0dd6c54ef..9a8187326c 100644 --- a/packages/core/admin/admin/src/content-manager/pages/EditView/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/EditView/index.js @@ -244,6 +244,7 @@ const EditView = ({ paddingLeft={4} paddingRight={4} paddingTop={6} + shadow="tableShadow" > @@ -259,6 +260,7 @@ const EditView = ({ paddingLeft={4} paddingRight={4} paddingTop={6} + shadow="tableShadow" > {formatMessage( diff --git a/packages/core/admin/admin/src/content-manager/pages/ListView/index.js b/packages/core/admin/admin/src/content-manager/pages/ListView/index.js index a405e2c423..7e6c974e39 100644 --- a/packages/core/admin/admin/src/content-manager/pages/ListView/index.js +++ b/packages/core/admin/admin/src/content-manager/pages/ListView/index.js @@ -292,6 +292,10 @@ function ListView({ { id: 'app.component.search.label', defaultMessage: 'Search for {target}' }, { target: headerLayoutTitle } )} + placeholder={formatMessage({ + id: 'app.component.search.placeholder', + defaultMessage: 'Search...', + })} trackedEvent="didSearch" /> )} diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/tests/index.test.js index a0d4581bd3..eccef03597 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/tests/index.test.js @@ -64,7 +64,7 @@ describe('ADMIN | Pages | USERS | ListPage', () => { const { container } = render(app); expect(container.firstChild).toMatchInlineSnapshot(` - .c33 { + .c35 { margin: 0; height: 18px; min-width: 18px; @@ -75,12 +75,12 @@ describe('ADMIN | Pages | USERS | ListPage', () => { cursor: pointer; } - .c33:checked { + .c35:checked { background-color: #4945ff; border: 1px solid #4945ff; } - .c33:checked:after { + .c35:checked:after { content: ''; display: block; position: relative; @@ -94,21 +94,21 @@ describe('ADMIN | Pages | USERS | ListPage', () => { transform: translateX(-50%) translateY(-50%); } - .c33:checked:disabled:after { + .c35:checked:disabled:after { background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTAiIGhlaWdodD0iOCIgdmlld0JveD0iMCAwIDEwIDgiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CiAgPHBhdGgKICAgIGQ9Ik04LjU1MzIzIDAuMzk2OTczQzguNjMxMzUgMC4zMTYzNTUgOC43NjA1MSAwLjMxNTgxMSA4LjgzOTMxIDAuMzk1NzY4TDkuODYyNTYgMS40MzQwN0M5LjkzODkzIDEuNTExNTcgOS45MzkzNSAxLjYzNTkgOS44NjM0OSAxLjcxMzlMNC4wNjQwMSA3LjY3NzI0QzMuOTg1OSA3Ljc1NzU1IDMuODU3MDcgNy43NTgwNSAzLjc3ODM0IDcuNjc4MzRMMC4xMzg2NiAzLjk5MzMzQzAuMDYxNzc5OCAzLjkxNTQ5IDAuMDYxNzEwMiAzLjc5MDMyIDAuMTM4NTA0IDMuNzEyNEwxLjE2MjEzIDIuNjczNzJDMS4yNDAzOCAyLjU5NDMyIDEuMzY4NDMgMi41OTQyMiAxLjQ0NjggMi42NzM0OEwzLjkyMTc0IDUuMTc2NDdMOC41NTMyMyAwLjM5Njk3M1oiCiAgICBmaWxsPSIjOEU4RUE5IgogIC8+Cjwvc3ZnPg==) no-repeat no-repeat center center; } - .c33:disabled { + .c35:disabled { background-color: #dcdce4; border: 1px solid #c0c0cf; } - .c33:indeterminate { + .c35:indeterminate { background-color: #4945ff; border: 1px solid #4945ff; } - .c33:indeterminate:after { + .c35:indeterminate:after { content: ''; display: block; position: relative; @@ -123,30 +123,30 @@ describe('ADMIN | Pages | USERS | ListPage', () => { transform: translateX(-50%) translateY(-50%); } - .c33:indeterminate:disabled { + .c35:indeterminate:disabled { background-color: #dcdce4; border: 1px solid #c0c0cf; } - .c33:indeterminate:disabled:after { + .c35:indeterminate:disabled:after { background-color: #8e8ea9; } - .c20 { + .c22 { padding-top: 4px; padding-bottom: 4px; } - .c41 { + .c43 { background: #ffffff; padding: 64px; } - .c44 { + .c46 { padding-top: 16px; } - .c58 { + .c60 { padding-left: 8px; } @@ -157,7 +157,7 @@ describe('ADMIN | Pages | USERS | ListPage', () => { line-height: 1.43; } - .c22 { + .c24 { font-weight: 600; color: #32324d; font-size: 0.75rem; @@ -295,7 +295,7 @@ describe('ADMIN | Pages | USERS | ListPage', () => { background: #4945ff; } - .c21 { + .c23 { -webkit-align-items: center; -webkit-box-align: center; -ms-flex-align: center; @@ -307,7 +307,7 @@ describe('ADMIN | Pages | USERS | ListPage', () => { background: #ffffff; } - .c21 .c7 { + .c23 .c7 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -318,56 +318,56 @@ describe('ADMIN | Pages | USERS | ListPage', () => { align-items: center; } - .c21 .c10 { + .c23 .c10 { color: #ffffff; } - .c21[aria-disabled='true'] { + .c23[aria-disabled='true'] { border: 1px solid #dcdce4; background: #eaeaef; } - .c21[aria-disabled='true'] .c10 { + .c23[aria-disabled='true'] .c10 { color: #666687; } - .c21[aria-disabled='true'] svg > g, - .c21[aria-disabled='true'] svg path { + .c23[aria-disabled='true'] svg > g, + .c23[aria-disabled='true'] svg path { fill: #666687; } - .c21[aria-disabled='true']:active { + .c23[aria-disabled='true']:active { border: 1px solid #dcdce4; background: #eaeaef; } - .c21[aria-disabled='true']:active .c10 { + .c23[aria-disabled='true']:active .c10 { color: #666687; } - .c21[aria-disabled='true']:active svg > g, - .c21[aria-disabled='true']:active svg path { + .c23[aria-disabled='true']:active svg > g, + .c23[aria-disabled='true']:active svg path { fill: #666687; } - .c21:hover { + .c23:hover { background-color: #f6f6f9; } - .c21:active { + .c23:active { background-color: #eaeaef; } - .c21 .c10 { + .c23 .c10 { color: #32324d; } - .c21 svg > g, - .c21 svg path { + .c23 svg > g, + .c23 svg path { fill: #32324d; } - .c40 { + .c42 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -385,7 +385,7 @@ describe('ADMIN | Pages | USERS | ListPage', () => { align-items: center; } - .c45 { + .c47 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -403,7 +403,7 @@ describe('ADMIN | Pages | USERS | ListPage', () => { align-items: flex-end; } - .c46 { + .c48 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -417,6 +417,14 @@ describe('ADMIN | Pages | USERS | ListPage', () => { align-items: center; } + .c20 { + color: #32324d; + } + + .c21 path { + fill: #32324d; + } + .c18 { display: -webkit-box; display: -webkit-flex; @@ -515,7 +523,7 @@ describe('ADMIN | Pages | USERS | ListPage', () => { fill: #666687; } - .c36 { + .c38 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -533,30 +541,30 @@ describe('ADMIN | Pages | USERS | ListPage', () => { border: none; } - .c36 svg > g, - .c36 svg path { + .c38 svg > g, + .c38 svg path { fill: #8e8ea9; } - .c36:hover svg > g, - .c36:hover svg path { + .c38:hover svg > g, + .c38:hover svg path { fill: #666687; } - .c36:active svg > g, - .c36:active svg path { + .c38:active svg > g, + .c38:active svg path { fill: #a5a5ba; } - .c36[aria-disabled='true'] { + .c38[aria-disabled='true'] { background-color: #eaeaef; } - .c36[aria-disabled='true'] svg path { + .c38[aria-disabled='true'] svg path { fill: #666687; } - .c42 { + .c44 { border: 0; -webkit-clip: rect(0 0 0 0); clip: rect(0 0 0 0); @@ -568,12 +576,12 @@ describe('ADMIN | Pages | USERS | ListPage', () => { width: 1px; } - .c43 { + .c45 { -webkit-animation: gzYjWD 1s infinite linear; animation: gzYjWD 1s infinite linear; } - .c60 { + .c62 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -587,11 +595,11 @@ describe('ADMIN | Pages | USERS | ListPage', () => { align-items: center; } - .c61 > * + * { + .c63 > * + * { margin-left: 4px; } - .c64 { + .c66 { border: 0; -webkit-clip: rect(0 0 0 0); clip: rect(0 0 0 0); @@ -603,7 +611,7 @@ describe('ADMIN | Pages | USERS | ListPage', () => { width: 1px; } - .c62 { + .c64 { padding: 12px; border-radius: 4px; -webkit-text-decoration: none; @@ -616,7 +624,7 @@ describe('ADMIN | Pages | USERS | ListPage', () => { outline: none; } - .c62:after { + .c64:after { -webkit-transition-property: all; transition-property: all; -webkit-transition-duration: 0.2s; @@ -631,11 +639,11 @@ describe('ADMIN | Pages | USERS | ListPage', () => { border: 2px solid transparent; } - .c62:focus-visible { + .c64:focus-visible { outline: none; } - .c62:focus-visible:after { + .c64:focus-visible:after { border-radius: 8px; content: ''; position: absolute; @@ -646,34 +654,34 @@ describe('ADMIN | Pages | USERS | ListPage', () => { border: 2px solid #4945ff; } - .c63 { + .c65 { font-size: 0.7rem; pointer-events: none; } - .c63 svg path { - fill: #c0c0cf; - } - - .c63:focus svg path, - .c63:hover svg path { - fill: #c0c0cf; - } - - .c65 { - font-size: 0.7rem; - } - .c65 svg path { - fill: #666687; + fill: #c0c0cf; } .c65:focus svg path, .c65:hover svg path { + fill: #c0c0cf; + } + + .c67 { + font-size: 0.7rem; + } + + .c67 svg path { + fill: #666687; + } + + .c67:focus svg path, + .c67:hover svg path { fill: #4a4a6a; } - .c50 { + .c52 { position: absolute; left: 0; right: 0; @@ -684,15 +692,15 @@ describe('ADMIN | Pages | USERS | ListPage', () => { border: none; } - .c50:focus { + .c52:focus { outline: none; } - .c50[aria-disabled='true'] { + .c52[aria-disabled='true'] { cursor: not-allowed; } - .c54 { + .c56 { color: #32324d; display: inline-block; white-space: nowrap; @@ -702,16 +710,16 @@ describe('ADMIN | Pages | USERS | ListPage', () => { line-height: 1.43; } - .c53 { + .c55 { padding-right: 16px; padding-left: 16px; } - .c55 { + .c57 { padding-left: 12px; } - .c48 { + .c50 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -725,7 +733,7 @@ describe('ADMIN | Pages | USERS | ListPage', () => { align-items: center; } - .c51 { + .c53 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -743,7 +751,7 @@ describe('ADMIN | Pages | USERS | ListPage', () => { align-items: center; } - .c47 { + .c49 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -753,16 +761,16 @@ describe('ADMIN | Pages | USERS | ListPage', () => { flex-direction: column; } - .c47 > * { + .c49 > * { margin-top: 0; margin-bottom: 0; } - .c47 > * + * { + .c49 > * + * { margin-top: 0px; } - .c49 { + .c51 { position: relative; border: 1px solid #dcdce4; padding-right: 12px; @@ -778,28 +786,28 @@ describe('ADMIN | Pages | USERS | ListPage', () => { transition-duration: 0.2s; } - .c49:focus-within { + .c51:focus-within { border: 1px solid #4945ff; box-shadow: #4945ff 0px 0px 0px 2px; } - .c56 { + .c58 { background: transparent; border: none; position: relative; z-index: 1; } - .c56 svg { + .c58 svg { height: 0.6875rem; width: 0.6875rem; } - .c56 svg path { + .c58 svg path { fill: #666687; } - .c57 { + .c59 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -808,39 +816,39 @@ describe('ADMIN | Pages | USERS | ListPage', () => { border: none; } - .c57 svg { + .c59 svg { width: 0.375rem; } - .c52 { + .c54 { width: 100%; } - .c23 { + .c25 { background: #ffffff; border-radius: 4px; box-shadow: 0px 1px 4px rgba(33,33,52,0.1); } - .c26 { + .c28 { padding-right: 24px; padding-left: 24px; } - .c24 { + .c26 { overflow: hidden; } - .c28 { + .c30 { width: 100%; white-space: nowrap; } - .c25 { + .c27 { position: relative; } - .c25:before { + .c27:before { background: linear-gradient(90deg,#c0c0cf 0%,rgba(0,0,0,0) 100%); opacity: 0.2; position: absolute; @@ -850,7 +858,7 @@ describe('ADMIN | Pages | USERS | ListPage', () => { left: 0; } - .c25:after { + .c27:after { background: linear-gradient(270deg,#c0c0cf 0%,rgba(0,0,0,0) 100%); opacity: 0.2; position: absolute; @@ -861,39 +869,39 @@ describe('ADMIN | Pages | USERS | ListPage', () => { top: 0; } - .c27 { + .c29 { overflow-x: auto; } - .c39 tr:last-of-type { + .c41 tr:last-of-type { border-bottom: none; } - .c29 { + .c31 { border-bottom: 1px solid #eaeaef; } - .c30 { + .c32 { border-bottom: 1px solid #eaeaef; } - .c30 td, - .c30 th { + .c32 td, + .c32 th { padding: 16px; } - .c30 td:first-of-type, - .c30 th:first-of-type { + .c32 td:first-of-type, + .c32 th:first-of-type { padding: 0 4px; } - .c30 th { + .c32 th { padding-top: 0; padding-bottom: 0; height: 3.5rem; } - .c32 { + .c34 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -907,22 +915,22 @@ describe('ADMIN | Pages | USERS | ListPage', () => { align-items: center; } - .c31 { + .c33 { vertical-align: middle; text-align: left; color: #666687; outline-offset: -4px; } - .c31 input { + .c33 input { vertical-align: sub; } - .c34 svg { + .c36 svg { height: 0.25rem; } - .c35 { + .c37 { color: #666687; font-weight: 600; font-size: 0.6875rem; @@ -930,13 +938,13 @@ describe('ADMIN | Pages | USERS | ListPage', () => { text-transform: uppercase; } - .c59 { + .c61 { color: #666687; font-size: 0.875rem; line-height: 1.43; } - .c38 { + .c40 { border: 0; -webkit-clip: rect(0 0 0 0); clip: rect(0 0 0 0); @@ -948,7 +956,7 @@ describe('ADMIN | Pages | USERS | ListPage', () => { width: 1px; } - .c37 { + .c39 { -webkit-transform: rotate(0deg); -ms-transform: rotate(0deg); transform: rotate(0deg); @@ -1152,6 +1160,7 @@ describe('ADMIN | Pages | USERS | ListPage', () => { type="button" > {