crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: dont allow heading to change height when input size changes

Browse Source
This commit is contained in:
fragosti
2018-10-23 15:01:22 -07:00
parent b7a5e40c62
commit f0c79473bd
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/instant/src/components/instant_heading.tsx
View File

@@ -69,7 +69,9 @@ export const InstantHeading: React.StatelessComponent<InstantHeadingProps> = pro
</Text>
</Container>
<Flex direction="row" justify="space-between">
<Flex height="65px">
<SelectedAssetAmountInput startingFontSizePx={45} />
</Flex>
<Flex direction="column" justify="space-between">
<Container marginBottom="5px">
<Text fontSize="16px" fontColor={ColorOption.white} fontWeight={500}>

3
packages/instant/src/components/ui/container.tsx
View File

@@ -1,4 +1,3 @@
import { ColorOption, styled } from '../../style/theme';
import { cssRuleIfExists } from '../../style/util';
@@ -10,6 +9,7 @@ export interface ContainerProps {
bottom?: string;
left?: string;
width?: string;
height?: string;
maxWidth?: string;
margin?: string;
marginTop?: string;
@@ -37,6 +37,7 @@ export const Container = styled<ContainerProps, 'div'>('div')`
${props => cssRuleIfExists(props, 'bottom')}
${props => cssRuleIfExists(props, 'left')}
${props => cssRuleIfExists(props, 'width')}
${props => cssRuleIfExists(props, 'height')}
${props => cssRuleIfExists(props, 'max-width')}
${props => cssRuleIfExists(props, 'margin')}
${props => cssRuleIfExists(props, 'margin-top')}

3
packages/instant/src/components/ui/flex.tsx
View File

@@ -1,4 +1,3 @@
import { ColorOption, styled } from '../../style/theme';
import { cssRuleIfExists } from '../../style/util';
@@ -8,6 +7,7 @@ export interface FlexProps {
justify?: 'flex-start' | 'center' | 'space-around' | 'space-between' | 'space-evenly' | 'flex-end';
align?: 'flex-start' | 'center' | 'space-around' | 'space-between' | 'space-evenly' | 'flex-end';
width?: string;
height?: string;
backgroundColor?: ColorOption;
className?: string;
}
@@ -19,6 +19,7 @@ export const Flex = styled<FlexProps, 'div'>('div')`
justify-content: ${props => props.justify};
align-items: ${props => props.align};
${props => cssRuleIfExists(props, 'width')}
${props => cssRuleIfExists(props, 'height')}
background-color: ${props => (props.backgroundColor ? props.theme[props.backgroundColor] : 'none')};
`;