Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,10 @@ const DesignableBanner: ReactComponent<BannerRenderProps> = ({
<div
css={
isCollapsableBanner
? styles.closeAndCollapseButtonContainer
? styles.closeAndCollapseButtonContainer(
isCollapsed,
isMaybeLaterVariant,
)
: styles.closeButtonContainer
}
>
Expand All @@ -437,9 +440,11 @@ const DesignableBanner: ReactComponent<BannerRenderProps> = ({
onClick={() =>
handleSetIsCollapsed(!isCollapsed)
}
cssOverrides={styles.iconOverrides(
templateSettings.closeButtonSettings,
)}
cssOverrides={[
styles.iconOverrides(
templateSettings.closeButtonSettings,
),
]}
priority="secondary"
icon={
isCollapsed ? (
Expand Down Expand Up @@ -679,7 +684,7 @@ const styles = {
${from.desktop} {
max-width: 980px;
padding: ${space[1]}px ${space[1]}px 0 ${space[3]}px;
grid-template-columns: auto 380px auto;
grid-template-columns: auto 380px minmax(100px, auto);
grid-template-rows: auto auto;

grid-template-areas:
Expand Down Expand Up @@ -743,7 +748,10 @@ const styles = {
padding-left: ${space[8]}px;
}
`,
closeAndCollapseButtonContainer: css`
closeAndCollapseButtonContainer: (
isCollapsed: boolean,
isMaybeLaterVariant: boolean,
) => css`
/* Layout changes only here */
grid-area: close-button;
display: flex;
Expand All @@ -761,7 +769,10 @@ const styles = {
margin-top: ${space[2]}px;
}
${from.desktop} {
margin-top: ${space[5]}px;
flex-direction: ${isCollapsed ? 'row' : 'row-reverse'};
margin-top: ${isCollapsed && isMaybeLaterVariant
? space[9]
: space[6]}px;
}

.maybe-later & {
Expand Down Expand Up @@ -940,6 +951,7 @@ const styles = {
}
${from.desktop} {
justify-self: end;
padding-right: ${space[8]}px;
width: 299px;
}
${between.desktop.and.wide} {
Expand Down Expand Up @@ -976,7 +988,7 @@ const styles = {
.maybe-later & {
flex-direction: row;
flex-wrap: wrap;
padding: ${space[3]}px;
padding: ${space[3]}px 0;
}

${until.phablet} {
Expand Down Expand Up @@ -1052,7 +1064,7 @@ const styles = {
collapsableButtonContainer: css`
margin-left: ${space[2]}px;
${from.desktop} {
margin-top: ${space[1]}px;
margin: 0;
}
`,
iconOverrides: (ctaSettings?: CtaSettings) => css`
Expand All @@ -1063,6 +1075,10 @@ const styles = {
}
margin-top: ${space[1]}px;
margin-right: ${space[1]}px;

${from.desktop} {
margin: 0;
}
`,
};

Expand Down
Loading