@@ -422,7 +422,10 @@ const DesignableBanner: ReactComponent<BannerRenderProps> = ({
422422 < div
423423 css = {
424424 isCollapsableBanner
425- ? styles . closeAndCollapseButtonContainer
425+ ? styles . closeAndCollapseButtonContainer (
426+ isCollapsed ,
427+ isMaybeLaterVariant ,
428+ )
426429 : styles . closeButtonContainer
427430 }
428431 >
@@ -435,9 +438,11 @@ const DesignableBanner: ReactComponent<BannerRenderProps> = ({
435438 onClick = { ( ) =>
436439 handleSetIsCollapsed ( ! isCollapsed )
437440 }
438- cssOverrides = { styles . iconOverrides (
439- templateSettings . closeButtonSettings ,
440- ) }
441+ cssOverrides = { [
442+ styles . iconOverrides (
443+ templateSettings . closeButtonSettings ,
444+ ) ,
445+ ] }
441446 priority = "secondary"
442447 icon = {
443448 isCollapsed ? (
@@ -677,7 +682,7 @@ const styles = {
677682 ${ from . desktop } {
678683 max-width : 980px ;
679684 padding : ${ space [ 1 ] } px ${ space [ 1 ] } px 0 ${ space [ 3 ] } px;
680- grid-template-columns : auto 380px auto;
685+ grid-template-columns : auto 380px minmax ( 100 px , auto) ;
681686 grid-template-rows : auto auto;
682687
683688 grid-template-areas :
@@ -741,7 +746,10 @@ const styles = {
741746 padding-left : ${ space [ 8 ] } px;
742747 }
743748 ` ,
744- closeAndCollapseButtonContainer : css `
749+ closeAndCollapseButtonContainer : (
750+ isCollapsed : boolean ,
751+ isMaybeLaterVariant : boolean ,
752+ ) => css `
745753 /* Layout changes only here */
746754 grid-area : close-button;
747755 display : flex;
@@ -759,7 +767,10 @@ const styles = {
759767 margin-top : ${ space [ 2 ] } px;
760768 }
761769 ${ from . desktop } {
762- margin-top : ${ space [ 5 ] } px;
770+ flex-direction : ${ isCollapsed ? 'row' : 'row-reverse' } ;
771+ margin-top : ${ isCollapsed && isMaybeLaterVariant
772+ ? space [ 9 ]
773+ : space [ 6 ] } px;
763774 }
764775
765776 .maybe-later & {
@@ -938,6 +949,7 @@ const styles = {
938949 }
939950 ${ from . desktop } {
940951 justify-self : end;
952+ padding-right : ${ space [ 8 ] } px;
941953 width : 299px ;
942954 }
943955 ${ between . desktop . and . wide } {
@@ -974,7 +986,7 @@ const styles = {
974986 .maybe-later & {
975987 flex-direction : row;
976988 flex-wrap : wrap;
977- padding : ${ space [ 3 ] } px;
989+ padding : ${ space [ 3 ] } px 0 ;
978990 }
979991
980992 ${ until . phablet } {
@@ -1050,7 +1062,7 @@ const styles = {
10501062 collapsableButtonContainer : css `
10511063 margin-left : ${ space [ 2 ] } px;
10521064 ${ from . desktop } {
1053- margin-top : ${ space [ 1 ] } px ;
1065+ margin : 0 ;
10541066 }
10551067 ` ,
10561068 iconOverrides : ( ctaSettings ?: CtaSettings ) => css `
@@ -1061,6 +1073,10 @@ const styles = {
10611073 }
10621074 margin-top : ${ space [ 1 ] } px;
10631075 margin-right : ${ space [ 1 ] } px;
1076+
1077+ ${ from . desktop } {
1078+ margin : 0 ;
1079+ }
10641080 ` ,
10651081} ;
10661082
0 commit comments