Merge branch 'master'

2018-08-31 00:36:19 +02:00
parent 5296a9c6ee
commit 3ff7dd7340
14 changed files with 1359 additions and 706 deletions
@@ -61,6 +61,11 @@ const styles = {
    '#a64ca6',
    '#993299'
  ],
+  cervixIcon: {
+    width: 12,
+    height: 12,
+    borderRadius: 50
+  },
  yAxis: {
    width: config.columnWidth,
    borderRightWidth: 0.5,