Skip to content
This repository was archived by the owner on Sep 26, 2024. It is now read-only.

Fixes issue #105: [Button noStyle] Vertical alignment not center #186

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
3 changes: 2 additions & 1 deletion ButtonStateless/index.jsx
Original file line number Diff line number Diff line change
@@ -129,7 +129,8 @@ const Button = ({
width: '100%',
},
noStyle: {
display: 'unset',
display: 'flex',
alignItems: 'center',
lineHeight: 'unset',
margin: 'unset',
padding: 0,
6 changes: 1 addition & 5 deletions InputTime/index.jsx
Original file line number Diff line number Diff line change
@@ -186,7 +186,6 @@ const InputTime = ({
},
minimal,
select24Hours,
displayTimeColon,
fontSize,
}) => {
const style = {
@@ -212,16 +211,14 @@ const InputTime = ({
size={fontSize}
/>
</SelectWrapper>
{ displayTimeColon ?
<TimeColonWrapper
minimal={minimal}
>
<Text size={'small'}>:</Text>
</TimeColonWrapper>
: null }
<SelectWrapper
minimal={minimal}
marginLeft={minimal || displayTimeColon ? 0 : '0.25rem'}
marginLeft={minimal}
marginRight={!minimal ? '0.25rem' : undefined}
>
<Select
@@ -263,7 +260,6 @@ InputTime.propTypes = {
}),
minimal: PropTypes.bool,
select24Hours: PropTypes.bool,
displayTimeColon: PropTypes.bool,
fontSize: PropTypes.oneOf(['small']),
};

19 changes: 0 additions & 19 deletions InputTime/story.jsx
Original file line number Diff line number Diff line change
@@ -100,25 +100,6 @@ storiesOf('InputTime', module)
}}
/>
))
.add('displayTimeColon', () => (
<InputTime
input={{
onChange: action('on-change'),
value: '',
}}
displayTimeColon
/>
))
.add('displayTimeColon minimal', () => (
<InputTime
input={{
onChange: action('on-change'),
value: '',
}}
displayTimeColon
minimal
/>
))
.add('small', () => (
<InputTime
input={{
Loading
Oops, something went wrong.