Skip to content

Commit

Permalink
Merge pull request #11606 from strapi/cm-various-ui-fix
Browse files Browse the repository at this point in the history
[v4] CM: fix some ui bugs
  • Loading branch information
soupette committed Nov 17, 2021
2 parents 3969927 + e7c1eb4 commit 0c0b615
Show file tree
Hide file tree
Showing 8 changed files with 254 additions and 196 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,12 @@ exports[`<AddComponentButton /> 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);
}
Expand Down Expand Up @@ -390,8 +394,12 @@ exports[`<AddComponentButton /> 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);
}
Expand Down Expand Up @@ -645,8 +653,12 @@ exports[`<AddComponentButton /> 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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ const EditView = ({
paddingLeft={4}
paddingRight={4}
paddingTop={6}
shadow="tableShadow"
>
<Informations />
<InjectionZone area="contentManager.editView.informations" />
Expand All @@ -259,6 +260,7 @@ const EditView = ({
paddingLeft={4}
paddingRight={4}
paddingTop={6}
shadow="tableShadow"
>
<TableLabel textColor="neutral600">
{formatMessage(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
/>
)}
Expand Down
Loading

0 comments on commit 0c0b615

Please sign in to comment.