aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bower.json3
-rw-r--r--package.json2
-rw-r--r--public/main.css13
-rw-r--r--src/Food.purs6
-rw-r--r--test/Main.purs1
5 files changed, 15 insertions, 10 deletions
diff --git a/bower.json b/bower.json
index 2844439..76a7ef5 100644
--- a/bower.json
+++ b/bower.json
@@ -3,7 +3,6 @@
"private": true,
"dependencies": {
"purescript-halogen": "*",
- "purescript-spec": "*",
- "purescript-psci-support": "^2.0.0"
+ "purescript-spec": "*"
}
}
diff --git a/package.json b/package.json
index a3d0b92..7a740d4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"private": true,
"devDependencies": {
- "pulp": "^10.0.4"
+ "pulp": "^11.0.0"
}
}
diff --git a/public/main.css b/public/main.css
index fc0850a..da0b04e 100644
--- a/public/main.css
+++ b/public/main.css
@@ -1,8 +1,13 @@
-body { margin: 0; }
+html {
+ box-sizing: border-box;
+ overflow-y: scroll;
+}
-/* Box sizing */
-html { box-sizing: border-box; }
-*, *:before, *:after { box-sizing: inherit; }
+*, *:before, *:after {
+ box-sizing: inherit;
+}
+
+body { margin: 0; }
@media screen and (min-width: 700px) {
.page {
diff --git a/src/Food.purs b/src/Food.purs
index 980eb44..8a6bb57 100644
--- a/src/Food.purs
+++ b/src/Food.purs
@@ -54,6 +54,8 @@ all =
, { name: "Chataigne grillée", glycemicIndex: 60, carbohydrates: 42 }
, { name: "Croissant", glycemicIndex: 60, carbohydrates: 57 }
+ , { name: "Chocolat noir 70%", glycemicIndex: 25, carbohydrates: 32 }
+ , { name: "Chocolat noir 85%", glycemicIndex: 20, carbohydrates: 24 }
, { name: "Choux blanc", glycemicIndex: 15, carbohydrates: 4 }
, { name: "Choux chinois", glycemicIndex: 15, carbohydrates: 1 }
, { name: "Choux de bruxelles", glycemicIndex: 15, carbohydrates: 3 }
@@ -92,7 +94,7 @@ all =
, { name: "Farine de quinoa", glycemicIndex: 40, carbohydrates: 64 }
, { name: "Farine de riz", glycemicIndex: 95, carbohydrates: 85 }
, { name: "Farine de seigle complète T130", glycemicIndex: 45, carbohydrates: 59 }
- , { name: "Farine de seigle intégraile T150", glycemicIndex: 45, carbohydrates: 59 }
+ , { name: "Farine de seigle intégrale T150", glycemicIndex: 45, carbohydrates: 59 }
, { name: "Fécule de maïs", glycemicIndex: 85, carbohydrates: 88 }
, { name: "Fenouil", glycemicIndex: 15, carbohydrates: 5 }
, { name: "Fève", glycemicIndex: 15, carbohydrates: 14 }
@@ -113,7 +115,7 @@ all =
, { name: "Groseilles à maquereau", glycemicIndex: 25, carbohydrates: 6 }
, { name: "Haricot beurre", glycemicIndex: 15, carbohydrates: 3 }
- , { name: "Haricot blanc", glycemicIndex: 35, carbohydrates: 17 }
+ , { name: "Haricot blanc", glycemicIndex: 35, carbohydrates: 14 }
, { name: "Haricot mange tout", glycemicIndex: 15, carbohydrates: 7 }
, { name: "Haricot noir", glycemicIndex: 35, carbohydrates: 24 }
, { name: "Haricot rouge", glycemicIndex: 35, carbohydrates: 15 }
diff --git a/test/Main.purs b/test/Main.purs
index 5ebbb03..25352df 100644
--- a/test/Main.purs
+++ b/test/Main.purs
@@ -1,7 +1,6 @@
module Test.Main where
import Prelude
-import Control.Monad.Aff (later')
import Control.Monad.Eff (Eff)
import Test.Spec (describe, it)
import Test.Spec.Assertions (shouldEqual)