diff --git a/js/components/ascribe_forms/form.js b/js/components/ascribe_forms/form.js
index fb2f77af..f767141f 100644
--- a/js/components/ascribe_forms/form.js
+++ b/js/components/ascribe_forms/form.js
@@ -54,10 +54,10 @@ let Form = React.createClass({
},
getFormData(){
- if ('getFormData' in this.props){
- return this.props.getFormData();
- }
let data = {};
+ if ('getFormData' in this.props){
+ data = this.props.getFormData();
+ }
for (let ref in this.refs){
data[this.refs[ref].props.name] = this.refs[ref].state.value;
}
diff --git a/js/components/header.js b/js/components/header.js
index ef8566e4..5f3b9634 100644
--- a/js/components/header.js
+++ b/js/components/header.js
@@ -66,12 +66,16 @@ let Header = React.createClass({
getPoweredBy(){
if (this.state.whitelabel.logo) {
return (
-
-
- {getLangText('powered by')}
- ascribe
-
-
+
);
}
return null;
diff --git a/js/components/password_reset_container.js b/js/components/password_reset_container.js
index 56f7aae6..43501436 100644
--- a/js/components/password_reset_container.js
+++ b/js/components/password_reset_container.js
@@ -106,9 +106,6 @@ let PasswordResetForm = React.createClass({
getFormData(){
let data = {};
- for (let ref in this.refs.form.refs){
- data[this.refs.form.refs[ref].props.name] = this.refs.form.refs[ref].state.value;
- }
data.email = this.props.email;
data.token = this.props.token;
return data;
diff --git a/sass/main.scss b/sass/main.scss
index df8b4285..c24bf373 100644
--- a/sass/main.scss
+++ b/sass/main.scss
@@ -62,6 +62,11 @@ hr {
font-size: 0.8em;
}
+.img-brand {
+ padding: 0;
+ height: 45px;
+ margin: 5px 0 5px 0;
+}
.truncate {
white-space: nowrap;
width: 4em;
@@ -96,10 +101,6 @@ hr {
color: $ascribe-color;
}
-.img-brand{
- height: 25px;
-}
-
.ascribe-subheader{
padding-bottom: 10px;
margin-top: -10px;