Fixed UnlockPage to look like LoginPage

clipperz · Oct 2, 2015 · f2b85dd · f2b85dd
1 parent a12479f
commit f2b85dd
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 23 deletions.
diff --git a/frontend/delta/css/clipperz.css b/frontend/delta/css/clipperz.css
diff --git a/frontend/delta/css/clipperz.css.map b/frontend/delta/css/clipperz.css.map
diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/Pages/LoginPage.js b/frontend/delta/js/Clipperz/PM/UI/Components/Pages/LoginPage.js
@@ -229,10 +229,6 @@ Clipperz.PM.UI.Components.Pages.LoginPageClass = React.createClass({
 	},
 
 	render: function() {
-//		var registrationLink =	React.DOM.footer({'key':'registrationLink', 'className':'registrationLink'}, [
-//									React.DOM.a({'key':'signup', 'onClick':this.handleRegistrationLinkClick}, "Sign up")
-//								]);
-
 		var	registrationLink = React.DOM.a({'key':'signup', 'className':'registrationLink', 'onClick':this.handleRegistrationLinkClick}, "sign up");
 
 		return React.DOM.div({'key':'loginForm', 'className':'loginForm content ' + this.props['style']}, [
@@ -269,7 +265,6 @@ Clipperz.PM.UI.Components.Pages.LoginPageClass = React.createClass({
 					])
 				])
 			])
-//			this.props['isNewUserRegistrationAvailable'] ? registrationLink : null
 		]);
 	}
 });

diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/Pages/UnlockPage.js b/frontend/delta/js/Clipperz/PM/UI/Components/Pages/UnlockPage.js
@@ -187,15 +187,20 @@ Clipperz.PM.UI.Components.Pages.UnlockPageClass = React.createClass({
 					this.mode() == 'PIN' ? this.pinForm() : this.loginForm(),
 				]),
 			]),
-			React.DOM.footer({'key':'footer'}, [
-				React.DOM.div({'className':'footerContent'}, [
+			React.DOM.div({'key':'afterBody', 'className':'afterBody'}),
+			React.DOM.div({'className':'other', 'key':'other'}, [
+				React.DOM.div({'className':'otherContent'}, [
 					React.DOM.div({'key':'links', 'className':'links'}, [
 						React.DOM.ul({}, [
 							React.DOM.li({'key':'about',   'onClick':this.showUrl('/about/')}, "About"),
 							React.DOM.li({'key':'terms',   'onClick':this.showUrl('/terms_service/')}, "Terms of service"),
 							React.DOM.li({'key':'privacy', 'onClick':this.showUrl('/privacy_policy/')}, "Privacy"),
 						])
 					]),
+				])
+			]),
+			React.DOM.footer({'key':'footer'}, [
+				React.DOM.div({'className':'footerContent'}, [
 					React.DOM.div({'key':'applicationVersion', 'className':'applicationVersion'}, [
 						React.DOM.span({'key':'applicationVersionLabel'}, "application version"),
 						React.DOM.a({'key':'applicationVersionLink', 'href':'https://github.com/clipperz/password-manager/commit/' + Clipperz_version, 'target':'github'}, Clipperz_version)

diff --git a/frontend/delta/scss/style/card.scss b/frontend/delta/scss/style/card.scss
@@ -398,7 +398,8 @@ $cardViewBasePadding: 10px;
 
 	input.cardLabel {
 		width: 100%;
-		padding: 20px 20px 20px 42px;
+//		padding: 20px 20px 20px 42px;
+		padding: 13px 20px 13px 42px;
 //		height: 52px;
 	}
 

diff --git a/frontend/delta/scss/style/loginPage.scss b/frontend/delta/scss/style/loginPage.scss
@@ -21,7 +21,7 @@ refer to http://www.clipperz.com.
 
 */
 
-#loginPage {
+#loginPage, #unlockPage {
 	.content {
 		background-color: $main-color;
 
@@ -73,7 +73,7 @@ refer to http://www.clipperz.com.
 		}
 	}
 }
-
+/*
 #unlockPage {
 	.content {
 		background-color: $main-color;
@@ -88,6 +88,7 @@ refer to http://www.clipperz.com.
 		}
 	}
 }
+*/
 //==============================================================
 
 #loginPage, #registrationPage, #unlockPage {