From 35df0c58ca222bbc1abda6bc94167bbc543a5e23 Mon Sep 17 00:00:00 2001
From: Andrea R <amrdev08@gmail.com>
Date: Sat, 3 Mar 2018 23:56:17 -0500
Subject: [PATCH 1/3] error msg fix

---
 package-lock.json            | 6 +++---
 src/components/FuncCard.css  | 8 ++------
 src/components/FuncParams.js | 4 ++--
 src/containers/CardList.js   | 1 +
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6675285..5def8aa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12211,9 +12211,9 @@
       }
     },
     "variadic.js": {
-      "version": "0.0.23",
-      "resolved": "https://registry.npmjs.org/variadic.js/-/variadic.js-0.0.23.tgz",
-      "integrity": "sha1-EtSLorw7dN6/Kr49c5x7hfqslh0="
+      "version": "0.0.25",
+      "resolved": "https://registry.npmjs.org/variadic.js/-/variadic.js-0.0.25.tgz",
+      "integrity": "sha1-4OsRJOS30/ktcAJr08xtaMmuPOI="
     },
     "vary": {
       "version": "1.1.2",
diff --git a/src/components/FuncCard.css b/src/components/FuncCard.css
index f76b06f..2ce6d4a 100644
--- a/src/components/FuncCard.css
+++ b/src/components/FuncCard.css
@@ -5,11 +5,6 @@
     box-shadow: 0 0 5px 1px grey;
 }
 
-.text-field {
-	max-width: 35px;
-	margin: 10px;
-}
-
 .button {
 	width: 40%;
 	padding: 0;
@@ -17,7 +12,8 @@
 }
 
 .carousel {
-	height: 500px;
+	height: 600px;
+	margin-top: -50px;
 }
 
 .p-style {
diff --git a/src/components/FuncParams.js b/src/components/FuncParams.js
index 00a1c13..84a478c 100644
--- a/src/components/FuncParams.js
+++ b/src/components/FuncParams.js
@@ -27,7 +27,7 @@ class FuncParams extends Component {
   render() {
     const {funcName, error} = this.props;
     const {value} = this.state;
-
+    
     return(
       <form onSubmit={this.handleParamSubmit}>
         <Input
@@ -35,7 +35,7 @@ class FuncParams extends Component {
           id={`${funcName}-input`}
           type="number"
           step="0.01"
-          placeholder="Enter number and hit RETURN"
+          label="Enter number and hit RETURN"
           error={error}
           onChange={this.handleInputChange}
         />
diff --git a/src/containers/CardList.js b/src/containers/CardList.js
index 4329523..0d819ad 100644
--- a/src/containers/CardList.js
+++ b/src/containers/CardList.js
@@ -27,6 +27,7 @@ class CardList extends Component {
   render() {
     const flexContainer = {
       marginTop: "30px",
+      marginBottom: "100px",
       display: "flex",
       justifyContent: "center",
       flexWrap: "wrap"

From 798f7f0a1c488f8c21529c1a1825d9665e3a0987 Mon Sep 17 00:00:00 2001
From: Andrea R <amrdev08@gmail.com>
Date: Sat, 3 Mar 2018 23:59:18 -0500
Subject: [PATCH 2/3] adjusting css

---
 src/components/FuncCard.css | 2 +-
 src/containers/CardList.js  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/FuncCard.css b/src/components/FuncCard.css
index 2ce6d4a..2f3fede 100644
--- a/src/components/FuncCard.css
+++ b/src/components/FuncCard.css
@@ -13,7 +13,7 @@
 
 .carousel {
 	height: 600px;
-	margin-top: -50px;
+	margin-top: -60px;
 }
 
 .p-style {
diff --git a/src/containers/CardList.js b/src/containers/CardList.js
index 0d819ad..4329523 100644
--- a/src/containers/CardList.js
+++ b/src/containers/CardList.js
@@ -27,7 +27,6 @@ class CardList extends Component {
   render() {
     const flexContainer = {
       marginTop: "30px",
-      marginBottom: "100px",
       display: "flex",
       justifyContent: "center",
       flexWrap: "wrap"

From 7aba15501762ce027c9456d8e319a9dae3f40909 Mon Sep 17 00:00:00 2001
From: Mischa Radenovic <miroslav.radenovic@gmail.com>
Date: Sun, 4 Mar 2018 10:41:41 -0500
Subject: [PATCH 3/3] show error in <p> element

---
 src/components/FuncParams.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/FuncParams.js b/src/components/FuncParams.js
index 84a478c..7beb5ac 100644
--- a/src/components/FuncParams.js
+++ b/src/components/FuncParams.js
@@ -27,7 +27,7 @@ class FuncParams extends Component {
   render() {
     const {funcName, error} = this.props;
     const {value} = this.state;
-    
+
     return(
       <form onSubmit={this.handleParamSubmit}>
         <Input
@@ -36,12 +36,12 @@ class FuncParams extends Component {
           type="number"
           step="0.01"
           label="Enter number and hit RETURN"
-          error={error}
           onChange={this.handleInputChange}
         />
+        <p style={{color: 'red'}}>{error}</p>
       </form>
     );
   }
 }
 
-export default FuncParams;
\ No newline at end of file
+export default FuncParams;