Skip to content
Snippets Groups Projects
Commit 5856dca4 authored by Sofiya Tepikin's avatar Sofiya Tepikin
Browse files

Merge branch 'fix-chart-date-label' into 'rebased-redesign'

Fixes the date label on chart from breaking

See merge request bloodyhealth/drip!331
parents 9a87bf76 e61f8c94
No related branches found
No related tags found
No related merge requests found
...@@ -28,7 +28,7 @@ const styles = StyleSheet.create({ ...@@ -28,7 +28,7 @@ const styles = StyleSheet.create({
width: CHART_YAXIS_WIDTH width: CHART_YAXIS_WIDTH
}, },
text: { text: {
...Typography.label ...Typography.label,
}, },
textBold: { textBold: {
...Typography.labelBold ...Typography.labelBold
......
...@@ -116,7 +116,6 @@ const Asterisk = () => { ...@@ -116,7 +116,6 @@ const Asterisk = () => {
const styles = StyleSheet.create({ const styles = StyleSheet.create({
asterisk: { asterisk: {
color: Colors.orange, color: Colors.orange,
paddingRight: Spacing.base,
}, },
container: { container: {
backgroundColor: Colors.purple, backgroundColor: Colors.purple,
...@@ -150,6 +149,7 @@ const styles = StyleSheet.create({ ...@@ -150,6 +149,7 @@ const styles = StyleSheet.create({
}, },
greyText: { greyText: {
color: Colors.greyLight, color: Colors.greyLight,
paddingLeft: Spacing.base,
} }
}) })
......
...@@ -11,7 +11,7 @@ export const fonts = { ...@@ -11,7 +11,7 @@ export const fonts = {
export const sizes = { export const sizes = {
tiny: 7 / fontRatio, tiny: 7 / fontRatio,
footnote: 10 / fontRatio, footnote: 10 / fontRatio,
small: 14 / fontRatio, small: 13 / fontRatio,
base: 18 / fontRatio, base: 18 / fontRatio,
subtitle: 22 / fontRatio, subtitle: 22 / fontRatio,
title: 24 / fontRatio, title: 24 / fontRatio,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment