clipperz
/
password-manager-mirror
mirror of http://git.whoc.org.uk/git/password-manager.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed UnlockPage to look like LoginPage

master-GE
Giulio Cesare Solaroli 2015-10-02 14:49:05 +02:00
parent a12479f968
commit f2b85dd506
No known key found for this signature in database
GPG Key ID: 22E34C908F02CBA2
6 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
frontend/delta/css/clipperz.css
View File

@ -1575,13 +1575,13 @@ div.help {
color: white; color: white;
margin: 0px; } margin: 0px; }
#loginPage .content { #loginPage .content, #unlockPage .content {
background-color: #ff9900; } background-color: #ff9900; }
#loginPage .content .body { #loginPage .content .body, #unlockPage .content .body {
background-color: #ff9900; } background-color: #ff9900; }
#loginPage .content .other { #loginPage .content .other, #unlockPage .content .other {
color: white; } color: white; }
#loginPage .content footer { #loginPage .content footer, #unlockPage .content footer {
color: white; color: white;
background-color: black; } background-color: black; }
@ -1595,14 +1595,22 @@ div.help {
color: black; color: black;
background-color: #ff9900; } background-color: #ff9900; }
#unlockPage .content { /*
background-color: #ff9900; } #unlockPage {
#unlockPage .content .body { .content {
background-color: #ff9900; } background-color: $main-color;
#unlockPage .content footer {
color: white;
background-color: black; }
.body {
background-color: $main-color;
}
footer {
color: $main-alternate-text-color;
background-color: $main-alternate-color;
}
}
}
*/
#loginPage, #registrationPage, #unlockPage { #loginPage, #registrationPage, #unlockPage {
background-color: black; } background-color: black; }
#loginPage .content, #registrationPage .content, #unlockPage .content { #loginPage .content, #registrationPage .content, #unlockPage .content {
@ -3335,7 +3343,7 @@ div.cardList.narrow {
border: 0px; } border: 0px; }
.content input.cardLabel { .content input.cardLabel {
width: 100%; width: 100%;
padding: 20px 20px 20px 42px; } padding: 13px 20px 13px 42px; }
.content .tagEditor { .content .tagEditor {
padding: 10px; } padding: 10px; }
.content .cardNotes { .content .cardNotes {

2
frontend/delta/css/clipperz.css.map
View File

File diff suppressed because one or more lines are too long

5
frontend/delta/js/Clipperz/PM/UI/Components/Pages/LoginPage.js
View File

@ -229,10 +229,6 @@ Clipperz.PM.UI.Components.Pages.LoginPageClass = React.createClass({
}, },
render: function() { 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"); 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']}, [ 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
]); ]);
} }
}); });

9
frontend/delta/js/Clipperz/PM/UI/Components/Pages/UnlockPage.js
View File

@ -187,8 +187,9 @@ Clipperz.PM.UI.Components.Pages.UnlockPageClass = React.createClass({
this.mode() == 'PIN' ? this.pinForm() : this.loginForm(), this.mode() == 'PIN' ? this.pinForm() : this.loginForm(),
]), ]),
]), ]),
React.DOM.footer({'key':'footer'}, [ React.DOM.div({'key':'afterBody', 'className':'afterBody'}),
React.DOM.div({'className':'footerContent'}, [ React.DOM.div({'className':'other', 'key':'other'}, [
React.DOM.div({'className':'otherContent'}, [
React.DOM.div({'key':'links', 'className':'links'}, [ React.DOM.div({'key':'links', 'className':'links'}, [
React.DOM.ul({}, [ React.DOM.ul({}, [
React.DOM.li({'key':'about', 'onClick':this.showUrl('/about/')}, "About"), React.DOM.li({'key':'about', 'onClick':this.showUrl('/about/')}, "About"),
@ -196,6 +197,10 @@ Clipperz.PM.UI.Components.Pages.UnlockPageClass = React.createClass({
React.DOM.li({'key':'privacy', 'onClick':this.showUrl('/privacy_policy/')}, "Privacy"), 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.div({'key':'applicationVersion', 'className':'applicationVersion'}, [
React.DOM.span({'key':'applicationVersionLabel'}, "application version"), 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) React.DOM.a({'key':'applicationVersionLink', 'href':'https://github.com/clipperz/password-manager/commit/' + Clipperz_version, 'target':'github'}, Clipperz_version)

3
frontend/delta/scss/style/card.scss
View File

@ -398,7 +398,8 @@ $cardViewBasePadding: 10px;
input.cardLabel { input.cardLabel {
width: 100%; width: 100%;
padding: 20px 20px 20px 42px; // padding: 20px 20px 20px 42px;
padding: 13px 20px 13px 42px;
// height: 52px; // height: 52px;
} }

5
frontend/delta/scss/style/loginPage.scss
View File

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