diff --git a/components/chart/day-column.js b/components/chart/day-column.js
index 1717c42..a1ec158 100644
--- a/components/chart/day-column.js
+++ b/components/chart/day-column.js
@@ -26,20 +26,8 @@ export default class DayColumn extends Component {
bleeding,
mucus
} = data
- const cycleDayNumber = getCycleDayNumber(dateString)
- const shortDate = dateString.split('-').slice(1).join('-')
const nfpLineInfo = getFhmAndLtlInfo(dateString, temperature)
- //TODO move these so they are visible
- const cycleDayLabel = (
-
- {cycleDayNumber}
- )
- const dateLabel = (
-
- {shortDate}
-
- )
const columnElements = []
if (typeof bleeding === 'number') {
columnElements.push(
@@ -68,8 +56,6 @@ export default class DayColumn extends Component {
columnElements.push(mucusIcon)
}
- columnElements.push(cycleDayLabel, dateLabel)
-
if(nfpLineInfo.drawFhmLine) {
const fhmLine = (
+ {cycleDayNumber}
+ )
+ const dateLabel = (
+
+ {shortDate}
+
+ )
+ columnElements.push(
+
+ {cycleDayLabel}
+ {dateLabel}
+
+ )
return React.createElement(
TouchableOpacity,
diff --git a/components/chart/styles.js b/components/chart/styles.js
index b85d115..c018eb1 100644
--- a/components/chart/styles.js
+++ b/components/chart/styles.js
@@ -26,16 +26,14 @@ const styles = {
column: {
label: {
date: {
- stroke: 'grey',
- fontSize: 10,
- fontWeight: '100',
- color: 'red'
+ color: 'grey',
+ fontSize: 9,
+ fontWeight: '100'
},
number: {
- stroke: '#00b159',
+ color: '#00b159',
fontSize: 13,
- marginLeft: 1,
- marginTop: 10
+ textAlign: 'center'
}
},
rect: {