diff --git a/src/components/layout/FlexCol/FlexCol.tsx b/src/components/layout/FlexCol/FlexCol.tsx index 4301e431a..ac381319f 100644 --- a/src/components/layout/FlexCol/FlexCol.tsx +++ b/src/components/layout/FlexCol/FlexCol.tsx @@ -2,10 +2,13 @@ import React from 'react'; import styled, { css } from 'styled-components'; import grid from '../../../constants/grid'; -export type TAlignSelf = 'flex-start' | 'center' | 'flex-end' | 'stretch'; +export type TAlignSelf = 'flex-start' | 'center' | 'flex-end' | 'stretch' | 'auto'; export type TColWidth = number | 'fill' | 'auto' | 'hidden'; export interface IFlexColProps { + /** + * @default auto + */ align?: TAlignSelf; cols?: number; gutter?: number; @@ -64,16 +67,16 @@ const getWidth = (breakpoint, colWidth, cols) => { }; const defaultProps: Partial = { - align: 'flex-start', + align: 'auto', }; const StyledFlexCol = styled.div` position: relative; width: 100%; min-height: 1px; - padding-right: ${props => props.gutter}px; - padding-left: ${props => props.gutter}px; - align-self: ${props => props.align}; + padding-right: ${({ gutter }) => gutter}px; + padding-left: ${({ gutter }) => gutter}px; + align-self: ${({ align }) => align}; ${props => Object.keys(grid.breakpoints) .sort((a, b) => grid.breakpoints[a] - grid.breakpoints[b]) diff --git a/src/components/layout/FlexCol/__snapshots__/FlexCol.test.tsx.snap b/src/components/layout/FlexCol/__snapshots__/FlexCol.test.tsx.snap index c876cfe0c..21d3ec066 100644 --- a/src/components/layout/FlexCol/__snapshots__/FlexCol.test.tsx.snap +++ b/src/components/layout/FlexCol/__snapshots__/FlexCol.test.tsx.snap @@ -7,9 +7,9 @@ exports[` renders a FlexCol component 1`] = ` min-height: 1px; padding-right: px; padding-left: px; - -webkit-align-self: flex-start; - -ms-flex-item-align: start; - align-self: flex-start; + -webkit-align-self: auto; + -ms-flex-item-align: auto; + align-self: auto; }
renders the default Help component with no a11y violations 1`] min-height: 1px; padding-right: 16px; padding-left: 16px; - -webkit-align-self: flex-start; - -ms-flex-item-align: start; - align-self: flex-start; + -webkit-align-self: auto; + -ms-flex-item-align: auto; + align-self: auto; } .c5 { @@ -34,9 +34,9 @@ exports[` renders the default Help component with no a11y violations 1`] min-height: 1px; padding-right: 16px; padding-left: 16px; - -webkit-align-self: flex-start; - -ms-flex-item-align: start; - align-self: flex-start; + -webkit-align-self: auto; + -ms-flex-item-align: auto; + align-self: auto; } .c2 { diff --git a/src/components/molecules/ZopaFooter/Links/__snapshots__/Links.test.tsx.snap b/src/components/molecules/ZopaFooter/Links/__snapshots__/Links.test.tsx.snap index 22c2e387c..e3cfa8579 100644 --- a/src/components/molecules/ZopaFooter/Links/__snapshots__/Links.test.tsx.snap +++ b/src/components/molecules/ZopaFooter/Links/__snapshots__/Links.test.tsx.snap @@ -7,9 +7,9 @@ exports[` renders the component 1`] = ` min-height: 1px; padding-right: 16px; padding-left: 16px; - -webkit-align-self: flex-start; - -ms-flex-item-align: start; - align-self: flex-start; + -webkit-align-self: auto; + -ms-flex-item-align: auto; + align-self: auto; } .c7 { @@ -18,9 +18,9 @@ exports[` renders the component 1`] = ` min-height: 1px; padding-right: px; padding-left: px; - -webkit-align-self: flex-start; - -ms-flex-item-align: start; - align-self: flex-start; + -webkit-align-self: auto; + -ms-flex-item-align: auto; + align-self: auto; } .c0 { diff --git a/src/components/molecules/ZopaFooter/MiscLinks/__snapshots__/MiscLinks.test.tsx.snap b/src/components/molecules/ZopaFooter/MiscLinks/__snapshots__/MiscLinks.test.tsx.snap index d214764f3..f989427dc 100644 --- a/src/components/molecules/ZopaFooter/MiscLinks/__snapshots__/MiscLinks.test.tsx.snap +++ b/src/components/molecules/ZopaFooter/MiscLinks/__snapshots__/MiscLinks.test.tsx.snap @@ -7,9 +7,9 @@ exports[` renders the component 1`] = ` min-height: 1px; padding-right: 16px; padding-left: 16px; - -webkit-align-self: flex-start; - -ms-flex-item-align: start; - align-self: flex-start; + -webkit-align-self: auto; + -ms-flex-item-align: auto; + align-self: auto; } .c0 { diff --git a/src/components/molecules/ZopaFooter/SocialLinks/__snapshots__/SocialLinks.test.tsx.snap b/src/components/molecules/ZopaFooter/SocialLinks/__snapshots__/SocialLinks.test.tsx.snap index 75f2a0539..dc5825653 100644 --- a/src/components/molecules/ZopaFooter/SocialLinks/__snapshots__/SocialLinks.test.tsx.snap +++ b/src/components/molecules/ZopaFooter/SocialLinks/__snapshots__/SocialLinks.test.tsx.snap @@ -7,9 +7,9 @@ exports[` renders the component 1`] = ` min-height: 1px; padding-right: 16px; padding-left: 16px; - -webkit-align-self: flex-start; - -ms-flex-item-align: start; - align-self: flex-start; + -webkit-align-self: auto; + -ms-flex-item-align: auto; + align-self: auto; } .c0 { diff --git a/src/components/molecules/ZopaFooter/__snapshots__/ZopaFooter.test.tsx.snap b/src/components/molecules/ZopaFooter/__snapshots__/ZopaFooter.test.tsx.snap index 0ee38df25..089d5bca6 100644 --- a/src/components/molecules/ZopaFooter/__snapshots__/ZopaFooter.test.tsx.snap +++ b/src/components/molecules/ZopaFooter/__snapshots__/ZopaFooter.test.tsx.snap @@ -123,9 +123,9 @@ exports[` renders the component with default props 1`] = ` min-height: 1px; padding-right: 16px; padding-left: 16px; - -webkit-align-self: flex-start; - -ms-flex-item-align: start; - align-self: flex-start; + -webkit-align-self: auto; + -ms-flex-item-align: auto; + align-self: auto; } .c9 { @@ -134,9 +134,9 @@ exports[` renders the component with default props 1`] = ` min-height: 1px; padding-right: px; padding-left: px; - -webkit-align-self: flex-start; - -ms-flex-item-align: start; - align-self: flex-start; + -webkit-align-self: auto; + -ms-flex-item-align: auto; + align-self: auto; } .c12 { @@ -145,9 +145,9 @@ exports[` renders the component with default props 1`] = ` min-height: 1px; padding-right: 16px; padding-left: 16px; - -webkit-align-self: flex-start; - -ms-flex-item-align: start; - align-self: flex-start; + -webkit-align-self: auto; + -ms-flex-item-align: auto; + align-self: auto; } .c2 {