From a47f32a7b0728c402787ebe914a0953638734820 Mon Sep 17 00:00:00 2001
From: Tayane Fernandes <tayane.rmf@gmail.com>
Date: Tue, 7 Feb 2017 18:09:20 -0200
Subject: [#922] Extract the submit button to a component

with @anikarni
---
 web-ui/src/common/submit-button.scss | 48 ++++++++++++++++++++++++++++++++++++
 web-ui/src/common/submit_button.js   | 26 +++++++++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100644 web-ui/src/common/submit-button.scss
 create mode 100644 web-ui/src/common/submit_button.js

(limited to 'web-ui/src/common')

diff --git a/web-ui/src/common/submit-button.scss b/web-ui/src/common/submit-button.scss
new file mode 100644
index 00000000..86a24e5a
--- /dev/null
+++ b/web-ui/src/common/submit-button.scss
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2017 ThoughtWorks, Inc.
+ *
+ * Pixelated is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pixelated is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+@import "~scss/base/colors";
+
+.submit-button {
+  background: $dark_blue;
+  padding: 0.8em;
+  color: $white;
+  text-align: center;
+  border: none;
+  border-radius: 2px;
+  font-weight: 300;
+  width: 100%;
+  margin-bottom: 1em;
+}
+
+@media only screen and (min-width : 500px) {
+  .submit-button {
+    flex-basis: 70%;
+    -webkit-align-self: center;
+    align-self: center;
+  }
+}
+
+@media only screen and (min-width : 960px) {
+  .submit-button {
+    width: 300px;
+    -webkit-align-self: flex-start;
+    align-self: flex-start;
+    font-size: 0.8em;
+    margin-bottom: 1em;
+  }
+}
diff --git a/web-ui/src/common/submit_button.js b/web-ui/src/common/submit_button.js
new file mode 100644
index 00000000..89cfc55b
--- /dev/null
+++ b/web-ui/src/common/submit_button.js
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2017 ThoughtWorks, Inc.
+ *
+ * Pixelated is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pixelated is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import React from 'react'
+
+import './submit-button.scss'
+
+const SubmitButton = ({ buttonText }) => (
+  <input type='submit' className='submit-button' value={buttonText} />
+)
+
+export default SubmitButton
-- 
cgit v1.2.3


From 31b0bcaa673794024a71065be76681150ad4b9d6 Mon Sep 17 00:00:00 2001
From: Tayane Fernandes <tayane.rmf@gmail.com>
Date: Tue, 7 Feb 2017 18:51:08 -0200
Subject: [#922] Extract input field to a component

with @anikarni
---
 web-ui/src/common/input_field/input-field.scss     | 77 ++++++++++++++++++++++
 web-ui/src/common/input_field/input_field.js       | 29 ++++++++
 web-ui/src/common/submit-button.scss               | 48 --------------
 web-ui/src/common/submit_button.js                 | 26 --------
 web-ui/src/common/submit_button/submit-button.scss | 48 ++++++++++++++
 web-ui/src/common/submit_button/submit_button.js   | 26 ++++++++
 6 files changed, 180 insertions(+), 74 deletions(-)
 create mode 100644 web-ui/src/common/input_field/input-field.scss
 create mode 100644 web-ui/src/common/input_field/input_field.js
 delete mode 100644 web-ui/src/common/submit-button.scss
 delete mode 100644 web-ui/src/common/submit_button.js
 create mode 100644 web-ui/src/common/submit_button/submit-button.scss
 create mode 100644 web-ui/src/common/submit_button/submit_button.js

(limited to 'web-ui/src/common')

diff --git a/web-ui/src/common/input_field/input-field.scss b/web-ui/src/common/input_field/input-field.scss
new file mode 100644
index 00000000..ad5dda13
--- /dev/null
+++ b/web-ui/src/common/input_field/input-field.scss
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2017 ThoughtWorks, Inc.
+ *
+ * Pixelated is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pixelated is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+@import "~scss/base/colors";
+
+.input-field-group {
+  position:relative;
+  margin: 1.5em 0;
+  width: 100%;
+}
+
+.input-field-label {
+  font-size: 0.9em;
+  margin-bottom: 10px;
+  display: inline-block;
+  color:#999;
+  position:absolute;
+  pointer-events:none;
+  left: 6px;
+  top:10px;
+  transition:0.2s ease all;
+  -moz-transition:0.2s ease all;
+  -webkit-transition:0.2s ease all;
+}
+
+.input-field {
+  display: block;
+  border: none;
+  border-bottom: solid 1px $dark_blue;
+  width: 100%;
+  height: auto;
+  padding: 0.3em 0px;
+
+  &:focus {
+    outline:none;
+    border-width: 2px;
+  }
+}
+
+.input-field:focus ~ .input-field-label, .input-field:valid ~ .input-field-label {
+  top:-12px;
+  left: 0;
+  font-size:0.7em;
+  color: $dark_blue;
+}
+
+@media only screen and (min-width : 500px) {
+  .input-field-group {
+    flex-basis: 70%;
+    -webkit-align-self: center;
+    align-self: center;
+  }
+}
+
+@media only screen and (min-width : 960px) {
+  .input-field-group {
+    width: 300px;
+    -webkit-align-self: flex-start;
+    align-self: flex-start;
+    margin-top: 3em;
+    font-size: 1em;
+  }
+}
diff --git a/web-ui/src/common/input_field/input_field.js b/web-ui/src/common/input_field/input_field.js
new file mode 100644
index 00000000..43899419
--- /dev/null
+++ b/web-ui/src/common/input_field/input_field.js
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2017 ThoughtWorks, Inc.
+ *
+ * Pixelated is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pixelated is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import React from 'react'
+
+import './input-field.scss'
+
+const InputField = ({ label, name }) => (
+  <div className='input-field-group'>
+    <input type='text' name={name} className='input-field' required />
+    <label className='input-field-label' htmlFor={name}>{label}</label>
+  </div>
+)
+
+export default InputField
diff --git a/web-ui/src/common/submit-button.scss b/web-ui/src/common/submit-button.scss
deleted file mode 100644
index 86a24e5a..00000000
--- a/web-ui/src/common/submit-button.scss
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2017 ThoughtWorks, Inc.
- *
- * Pixelated is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pixelated is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
- */
-
-@import "~scss/base/colors";
-
-.submit-button {
-  background: $dark_blue;
-  padding: 0.8em;
-  color: $white;
-  text-align: center;
-  border: none;
-  border-radius: 2px;
-  font-weight: 300;
-  width: 100%;
-  margin-bottom: 1em;
-}
-
-@media only screen and (min-width : 500px) {
-  .submit-button {
-    flex-basis: 70%;
-    -webkit-align-self: center;
-    align-self: center;
-  }
-}
-
-@media only screen and (min-width : 960px) {
-  .submit-button {
-    width: 300px;
-    -webkit-align-self: flex-start;
-    align-self: flex-start;
-    font-size: 0.8em;
-    margin-bottom: 1em;
-  }
-}
diff --git a/web-ui/src/common/submit_button.js b/web-ui/src/common/submit_button.js
deleted file mode 100644
index 89cfc55b..00000000
--- a/web-ui/src/common/submit_button.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 ThoughtWorks, Inc.
- *
- * Pixelated is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pixelated is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import React from 'react'
-
-import './submit-button.scss'
-
-const SubmitButton = ({ buttonText }) => (
-  <input type='submit' className='submit-button' value={buttonText} />
-)
-
-export default SubmitButton
diff --git a/web-ui/src/common/submit_button/submit-button.scss b/web-ui/src/common/submit_button/submit-button.scss
new file mode 100644
index 00000000..86a24e5a
--- /dev/null
+++ b/web-ui/src/common/submit_button/submit-button.scss
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2017 ThoughtWorks, Inc.
+ *
+ * Pixelated is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pixelated is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+@import "~scss/base/colors";
+
+.submit-button {
+  background: $dark_blue;
+  padding: 0.8em;
+  color: $white;
+  text-align: center;
+  border: none;
+  border-radius: 2px;
+  font-weight: 300;
+  width: 100%;
+  margin-bottom: 1em;
+}
+
+@media only screen and (min-width : 500px) {
+  .submit-button {
+    flex-basis: 70%;
+    -webkit-align-self: center;
+    align-self: center;
+  }
+}
+
+@media only screen and (min-width : 960px) {
+  .submit-button {
+    width: 300px;
+    -webkit-align-self: flex-start;
+    align-self: flex-start;
+    font-size: 0.8em;
+    margin-bottom: 1em;
+  }
+}
diff --git a/web-ui/src/common/submit_button/submit_button.js b/web-ui/src/common/submit_button/submit_button.js
new file mode 100644
index 00000000..89cfc55b
--- /dev/null
+++ b/web-ui/src/common/submit_button/submit_button.js
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2017 ThoughtWorks, Inc.
+ *
+ * Pixelated is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pixelated is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import React from 'react'
+
+import './submit-button.scss'
+
+const SubmitButton = ({ buttonText }) => (
+  <input type='submit' className='submit-button' value={buttonText} />
+)
+
+export default SubmitButton
-- 
cgit v1.2.3


From aa26a47abac48d817a04a4f2375f1378767fa83c Mon Sep 17 00:00:00 2001
From: Tayane Fernandes <tayane.rmf@gmail.com>
Date: Tue, 7 Feb 2017 19:02:47 -0200
Subject: [#922] Fix button and input width

with @anikarni
---
 web-ui/src/common/input_field/input-field.scss     | 2 +-
 web-ui/src/common/submit_button/submit-button.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'web-ui/src/common')

diff --git a/web-ui/src/common/input_field/input-field.scss b/web-ui/src/common/input_field/input-field.scss
index ad5dda13..6ec827ab 100644
--- a/web-ui/src/common/input_field/input-field.scss
+++ b/web-ui/src/common/input_field/input-field.scss
@@ -60,7 +60,7 @@
 
 @media only screen and (min-width : 500px) {
   .input-field-group {
-    flex-basis: 70%;
+    width: 70%;
     -webkit-align-self: center;
     align-self: center;
   }
diff --git a/web-ui/src/common/submit_button/submit-button.scss b/web-ui/src/common/submit_button/submit-button.scss
index 86a24e5a..ccd0bef4 100644
--- a/web-ui/src/common/submit_button/submit-button.scss
+++ b/web-ui/src/common/submit_button/submit-button.scss
@@ -31,7 +31,7 @@
 
 @media only screen and (min-width : 500px) {
   .submit-button {
-    flex-basis: 70%;
+    width: 70%;
     -webkit-align-self: center;
     align-self: center;
   }
-- 
cgit v1.2.3


From 7f76c79319bf0817222fc88011fd870d97648963 Mon Sep 17 00:00:00 2001
From: Anike Arni <aarni@thoughtworks.com>
Date: Tue, 7 Feb 2017 19:46:45 -0200
Subject: [#922] Adds eslint for react and es6 files

---
 web-ui/src/common/input_field/input_field.js     | 5 +++++
 web-ui/src/common/submit_button/submit_button.js | 4 ++++
 2 files changed, 9 insertions(+)

(limited to 'web-ui/src/common')

diff --git a/web-ui/src/common/input_field/input_field.js b/web-ui/src/common/input_field/input_field.js
index 43899419..70d18618 100644
--- a/web-ui/src/common/input_field/input_field.js
+++ b/web-ui/src/common/input_field/input_field.js
@@ -26,4 +26,9 @@ const InputField = ({ label, name }) => (
   </div>
 )
 
+InputField.propTypes = {
+  label: React.PropTypes.string.isRequired,
+  name: React.PropTypes.string.isRequired
+}
+
 export default InputField
diff --git a/web-ui/src/common/submit_button/submit_button.js b/web-ui/src/common/submit_button/submit_button.js
index 89cfc55b..ea1bbf26 100644
--- a/web-ui/src/common/submit_button/submit_button.js
+++ b/web-ui/src/common/submit_button/submit_button.js
@@ -23,4 +23,8 @@ const SubmitButton = ({ buttonText }) => (
   <input type='submit' className='submit-button' value={buttonText} />
 )
 
+SubmitButton.propTypes = {
+  buttonText: React.PropTypes.string.isRequired
+}
+
 export default SubmitButton
-- 
cgit v1.2.3


From 94fc7554995e4b6fcd95e74d082ed411239ea8e9 Mon Sep 17 00:00:00 2001
From: Anike Arni <aarni@thoughtworks.com>
Date: Wed, 8 Feb 2017 11:11:38 -0200
Subject: [#922] Add semincolon to lint and fix js code

with @tayanefernandes
---
 web-ui/src/common/input_field/input_field.js     | 10 +++++-----
 web-ui/src/common/submit_button/submit_button.js | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'web-ui/src/common')

diff --git a/web-ui/src/common/input_field/input_field.js b/web-ui/src/common/input_field/input_field.js
index 70d18618..1378ba74 100644
--- a/web-ui/src/common/input_field/input_field.js
+++ b/web-ui/src/common/input_field/input_field.js
@@ -15,20 +15,20 @@
  * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React from 'react'
+import React from 'react';
 
-import './input-field.scss'
+import './input-field.scss';
 
 const InputField = ({ label, name }) => (
   <div className='input-field-group'>
     <input type='text' name={name} className='input-field' required />
     <label className='input-field-label' htmlFor={name}>{label}</label>
   </div>
-)
+);
 
 InputField.propTypes = {
   label: React.PropTypes.string.isRequired,
   name: React.PropTypes.string.isRequired
-}
+};
 
-export default InputField
+export default InputField;
diff --git a/web-ui/src/common/submit_button/submit_button.js b/web-ui/src/common/submit_button/submit_button.js
index ea1bbf26..fb87bf7d 100644
--- a/web-ui/src/common/submit_button/submit_button.js
+++ b/web-ui/src/common/submit_button/submit_button.js
@@ -15,16 +15,16 @@
  * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import React from 'react'
+import React from 'react';
 
-import './submit-button.scss'
+import './submit-button.scss';
 
 const SubmitButton = ({ buttonText }) => (
   <input type='submit' className='submit-button' value={buttonText} />
-)
+);
 
 SubmitButton.propTypes = {
   buttonText: React.PropTypes.string.isRequired
-}
+};
 
-export default SubmitButton
+export default SubmitButton;
-- 
cgit v1.2.3


From ea852b12e33b0e50ba7986c33ad68be5e38305ba Mon Sep 17 00:00:00 2001
From: Anike Arni <aarni@thoughtworks.com>
Date: Wed, 8 Feb 2017 13:49:54 -0200
Subject: [#922] Add css autoprefixer for compatibility with browsers

with @tayanefernandes
---
 web-ui/src/common/input_field/input-field.scss     | 4 ----
 web-ui/src/common/submit_button/submit-button.scss | 2 --
 2 files changed, 6 deletions(-)

(limited to 'web-ui/src/common')

diff --git a/web-ui/src/common/input_field/input-field.scss b/web-ui/src/common/input_field/input-field.scss
index 6ec827ab..dd8e8927 100644
--- a/web-ui/src/common/input_field/input-field.scss
+++ b/web-ui/src/common/input_field/input-field.scss
@@ -33,8 +33,6 @@
   left: 6px;
   top:10px;
   transition:0.2s ease all;
-  -moz-transition:0.2s ease all;
-  -webkit-transition:0.2s ease all;
 }
 
 .input-field {
@@ -61,7 +59,6 @@
 @media only screen and (min-width : 500px) {
   .input-field-group {
     width: 70%;
-    -webkit-align-self: center;
     align-self: center;
   }
 }
@@ -69,7 +66,6 @@
 @media only screen and (min-width : 960px) {
   .input-field-group {
     width: 300px;
-    -webkit-align-self: flex-start;
     align-self: flex-start;
     margin-top: 3em;
     font-size: 1em;
diff --git a/web-ui/src/common/submit_button/submit-button.scss b/web-ui/src/common/submit_button/submit-button.scss
index ccd0bef4..13cb7607 100644
--- a/web-ui/src/common/submit_button/submit-button.scss
+++ b/web-ui/src/common/submit_button/submit-button.scss
@@ -32,7 +32,6 @@
 @media only screen and (min-width : 500px) {
   .submit-button {
     width: 70%;
-    -webkit-align-self: center;
     align-self: center;
   }
 }
@@ -40,7 +39,6 @@
 @media only screen and (min-width : 960px) {
   .submit-button {
     width: 300px;
-    -webkit-align-self: flex-start;
     align-self: flex-start;
     font-size: 0.8em;
     margin-bottom: 1em;
-- 
cgit v1.2.3


From ad7ad7c7f781706b25b29c80c642006a4d18411a Mon Sep 17 00:00:00 2001
From: Anike Arni <aarni@thoughtworks.com>
Date: Wed, 8 Feb 2017 16:05:44 -0200
Subject: [#922] Create footer

with @tayanefernandes
---
 web-ui/src/common/footer/footer.js   | 40 +++++++++++++++++++++++++
 web-ui/src/common/footer/footer.scss | 57 ++++++++++++++++++++++++++++++++++++
 2 files changed, 97 insertions(+)
 create mode 100644 web-ui/src/common/footer/footer.js
 create mode 100644 web-ui/src/common/footer/footer.scss

(limited to 'web-ui/src/common')

diff --git a/web-ui/src/common/footer/footer.js b/web-ui/src/common/footer/footer.js
new file mode 100644
index 00000000..254a19f7
--- /dev/null
+++ b/web-ui/src/common/footer/footer.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2017 ThoughtWorks, Inc.
+ *
+ * Pixelated is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pixelated is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import React from 'react';
+import { translate } from 'react-i18next';
+import './footer.scss';
+
+export const Footer = ({ t }) => (
+  <footer className='footer-wrapper'>
+    <div className='footer-content'>
+      <img className='footer-image' src='/assets/images/lab.svg' alt='' />
+      <div>
+        {t('footer-text')}
+        <a className='footer-link' href='mailto:team@pixelated-project.org'>
+          {' team@pixelated-project.org'}
+        </a>
+      </div>
+    </div>
+  </footer>
+);
+
+Footer.propTypes = {
+  t: React.PropTypes.func.isRequired
+};
+
+export default translate('', { wait: true })(Footer);
diff --git a/web-ui/src/common/footer/footer.scss b/web-ui/src/common/footer/footer.scss
new file mode 100644
index 00000000..4ea61285
--- /dev/null
+++ b/web-ui/src/common/footer/footer.scss
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2017 ThoughtWorks, Inc.
+ *
+ * Pixelated is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pixelated is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+ */
+@import "~scss/base/colors";
+
+.footer-wrapper {
+  display: flex;
+  justify-content: center;
+  font-size: 0.8em;
+  color: $dark_slate_gray;
+}
+
+.footer-content {
+  display: inline;
+  margin: 2% 3% 5% 3%;
+  display: flex;
+  align-items: center;
+}
+
+.footer-image {
+  margin: 0 0.7em;
+}
+
+.footer-link {
+  color: $white;
+  font-style: normal;
+  font-weight: 500;
+}
+
+@media only screen and (min-width : 500px) {
+  .footer-wrapper {
+    font-size: 0.6em;
+  }
+
+  .footer-content {
+    margin: 0 0 2% 0;
+  }
+}
+
+@media only screen and (min-width : 960px) {
+  .footer-content {
+    margin-bottom: 1%;
+  }
+}
-- 
cgit v1.2.3


From b9d0bea9e6688abfbbc919f90009f59ed153e7fb Mon Sep 17 00:00:00 2001
From: Anike Arni <aarni@thoughtworks.com>
Date: Wed, 8 Feb 2017 16:41:04 -0200
Subject: [#922] Applies changes compatible with firefox

with @tayanefernandes
---
 web-ui/src/common/footer/footer.scss | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'web-ui/src/common')

diff --git a/web-ui/src/common/footer/footer.scss b/web-ui/src/common/footer/footer.scss
index 4ea61285..c1d6a285 100644
--- a/web-ui/src/common/footer/footer.scss
+++ b/web-ui/src/common/footer/footer.scss
@@ -25,7 +25,8 @@
 
 .footer-content {
   display: inline;
-  margin: 2% 3% 5% 3%;
+  margin: 2% 3%;
+  margin-bottom: 1em;
   display: flex;
   align-items: center;
 }
@@ -46,12 +47,7 @@
   }
 
   .footer-content {
-    margin: 0 0 2% 0;
-  }
-}
-
-@media only screen and (min-width : 960px) {
-  .footer-content {
-    margin-bottom: 1%;
+    margin: 0;
+    margin-bottom: 1em;
   }
 }
-- 
cgit v1.2.3


From a76b524c147c79fefa7943230a33e7904af3c070 Mon Sep 17 00:00:00 2001
From: Anike Arni <aarni@thoughtworks.com>
Date: Wed, 8 Feb 2017 17:46:11 -0200
Subject: [#922] Creates header

with @tayanefernandes
---
 web-ui/src/common/header/header.js   | 37 ++++++++++++++++++++++++
 web-ui/src/common/header/header.scss | 54 ++++++++++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+)
 create mode 100644 web-ui/src/common/header/header.js
 create mode 100644 web-ui/src/common/header/header.scss

(limited to 'web-ui/src/common')

diff --git a/web-ui/src/common/header/header.js b/web-ui/src/common/header/header.js
new file mode 100644
index 00000000..b32988c6
--- /dev/null
+++ b/web-ui/src/common/header/header.js
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2017 ThoughtWorks, Inc.
+ *
+ * Pixelated is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pixelated is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import React from 'react';
+import { translate } from 'react-i18next';
+import './header.scss';
+
+export const Header = ({ t }) => (
+  <header className='header-wrapper'>
+    <div className='header-content'>
+      <img className='header-logo' src='/startup-assets/pixelated-logo-orange.svg' alt='Pixelated' />
+    </div>
+    <div className='header-icons'>
+      <a href='/'><i className='fa fa-sign-out' aria-hidden='true'></i></a>
+    </div>
+  </header>
+);
+
+Header.propTypes = {
+  t: React.PropTypes.func.isRequired
+};
+
+export default translate('', { wait: true })(Header);
diff --git a/web-ui/src/common/header/header.scss b/web-ui/src/common/header/header.scss
new file mode 100644
index 00000000..d7472677
--- /dev/null
+++ b/web-ui/src/common/header/header.scss
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2017 ThoughtWorks, Inc.
+ *
+ * Pixelated is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pixelated is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+ */
+@import "~scss/base/colors";
+
+.header-wrapper {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  background: $white;
+  box-shadow: 0 2px 3px 0 $shadow;
+  padding: 5px 0;
+}
+
+.header-content {
+  display: flex;
+  align-items: center;
+}
+
+.header-logo {
+  width: 120px;
+}
+
+.header-icons {
+  display: flex;
+  align-items: center;
+
+  position: absolute;
+  right: 6%;
+
+  .fa {
+    font-size: 1.3em;
+    color: $medium_light_grey;
+  }
+}
+
+
+@media only screen and (min-width : 500px) {
+
+}
-- 
cgit v1.2.3


From dd4f8569848b4dbd688c07c03b17a898ed6df25d Mon Sep 17 00:00:00 2001
From: Tayane Fernandes <tayane.rmf@gmail.com>
Date: Thu, 9 Feb 2017 11:22:09 -0200
Subject: [#922] Add logo and icons to the header

with @anikarni
---
 web-ui/src/common/header/header.js   | 15 +++++++++++----
 web-ui/src/common/header/header.scss | 36 ++++++++++++++++++++++++++++++++++--
 2 files changed, 45 insertions(+), 6 deletions(-)

(limited to 'web-ui/src/common')

diff --git a/web-ui/src/common/header/header.js b/web-ui/src/common/header/header.js
index b32988c6..db9011e3 100644
--- a/web-ui/src/common/header/header.js
+++ b/web-ui/src/common/header/header.js
@@ -22,10 +22,17 @@ import './header.scss';
 export const Header = ({ t }) => (
   <header className='header-wrapper'>
     <div className='header-content'>
-      <img className='header-logo' src='/startup-assets/pixelated-logo-orange.svg' alt='Pixelated' />
-    </div>
-    <div className='header-icons'>
-      <a href='/'><i className='fa fa-sign-out' aria-hidden='true'></i></a>
+      <img
+        className='header-logo'
+        src='/startup-assets/pixelated-logo-orange.svg'
+        alt='Pixelated'
+      />
+      <div className='header-icons'>
+        <a href='/'>
+          <span>{t('logout')}</span>
+          <i className='fa fa-sign-out' aria-hidden='true' />
+        </a>
+      </div>
     </div>
   </header>
 );
diff --git a/web-ui/src/common/header/header.scss b/web-ui/src/common/header/header.scss
index d7472677..bd79280d 100644
--- a/web-ui/src/common/header/header.scss
+++ b/web-ui/src/common/header/header.scss
@@ -23,7 +23,7 @@
 
   background: $white;
   box-shadow: 0 2px 3px 0 $shadow;
-  padding: 5px 0;
+  padding: 7px 0;
 }
 
 .header-content {
@@ -42,13 +42,45 @@
   position: absolute;
   right: 6%;
 
+  span {
+    display: none;
+  }
+
   .fa {
     font-size: 1.3em;
+    margin-left: 0.4em;
     color: $medium_light_grey;
   }
 }
 
 
-@media only screen and (min-width : 500px) {
+@media only screen and (min-width : 960px) {
+  .header-content {
+    flex-basis: 64%;
+    max-width: 820px;
+    justify-content: space-between;
+  }
+
+  .header-icons {
+    position: relative;
+    right: 0;
 
+    a {
+      display: flex;
+      align-items: center;
+    }
+
+    span {
+      display: inline;
+      color: $medium_light_grey;
+      font-style: normal;
+      font-size: 0.7em;
+      padding-bottom: 0.1em;
+    }
+
+    .fa {
+      font-size: 1em;
+      margin-right: 0;
+    }
+  }
 }
-- 
cgit v1.2.3


From b2676a1f407ecf05cb0b511e563d21b4e2a0ee61 Mon Sep 17 00:00:00 2001
From: Tayane Fernandes <tayane.rmf@gmail.com>
Date: Thu, 9 Feb 2017 11:28:49 -0200
Subject: [#922] Fix webpack production path to account recovery

with @anikarni
---
 web-ui/src/common/header/header.scss | 1 +
 1 file changed, 1 insertion(+)

(limited to 'web-ui/src/common')

diff --git a/web-ui/src/common/header/header.scss b/web-ui/src/common/header/header.scss
index bd79280d..66ddfa3e 100644
--- a/web-ui/src/common/header/header.scss
+++ b/web-ui/src/common/header/header.scss
@@ -41,6 +41,7 @@
 
   position: absolute;
   right: 6%;
+  top: 13px;
 
   span {
     display: none;
-- 
cgit v1.2.3


From 32a1b251fad86ce428f43560231bf79551e8f069 Mon Sep 17 00:00:00 2001
From: Tayane Fernandes <tayane.rmf@gmail.com>
Date: Thu, 9 Feb 2017 15:51:53 -0200
Subject: [#922] Changes layout to be compatible with IE

with @anikarni
---
 web-ui/src/common/header/header.scss | 1 +
 1 file changed, 1 insertion(+)

(limited to 'web-ui/src/common')

diff --git a/web-ui/src/common/header/header.scss b/web-ui/src/common/header/header.scss
index 66ddfa3e..d56629bf 100644
--- a/web-ui/src/common/header/header.scss
+++ b/web-ui/src/common/header/header.scss
@@ -65,6 +65,7 @@
   .header-icons {
     position: relative;
     right: 0;
+    top: 0;
 
     a {
       display: flex;
-- 
cgit v1.2.3


From 1783265383a16bf702f2206ded569d3ee1af3cbc Mon Sep 17 00:00:00 2001
From: Tayane Fernandes <tayane.rmf@gmail.com>
Date: Thu, 9 Feb 2017 17:27:38 -0200
Subject: [#922] Add link for the pix logo

with @anikarni
---
 web-ui/src/common/header/header.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'web-ui/src/common')

diff --git a/web-ui/src/common/header/header.js b/web-ui/src/common/header/header.js
index db9011e3..9e5f6bc7 100644
--- a/web-ui/src/common/header/header.js
+++ b/web-ui/src/common/header/header.js
@@ -22,11 +22,13 @@ import './header.scss';
 export const Header = ({ t }) => (
   <header className='header-wrapper'>
     <div className='header-content'>
-      <img
-        className='header-logo'
-        src='/startup-assets/pixelated-logo-orange.svg'
-        alt='Pixelated'
-      />
+      <a href='/'>
+        <img
+          className='header-logo'
+          src='/startup-assets/pixelated-logo-orange.svg'
+          alt='Pixelated'
+        />
+      </a>
       <div className='header-icons'>
         <a href='/'>
           <span>{t('logout')}</span>
-- 
cgit v1.2.3


From 957599ae01687d6b3d02a3c34fdbe2ac6bd920f9 Mon Sep 17 00:00:00 2001
From: Anike Arni <aarni@thoughtworks.com>
Date: Thu, 16 Feb 2017 18:51:26 -0200
Subject: [#907] Bundles login static files separately

Due to conflicts with public and protected urls, login and interstitial
files have to be on a different public url from inbox and resources that
require login. Therefore, here, we delegate that logic to webpack. Now
we have a '/public' url and a '/assets' url for those static assets.
---
 web-ui/src/common/footer/footer.js | 2 +-
 web-ui/src/common/header/header.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'web-ui/src/common')

diff --git a/web-ui/src/common/footer/footer.js b/web-ui/src/common/footer/footer.js
index 254a19f7..c2138c21 100644
--- a/web-ui/src/common/footer/footer.js
+++ b/web-ui/src/common/footer/footer.js
@@ -22,7 +22,7 @@ import './footer.scss';
 export const Footer = ({ t }) => (
   <footer className='footer-wrapper'>
     <div className='footer-content'>
-      <img className='footer-image' src='/assets/images/lab.svg' alt='' />
+      <img className='footer-image' src='/public/images/lab.svg' alt='' />
       <div>
         {t('footer-text')}
         <a className='footer-link' href='mailto:team@pixelated-project.org'>
diff --git a/web-ui/src/common/header/header.js b/web-ui/src/common/header/header.js
index 9e5f6bc7..50c863b5 100644
--- a/web-ui/src/common/header/header.js
+++ b/web-ui/src/common/header/header.js
@@ -25,7 +25,7 @@ export const Header = ({ t }) => (
       <a href='/'>
         <img
           className='header-logo'
-          src='/startup-assets/pixelated-logo-orange.svg'
+          src='/public/images/logo-orange.svg'
           alt='Pixelated'
         />
       </a>
-- 
cgit v1.2.3


From bfd85dff6b086abae1c16014e318c89cba929b66 Mon Sep 17 00:00:00 2001
From: Anike Arni <aarni@thoughtworks.com>
Date: Fri, 17 Feb 2017 09:57:19 -0200
Subject: [#907] Makes login page responsive

---
 web-ui/src/common/input_field/input_field.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'web-ui/src/common')

diff --git a/web-ui/src/common/input_field/input_field.js b/web-ui/src/common/input_field/input_field.js
index 1378ba74..d4876d9f 100644
--- a/web-ui/src/common/input_field/input_field.js
+++ b/web-ui/src/common/input_field/input_field.js
@@ -19,16 +19,24 @@ import React from 'react';
 
 import './input-field.scss';
 
-const InputField = ({ label, name }) => (
+const InputField = ({ label, name, type = 'text' }) => (
   <div className='input-field-group'>
-    <input type='text' name={name} className='input-field' required />
+    <input
+      type={type} name={name} className='input-field'
+      autoFocus='' required
+    />
     <label className='input-field-label' htmlFor={name}>{label}</label>
   </div>
 );
 
 InputField.propTypes = {
   label: React.PropTypes.string.isRequired,
-  name: React.PropTypes.string.isRequired
+  name: React.PropTypes.string.isRequired,
+  type: React.PropTypes.string
+};
+
+InputField.defaultProps = {
+  type: 'text'
 };
 
 export default InputField;
-- 
cgit v1.2.3


From 1997c401a5e67b76663d3996ec085eb6782c34e9 Mon Sep 17 00:00:00 2001
From: Anike Arni <aarni@thoughtworks.com>
Date: Thu, 23 Feb 2017 11:34:14 -0300
Subject: [#907] Adds integration test for translations

For this test, we refactored the way translations were done for backup
account and login, concentrating them in the common/app.js component.

with @thaissiqueira
---
 web-ui/src/common/app.js | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 web-ui/src/common/app.js

(limited to 'web-ui/src/common')

diff --git a/web-ui/src/common/app.js b/web-ui/src/common/app.js
new file mode 100644
index 00000000..f6594557
--- /dev/null
+++ b/web-ui/src/common/app.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2017 ThoughtWorks, Inc.
+ *
+ * Pixelated is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pixelated is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import React from 'react';
+import { I18nextProvider } from 'react-i18next';
+
+import internationalization from '../i18n';
+
+const App = ({ i18n = internationalization, child }) => (
+  <I18nextProvider i18n={i18n}>
+    {child}
+  </I18nextProvider>
+);
+
+App.propTypes = {
+  i18n: React.PropTypes.object, // eslint-disable-line react/forbid-prop-types
+  child: React.PropTypes.element.isRequired
+};
+
+App.defaultProps = {
+  i18n: internationalization
+};
+
+export default App;
-- 
cgit v1.2.3


From db8ded2876a981b259f2ccfc5b07133e6eec666b Mon Sep 17 00:00:00 2001
From: Anike Arni <aarni@thoughtworks.com>
Date: Thu, 23 Feb 2017 17:01:58 -0300
Subject: [#907] Normalizes scss file names

with @thaissiqueira
---
 web-ui/src/common/input_field/input-field.scss     | 73 ----------------------
 web-ui/src/common/input_field/input_field.js       |  2 +-
 web-ui/src/common/input_field/input_field.scss     | 73 ++++++++++++++++++++++
 web-ui/src/common/submit_button/submit-button.scss | 46 --------------
 web-ui/src/common/submit_button/submit_button.js   |  2 +-
 web-ui/src/common/submit_button/submit_button.scss | 46 ++++++++++++++
 6 files changed, 121 insertions(+), 121 deletions(-)
 delete mode 100644 web-ui/src/common/input_field/input-field.scss
 create mode 100644 web-ui/src/common/input_field/input_field.scss
 delete mode 100644 web-ui/src/common/submit_button/submit-button.scss
 create mode 100644 web-ui/src/common/submit_button/submit_button.scss

(limited to 'web-ui/src/common')

diff --git a/web-ui/src/common/input_field/input-field.scss b/web-ui/src/common/input_field/input-field.scss
deleted file mode 100644
index dd8e8927..00000000
--- a/web-ui/src/common/input_field/input-field.scss
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2017 ThoughtWorks, Inc.
- *
- * Pixelated is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pixelated is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
- */
-
-@import "~scss/base/colors";
-
-.input-field-group {
-  position:relative;
-  margin: 1.5em 0;
-  width: 100%;
-}
-
-.input-field-label {
-  font-size: 0.9em;
-  margin-bottom: 10px;
-  display: inline-block;
-  color:#999;
-  position:absolute;
-  pointer-events:none;
-  left: 6px;
-  top:10px;
-  transition:0.2s ease all;
-}
-
-.input-field {
-  display: block;
-  border: none;
-  border-bottom: solid 1px $dark_blue;
-  width: 100%;
-  height: auto;
-  padding: 0.3em 0px;
-
-  &:focus {
-    outline:none;
-    border-width: 2px;
-  }
-}
-
-.input-field:focus ~ .input-field-label, .input-field:valid ~ .input-field-label {
-  top:-12px;
-  left: 0;
-  font-size:0.7em;
-  color: $dark_blue;
-}
-
-@media only screen and (min-width : 500px) {
-  .input-field-group {
-    width: 70%;
-    align-self: center;
-  }
-}
-
-@media only screen and (min-width : 960px) {
-  .input-field-group {
-    width: 300px;
-    align-self: flex-start;
-    margin-top: 3em;
-    font-size: 1em;
-  }
-}
diff --git a/web-ui/src/common/input_field/input_field.js b/web-ui/src/common/input_field/input_field.js
index d4876d9f..a92faeb9 100644
--- a/web-ui/src/common/input_field/input_field.js
+++ b/web-ui/src/common/input_field/input_field.js
@@ -17,7 +17,7 @@
 
 import React from 'react';
 
-import './input-field.scss';
+import './input_field.scss';
 
 const InputField = ({ label, name, type = 'text' }) => (
   <div className='input-field-group'>
diff --git a/web-ui/src/common/input_field/input_field.scss b/web-ui/src/common/input_field/input_field.scss
new file mode 100644
index 00000000..dd8e8927
--- /dev/null
+++ b/web-ui/src/common/input_field/input_field.scss
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2017 ThoughtWorks, Inc.
+ *
+ * Pixelated is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pixelated is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+@import "~scss/base/colors";
+
+.input-field-group {
+  position:relative;
+  margin: 1.5em 0;
+  width: 100%;
+}
+
+.input-field-label {
+  font-size: 0.9em;
+  margin-bottom: 10px;
+  display: inline-block;
+  color:#999;
+  position:absolute;
+  pointer-events:none;
+  left: 6px;
+  top:10px;
+  transition:0.2s ease all;
+}
+
+.input-field {
+  display: block;
+  border: none;
+  border-bottom: solid 1px $dark_blue;
+  width: 100%;
+  height: auto;
+  padding: 0.3em 0px;
+
+  &:focus {
+    outline:none;
+    border-width: 2px;
+  }
+}
+
+.input-field:focus ~ .input-field-label, .input-field:valid ~ .input-field-label {
+  top:-12px;
+  left: 0;
+  font-size:0.7em;
+  color: $dark_blue;
+}
+
+@media only screen and (min-width : 500px) {
+  .input-field-group {
+    width: 70%;
+    align-self: center;
+  }
+}
+
+@media only screen and (min-width : 960px) {
+  .input-field-group {
+    width: 300px;
+    align-self: flex-start;
+    margin-top: 3em;
+    font-size: 1em;
+  }
+}
diff --git a/web-ui/src/common/submit_button/submit-button.scss b/web-ui/src/common/submit_button/submit-button.scss
deleted file mode 100644
index 13cb7607..00000000
--- a/web-ui/src/common/submit_button/submit-button.scss
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 ThoughtWorks, Inc.
- *
- * Pixelated is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pixelated is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
- */
-
-@import "~scss/base/colors";
-
-.submit-button {
-  background: $dark_blue;
-  padding: 0.8em;
-  color: $white;
-  text-align: center;
-  border: none;
-  border-radius: 2px;
-  font-weight: 300;
-  width: 100%;
-  margin-bottom: 1em;
-}
-
-@media only screen and (min-width : 500px) {
-  .submit-button {
-    width: 70%;
-    align-self: center;
-  }
-}
-
-@media only screen and (min-width : 960px) {
-  .submit-button {
-    width: 300px;
-    align-self: flex-start;
-    font-size: 0.8em;
-    margin-bottom: 1em;
-  }
-}
diff --git a/web-ui/src/common/submit_button/submit_button.js b/web-ui/src/common/submit_button/submit_button.js
index fb87bf7d..4754e042 100644
--- a/web-ui/src/common/submit_button/submit_button.js
+++ b/web-ui/src/common/submit_button/submit_button.js
@@ -17,7 +17,7 @@
 
 import React from 'react';
 
-import './submit-button.scss';
+import './submit_button.scss';
 
 const SubmitButton = ({ buttonText }) => (
   <input type='submit' className='submit-button' value={buttonText} />
diff --git a/web-ui/src/common/submit_button/submit_button.scss b/web-ui/src/common/submit_button/submit_button.scss
new file mode 100644
index 00000000..13cb7607
--- /dev/null
+++ b/web-ui/src/common/submit_button/submit_button.scss
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2017 ThoughtWorks, Inc.
+ *
+ * Pixelated is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pixelated is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+@import "~scss/base/colors";
+
+.submit-button {
+  background: $dark_blue;
+  padding: 0.8em;
+  color: $white;
+  text-align: center;
+  border: none;
+  border-radius: 2px;
+  font-weight: 300;
+  width: 100%;
+  margin-bottom: 1em;
+}
+
+@media only screen and (min-width : 500px) {
+  .submit-button {
+    width: 70%;
+    align-self: center;
+  }
+}
+
+@media only screen and (min-width : 960px) {
+  .submit-button {
+    width: 300px;
+    align-self: flex-start;
+    font-size: 0.8em;
+    margin-bottom: 1em;
+  }
+}
-- 
cgit v1.2.3


From fb4630207d86d39ea05dd679b2724be87597c518 Mon Sep 17 00:00:00 2001
From: Anike Arni <aarni@thoughtworks.com>
Date: Thu, 23 Feb 2017 17:50:56 -0300
Subject: [#907] Moves i18n and util files to common directory

with @thaissiqueira
---
 web-ui/src/common/app.js  |  2 +-
 web-ui/src/common/i18n.js | 40 ++++++++++++++++++++++++++++++++++++++++
 web-ui/src/common/util.js |  8 ++++++++
 3 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 web-ui/src/common/i18n.js
 create mode 100644 web-ui/src/common/util.js

(limited to 'web-ui/src/common')

diff --git a/web-ui/src/common/app.js b/web-ui/src/common/app.js
index f6594557..03a69fc9 100644
--- a/web-ui/src/common/app.js
+++ b/web-ui/src/common/app.js
@@ -18,7 +18,7 @@
 import React from 'react';
 import { I18nextProvider } from 'react-i18next';
 
-import internationalization from '../i18n';
+import internationalization from 'src/common/i18n';
 
 const App = ({ i18n = internationalization, child }) => (
   <I18nextProvider i18n={i18n}>
diff --git a/web-ui/src/common/i18n.js b/web-ui/src/common/i18n.js
new file mode 100644
index 00000000..db107dc7
--- /dev/null
+++ b/web-ui/src/common/i18n.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2017 ThoughtWorks, Inc.
+ *
+ * Pixelated is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pixelated is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+ */
+import i18n from 'i18next';
+import i18nBackend from 'i18nextXHRBackend';
+import I18nDetector from 'i18nextBrowserLanguageDetector';
+
+const detector = new I18nDetector();
+const detect = detector.detect.bind(detector);
+
+detector.detect = (detectionOrder) => {
+  const result = detect(detectionOrder);
+  return result.replace('-', '_');
+};
+
+i18n
+  .use(i18nBackend)
+  .use(detector)
+  .init({
+    fallbackLng: 'en_US',
+    parseMissingKeyHandler: key => (`"${key} untranslated"`),
+    backend: {
+      loadPath: 'public/locales/{{lng}}/{{ns}}.json'
+    }
+  });
+
+export default i18n;
diff --git a/web-ui/src/common/util.js b/web-ui/src/common/util.js
new file mode 100644
index 00000000..effb3d9c
--- /dev/null
+++ b/web-ui/src/common/util.js
@@ -0,0 +1,8 @@
+export const hasQueryParameter = (param) => {
+  const decodedUri = decodeURIComponent(window.location.search.substring(1));
+  return !(decodedUri.split('&').indexOf(param) < 0);
+};
+
+export default {
+  hasQueryParameter
+};
-- 
cgit v1.2.3


From fec26b211a42b068e677ac5b43080bd4bf59e47a Mon Sep 17 00:00:00 2001
From: Thais Siqueira <thais.siqueira@gmail.com>
Date: Fri, 24 Feb 2017 14:27:31 -0300
Subject: [#907] Moves tests to directories components

---
 web-ui/src/common/footer/footer.spec.js              | 17 +++++++++++++++++
 web-ui/src/common/header/header.spec.js              | 17 +++++++++++++++++
 web-ui/src/common/input_field/input_field.spec.js    | 20 ++++++++++++++++++++
 .../src/common/submit_button/submit_button.spec.js   | 16 ++++++++++++++++
 web-ui/src/common/util.spec.js                       | 20 ++++++++++++++++++++
 5 files changed, 90 insertions(+)
 create mode 100644 web-ui/src/common/footer/footer.spec.js
 create mode 100644 web-ui/src/common/header/header.spec.js
 create mode 100644 web-ui/src/common/input_field/input_field.spec.js
 create mode 100644 web-ui/src/common/submit_button/submit_button.spec.js
 create mode 100644 web-ui/src/common/util.spec.js

(limited to 'web-ui/src/common')

diff --git a/web-ui/src/common/footer/footer.spec.js b/web-ui/src/common/footer/footer.spec.js
new file mode 100644
index 00000000..f1247233
--- /dev/null
+++ b/web-ui/src/common/footer/footer.spec.js
@@ -0,0 +1,17 @@
+import { shallow } from 'enzyme';
+import expect from 'expect';
+import React from 'react';
+import { Footer } from 'src/common/footer/footer';
+
+describe('Footer', () => {
+  let footer;
+
+  beforeEach(() => {
+    const mockTranslations = key => key;
+    footer = shallow(<Footer t={mockTranslations} />);
+  });
+
+  it('renders the footer content', () => {
+    expect(footer.find('footer').text()).toContain('footer-text');
+  });
+});
diff --git a/web-ui/src/common/header/header.spec.js b/web-ui/src/common/header/header.spec.js
new file mode 100644
index 00000000..82e29e1c
--- /dev/null
+++ b/web-ui/src/common/header/header.spec.js
@@ -0,0 +1,17 @@
+import { shallow } from 'enzyme';
+import expect from 'expect';
+import React from 'react';
+import { Header } from 'src/common/header/header';
+
+describe('Header', () => {
+  let header;
+
+  beforeEach(() => {
+    const mockTranslations = key => key;
+    header = shallow(<Header t={mockTranslations} />);
+  });
+
+  it('renders the header content', () => {
+    expect(header.find('header').text()).toContain('logout');
+  });
+});
diff --git a/web-ui/src/common/input_field/input_field.spec.js b/web-ui/src/common/input_field/input_field.spec.js
new file mode 100644
index 00000000..0c044ce1
--- /dev/null
+++ b/web-ui/src/common/input_field/input_field.spec.js
@@ -0,0 +1,20 @@
+import { shallow } from 'enzyme';
+import expect from 'expect';
+import React from 'react';
+import InputField from 'src/common/input_field/input_field';
+
+describe('InputField', () => {
+  let inputField;
+
+  beforeEach(() => {
+    inputField = shallow(<InputField label='Email' name='email' />);
+  });
+
+  it('renders an input of type text for email', () => {
+    expect(inputField.find('input[type="text"]').props().name).toEqual('email');
+  });
+
+  it('renders a label for the email', () => {
+    expect(inputField.find('label').text()).toEqual('Email');
+  });
+});
diff --git a/web-ui/src/common/submit_button/submit_button.spec.js b/web-ui/src/common/submit_button/submit_button.spec.js
new file mode 100644
index 00000000..8279547c
--- /dev/null
+++ b/web-ui/src/common/submit_button/submit_button.spec.js
@@ -0,0 +1,16 @@
+import { shallow } from 'enzyme';
+import expect from 'expect';
+import React from 'react';
+import SubmitButton from 'src/common/submit_button/submit_button';
+
+describe('SubmitButton', () => {
+  let submitButton;
+
+  beforeEach(() => {
+    submitButton = shallow(<SubmitButton buttonText='Add Email' />);
+  });
+
+  it('renders an input of type submit for add email', () => {
+    expect(submitButton.find('input[type="submit"]').props().value).toEqual('Add Email');
+  });
+});
diff --git a/web-ui/src/common/util.spec.js b/web-ui/src/common/util.spec.js
new file mode 100644
index 00000000..805d9dd5
--- /dev/null
+++ b/web-ui/src/common/util.spec.js
@@ -0,0 +1,20 @@
+import expect from 'expect';
+import Util from 'src/common/util';
+
+describe('Utils', () => {
+  describe('.hasQueryParameter', () => {
+    global.window = {
+      location: {
+        search: '?auth-error&lng=pt-BR'
+      }
+    };
+
+    it('checks if param included in query parameters', () => {
+      expect(Util.hasQueryParameter('auth-error')).toBe(true);
+    });
+
+    it('checks if param not included in query parameters', () => {
+      expect(Util.hasQueryParameter('error')).toBe(false);
+    });
+  });
+});
-- 
cgit v1.2.3


From 1a1999cc129fe4d9046a22146deca6838a6fb1d5 Mon Sep 17 00:00:00 2001
From: Thais Siqueira <thais.siqueira@gmail.com>
Date: Wed, 1 Mar 2017 11:39:36 -0300
Subject: [#907] Puts autofocus on username field.

with @anikarni
---
 web-ui/src/common/input_field/input_field.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'web-ui/src/common')

diff --git a/web-ui/src/common/input_field/input_field.js b/web-ui/src/common/input_field/input_field.js
index a92faeb9..332d5911 100644
--- a/web-ui/src/common/input_field/input_field.js
+++ b/web-ui/src/common/input_field/input_field.js
@@ -19,11 +19,11 @@ import React from 'react';
 
 import './input_field.scss';
 
-const InputField = ({ label, name, type = 'text' }) => (
+const InputField = ({ label, name, type = 'text', ...other }) => (
   <div className='input-field-group'>
     <input
       type={type} name={name} className='input-field'
-      autoFocus='' required
+      required {...other}
     />
     <label className='input-field-label' htmlFor={name}>{label}</label>
   </div>
-- 
cgit v1.2.3


From 99d03c1f4b2d4e10561fc4d0bef14ccd12ad0f9d Mon Sep 17 00:00:00 2001
From: Tayane Fernandes <tayane.rmf@gmail.com>
Date: Tue, 7 Mar 2017 14:22:49 -0300
Subject: [#923] Add material-ui framework

Added material-ui framework (http://www.material-ui.com/#/) to facilitate
the creation of UI components. I also adapted some colors to be compatible
with our style guide.
---
 web-ui/src/common/app.js                          | 13 +++++++--
 web-ui/src/common/input_field/input_field.js      | 12 +++++---
 web-ui/src/common/input_field/input_field.scss    | 34 ++---------------------
 web-ui/src/common/input_field/input_field.spec.js |  4 +--
 web-ui/src/common/materialPixTheme.js             | 31 +++++++++++++++++++++
 5 files changed, 53 insertions(+), 41 deletions(-)
 create mode 100644 web-ui/src/common/materialPixTheme.js

(limited to 'web-ui/src/common')

diff --git a/web-ui/src/common/app.js b/web-ui/src/common/app.js
index 03a69fc9..b8302000 100644
--- a/web-ui/src/common/app.js
+++ b/web-ui/src/common/app.js
@@ -19,11 +19,18 @@ import React from 'react';
 import { I18nextProvider } from 'react-i18next';
 
 import internationalization from 'src/common/i18n';
+import injectTapEventPlugin from 'react-tap-event-plugin';
+import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider';
+import materialPixTheme from 'src/common/materialPixTheme';
+
+injectTapEventPlugin();
 
 const App = ({ i18n = internationalization, child }) => (
-  <I18nextProvider i18n={i18n}>
-    {child}
-  </I18nextProvider>
+  <MuiThemeProvider muiTheme={materialPixTheme}>
+    <I18nextProvider i18n={i18n}>
+      {child}
+    </I18nextProvider>
+  </MuiThemeProvider>
 );
 
 App.propTypes = {
diff --git a/web-ui/src/common/input_field/input_field.js b/web-ui/src/common/input_field/input_field.js
index 332d5911..438241e1 100644
--- a/web-ui/src/common/input_field/input_field.js
+++ b/web-ui/src/common/input_field/input_field.js
@@ -16,16 +16,20 @@
  */
 
 import React from 'react';
+import TextField from 'material-ui/TextField';
 
 import './input_field.scss';
 
 const InputField = ({ label, name, type = 'text', ...other }) => (
   <div className='input-field-group'>
-    <input
-      type={type} name={name} className='input-field'
-      required {...other}
+    <TextField
+      hintText={label}
+      floatingLabelText={label}
+      name={name}
+      type={type}
+      fullWidth
+      {...other}
     />
-    <label className='input-field-label' htmlFor={name}>{label}</label>
   </div>
 );
 
diff --git a/web-ui/src/common/input_field/input_field.scss b/web-ui/src/common/input_field/input_field.scss
index dd8e8927..d550a281 100644
--- a/web-ui/src/common/input_field/input_field.scss
+++ b/web-ui/src/common/input_field/input_field.scss
@@ -23,37 +23,8 @@
   width: 100%;
 }
 
-.input-field-label {
-  font-size: 0.9em;
-  margin-bottom: 10px;
-  display: inline-block;
-  color:#999;
-  position:absolute;
-  pointer-events:none;
-  left: 6px;
-  top:10px;
-  transition:0.2s ease all;
-}
-
-.input-field {
-  display: block;
-  border: none;
-  border-bottom: solid 1px $dark_blue;
-  width: 100%;
-  height: auto;
-  padding: 0.3em 0px;
-
-  &:focus {
-    outline:none;
-    border-width: 2px;
-  }
-}
-
-.input-field:focus ~ .input-field-label, .input-field:valid ~ .input-field-label {
-  top:-12px;
-  left: 0;
-  font-size:0.7em;
-  color: $dark_blue;
+input:-webkit-autofill {
+    -webkit-box-shadow: 0 0 0px 1000px white inset;
 }
 
 @media only screen and (min-width : 500px) {
@@ -67,7 +38,6 @@
   .input-field-group {
     width: 300px;
     align-self: flex-start;
-    margin-top: 3em;
     font-size: 1em;
   }
 }
diff --git a/web-ui/src/common/input_field/input_field.spec.js b/web-ui/src/common/input_field/input_field.spec.js
index 0c044ce1..ae55653d 100644
--- a/web-ui/src/common/input_field/input_field.spec.js
+++ b/web-ui/src/common/input_field/input_field.spec.js
@@ -11,10 +11,10 @@ describe('InputField', () => {
   });
 
   it('renders an input of type text for email', () => {
-    expect(inputField.find('input[type="text"]').props().name).toEqual('email');
+    expect(inputField.find('TextField').props().name).toEqual('email');
   });
 
   it('renders a label for the email', () => {
-    expect(inputField.find('label').text()).toEqual('Email');
+    expect(inputField.find('TextField').props().floatingLabelText).toEqual('Email');
   });
 });
diff --git a/web-ui/src/common/materialPixTheme.js b/web-ui/src/common/materialPixTheme.js
new file mode 100644
index 00000000..34be7870
--- /dev/null
+++ b/web-ui/src/common/materialPixTheme.js
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2017 ThoughtWorks, Inc.
+ *
+ * Pixelated is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pixelated is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+ */
+import getMuiTheme from 'material-ui/styles/getMuiTheme';
+
+const mediumLightGrey = '#999999';
+const darkBlue = '#178ca6';
+
+const materialPixTheme = getMuiTheme({
+  fontFamily: 'Open Sans, sans-serif',
+  palette: {
+    disabledColor: mediumLightGrey,
+    primary1Color: darkBlue,
+    borderColor: darkBlue
+  }
+});
+
+export default materialPixTheme;
-- 
cgit v1.2.3


From aad05a38511a8bdd9bd13d2d38092ce6b35ac46b Mon Sep 17 00:00:00 2001
From: Tayane Fernandes <tayane.rmf@gmail.com>
Date: Thu, 9 Mar 2017 18:54:10 -0300
Subject: [#923] Disable button when the email is invalid on the backup email
 page

with @FrailWords
---
 web-ui/src/common/submit_button/submit_button.js      | 14 +++++++++++---
 web-ui/src/common/submit_button/submit_button.scss    |  7 -------
 web-ui/src/common/submit_button/submit_button.spec.js |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'web-ui/src/common')

diff --git a/web-ui/src/common/submit_button/submit_button.js b/web-ui/src/common/submit_button/submit_button.js
index 4754e042..1e7da021 100644
--- a/web-ui/src/common/submit_button/submit_button.js
+++ b/web-ui/src/common/submit_button/submit_button.js
@@ -16,15 +16,23 @@
  */
 
 import React from 'react';
+import RaisedButton from 'material-ui/RaisedButton';
 
 import './submit_button.scss';
 
-const SubmitButton = ({ buttonText }) => (
-  <input type='submit' className='submit-button' value={buttonText} />
+const SubmitButton = ({ buttonText, disabled }) => (
+  <div className='submit-button'>
+    <RaisedButton primary label={buttonText} disabled={disabled} fullWidth labelStyle={{ textTransform: 'none' }} />
+  </div>
 );
 
 SubmitButton.propTypes = {
-  buttonText: React.PropTypes.string.isRequired
+  buttonText: React.PropTypes.string.isRequired,
+  disabled: React.PropTypes.boolean
+};
+
+SubmitButton.defaultProps = {
+  disabled: true
 };
 
 export default SubmitButton;
diff --git a/web-ui/src/common/submit_button/submit_button.scss b/web-ui/src/common/submit_button/submit_button.scss
index 13cb7607..ac1307a8 100644
--- a/web-ui/src/common/submit_button/submit_button.scss
+++ b/web-ui/src/common/submit_button/submit_button.scss
@@ -18,13 +18,6 @@
 @import "~scss/base/colors";
 
 .submit-button {
-  background: $dark_blue;
-  padding: 0.8em;
-  color: $white;
-  text-align: center;
-  border: none;
-  border-radius: 2px;
-  font-weight: 300;
   width: 100%;
   margin-bottom: 1em;
 }
diff --git a/web-ui/src/common/submit_button/submit_button.spec.js b/web-ui/src/common/submit_button/submit_button.spec.js
index 8279547c..d4308e6d 100644
--- a/web-ui/src/common/submit_button/submit_button.spec.js
+++ b/web-ui/src/common/submit_button/submit_button.spec.js
@@ -11,6 +11,6 @@ describe('SubmitButton', () => {
   });
 
   it('renders an input of type submit for add email', () => {
-    expect(submitButton.find('input[type="submit"]').props().value).toEqual('Add Email');
+    expect(submitButton.find('RaisedButton').props().label).toEqual('Add Email');
   });
 });
-- 
cgit v1.2.3


From 29a59d4ec216a895c8004fc0addbec1b329df200 Mon Sep 17 00:00:00 2001
From: Tayane Fernandes <tayane.rmf@gmail.com>
Date: Fri, 10 Mar 2017 14:29:27 -0300
Subject: [#923] Fix submit button style of material-ui

with @FrailWords
---
 web-ui/src/common/submit_button/submit_button.js   | 26 ++++++++++++++++++----
 web-ui/src/common/submit_button/submit_button.scss |  1 +
 .../src/common/submit_button/submit_button.spec.js |  4 ++++
 3 files changed, 27 insertions(+), 4 deletions(-)

(limited to 'web-ui/src/common')

diff --git a/web-ui/src/common/submit_button/submit_button.js b/web-ui/src/common/submit_button/submit_button.js
index 1e7da021..73f9b21c 100644
--- a/web-ui/src/common/submit_button/submit_button.js
+++ b/web-ui/src/common/submit_button/submit_button.js
@@ -20,19 +20,37 @@ import RaisedButton from 'material-ui/RaisedButton';
 
 import './submit_button.scss';
 
-const SubmitButton = ({ buttonText, disabled }) => (
+const labelStyle = {
+  textTransform: 'none',
+  fontSize: '1em',
+  lineHeight: '48px'
+};
+
+const buttonStyle = {
+  height: '48px'
+};
+
+const SubmitButton = ({ buttonText, disabled=false }) => (
   <div className='submit-button'>
-    <RaisedButton primary label={buttonText} disabled={disabled} fullWidth labelStyle={{ textTransform: 'none' }} />
+    <RaisedButton type='submit'
+      label={buttonText}
+      disabled={disabled}
+      labelStyle={labelStyle}
+      buttonStyle={buttonStyle}
+      overlayStyle={buttonStyle}
+      fullWidth
+      primary
+    />
   </div>
 );
 
 SubmitButton.propTypes = {
   buttonText: React.PropTypes.string.isRequired,
-  disabled: React.PropTypes.boolean
+  disabled: React.PropTypes.bool
 };
 
 SubmitButton.defaultProps = {
-  disabled: true
+  disabled: false
 };
 
 export default SubmitButton;
diff --git a/web-ui/src/common/submit_button/submit_button.scss b/web-ui/src/common/submit_button/submit_button.scss
index ac1307a8..851899f7 100644
--- a/web-ui/src/common/submit_button/submit_button.scss
+++ b/web-ui/src/common/submit_button/submit_button.scss
@@ -20,6 +20,7 @@
 .submit-button {
   width: 100%;
   margin-bottom: 1em;
+  font-size: 1em;
 }
 
 @media only screen and (min-width : 500px) {
diff --git a/web-ui/src/common/submit_button/submit_button.spec.js b/web-ui/src/common/submit_button/submit_button.spec.js
index d4308e6d..0ba8137c 100644
--- a/web-ui/src/common/submit_button/submit_button.spec.js
+++ b/web-ui/src/common/submit_button/submit_button.spec.js
@@ -13,4 +13,8 @@ describe('SubmitButton', () => {
   it('renders an input of type submit for add email', () => {
     expect(submitButton.find('RaisedButton').props().label).toEqual('Add Email');
   });
+
+  it('renders button in enabled state', () => {
+    expect(submitButton.find('RaisedButton').props().disabled).toEqual(false);
+  });
 });
-- 
cgit v1.2.3


From 9e5dce775c51b44cf7b17d8ab564fdefc16a06c0 Mon Sep 17 00:00:00 2001
From: Tayane Fernandes <tayane.rmf@gmail.com>
Date: Fri, 10 Mar 2017 15:25:43 -0300
Subject: [#923] Fix the submit button when the email is empty

When the email is empty the button should be disabled, but we should not see
any error message

with @FrailWords
---
 web-ui/src/common/submit_button/submit_button.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'web-ui/src/common')

diff --git a/web-ui/src/common/submit_button/submit_button.js b/web-ui/src/common/submit_button/submit_button.js
index 73f9b21c..1224c7bd 100644
--- a/web-ui/src/common/submit_button/submit_button.js
+++ b/web-ui/src/common/submit_button/submit_button.js
@@ -30,9 +30,10 @@ const buttonStyle = {
   height: '48px'
 };
 
-const SubmitButton = ({ buttonText, disabled=false }) => (
+const SubmitButton = ({ buttonText, disabled = false }) => (
   <div className='submit-button'>
-    <RaisedButton type='submit'
+    <RaisedButton
+      type='submit'
       label={buttonText}
       disabled={disabled}
       labelStyle={labelStyle}
-- 
cgit v1.2.3


From 471b58e945613956db951b3a7b87c9c528b152a4 Mon Sep 17 00:00:00 2001
From: Tayane Fernandes <tayane.rmf@gmail.com>
Date: Fri, 10 Mar 2017 18:25:54 -0300
Subject: [#923] Make the label for the input text always blue

with @FrailWords
---
 web-ui/src/common/input_field/input_field.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'web-ui/src/common')

diff --git a/web-ui/src/common/input_field/input_field.js b/web-ui/src/common/input_field/input_field.js
index 438241e1..f50fc2b1 100644
--- a/web-ui/src/common/input_field/input_field.js
+++ b/web-ui/src/common/input_field/input_field.js
@@ -28,6 +28,7 @@ const InputField = ({ label, name, type = 'text', ...other }) => (
       name={name}
       type={type}
       fullWidth
+      floatingLabelFocusStyle={{ color: '#178ca6' }}
       {...other}
     />
   </div>
-- 
cgit v1.2.3