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

Solved Issue #107 : added ':' between hour and minute in all instances of the component #185

Open
wants to merge 1 commit 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
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={{
1,736 changes: 331 additions & 1,405 deletions __snapshots__/snapshot.test.js.snap

Large diffs are not rendered by default.

13,914 changes: 5,248 additions & 8,666 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@
"babel-plugin-require-context-hook": "^1.0.0",
"enzyme": "3.10.0",
"enzyme-adapter-react-16": "1.14.0",
"eslint": "6.4.0",
"eslint": "^6.4.0",
"eslint-config-airbnb": "18.1.0",
"eslint-plugin-import": "2.20.1",
"eslint-plugin-jsx-a11y": "6.2.3",