clipperz/password-manager-mirror
1
0
Fork 0
mirror of http://git.whoc.org.uk/git/password-manager.git synced 2024-11-14 23:59:02 +01:00
Code Issues Releases Wiki Activity

Updated login and registration page to behave correctly when displayed on devices with small screens

Browse Source
This commit is contained in:
Giulio Cesare Solaroli 2015-10-01 16:36:00 +02:00
parent 3dcdcbbe7e
commit 8bbe3dcfec
7 changed files with 460 additions and 353 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,6 +119,7 @@ http://jonibologna.com/flexbox-cheatsheet/
-ms-transform: rotate(0deg) translate(0, 0); -ms-transform: rotate(0deg) translate(0, 0);
-o-transform: rotate(0deg) translate(0, 0); -o-transform: rotate(0deg) translate(0, 0);
transform: rotate(0deg) translate(0, 0); } transform: rotate(0deg) translate(0, 0); }
100% { 100% {
-webkit-transform: rotate(359deg) translate(0, 0); -webkit-transform: rotate(359deg) translate(0, 0);
-moz-transform: rotate(359deg) translate(0, 0); -moz-transform: rotate(359deg) translate(0, 0);
@ -132,6 +133,7 @@ http://jonibologna.com/flexbox-cheatsheet/
-ms-transform: rotate(0deg) translate(0, 0); -ms-transform: rotate(0deg) translate(0, 0);
-o-transform: rotate(0deg) translate(0, 0); -o-transform: rotate(0deg) translate(0, 0);
transform: rotate(0deg) translate(0, 0); } transform: rotate(0deg) translate(0, 0); }
100% { 100% {
-webkit-transform: rotate(359deg) translate(0, 0); -webkit-transform: rotate(359deg) translate(0, 0);
-moz-transform: rotate(359deg) translate(0, 0); -moz-transform: rotate(359deg) translate(0, 0);
@ -145,6 +147,7 @@ http://jonibologna.com/flexbox-cheatsheet/
-ms-transform: rotate(0deg) translate(0, 0); -ms-transform: rotate(0deg) translate(0, 0);
-o-transform: rotate(0deg) translate(0, 0); -o-transform: rotate(0deg) translate(0, 0);
transform: rotate(0deg) translate(0, 0); } transform: rotate(0deg) translate(0, 0); }
100% { 100% {
-webkit-transform: rotate(359deg) translate(0, 0); -webkit-transform: rotate(359deg) translate(0, 0);
-moz-transform: rotate(359deg) translate(0, 0); -moz-transform: rotate(359deg) translate(0, 0);
@ -158,6 +161,7 @@ http://jonibologna.com/flexbox-cheatsheet/
-ms-transform: rotate(0deg) translate(0, 0); -ms-transform: rotate(0deg) translate(0, 0);
-o-transform: rotate(0deg) translate(0, 0); -o-transform: rotate(0deg) translate(0, 0);
transform: rotate(0deg) translate(0, 0); } transform: rotate(0deg) translate(0, 0); }
100% { 100% {
-webkit-transform: rotate(359deg) translate(0, 0); -webkit-transform: rotate(359deg) translate(0, 0);
-moz-transform: rotate(359deg) translate(0, 0); -moz-transform: rotate(359deg) translate(0, 0);
@ -476,61 +480,73 @@ div.overlay {
@-webkit-keyframes overlay-spin { @-webkit-keyframes overlay-spin {
from { from {
opacity: 1; } opacity: 1; }
to { to {
opacity: 0.25; } } opacity: 0.25; } }
@-moz-keyframes overlay-spin { @-moz-keyframes overlay-spin {
from { from {
opacity: 1; } opacity: 1; }
to { to {
opacity: 0.25; } } opacity: 0.25; } }
@-ms-keyframes overlay-spin { @-ms-keyframes overlay-spin {
from { from {
opacity: 1; } opacity: 1; }
to { to {
opacity: 0.25; } } opacity: 0.25; } }
@keyframes overlay-spin { @keyframes overlay-spin {
from { from {
opacity: 1; } opacity: 1; }
to { to {
opacity: 0.25; } } opacity: 0.25; } }
@-webkit-keyframes ios-overlay-show { @-webkit-keyframes ios-overlay-show {
0% { 0% {
opacity: 0; } opacity: 0; }
100% { 100% {
opacity: 1; } } opacity: 1; } }
@-moz-keyframes ios-overlay-show { @-moz-keyframes ios-overlay-show {
0% { 0% {
opacity: 0; } opacity: 0; }
100% { 100% {
opacity: 1; } } opacity: 1; } }
@-ms-keyframes ios-overlay-show { @-ms-keyframes ios-overlay-show {
0% { 0% {
opacity: 0; } opacity: 0; }
100% { 100% {
opacity: 1; } } opacity: 1; } }
@keyframes ios-overlay-show { @keyframes ios-overlay-show {
0% { 0% {
opacity: 0; } opacity: 0; }
100% { 100% {
opacity: 1; } } opacity: 1; } }
@-webkit-keyframes ios-overlay-hide { @-webkit-keyframes ios-overlay-hide {
0% { 0% {
opacity: 1; } opacity: 1; }
100% { 100% {
opacity: 0; } } opacity: 0; } }
@-moz-keyframes ios-overlay-hide { @-moz-keyframes ios-overlay-hide {
0% { 0% {
opacity: 1; } opacity: 1; }
100% { 100% {
opacity: 0; } } opacity: 0; } }
@-ms-keyframes ios-overlay-hide { @-ms-keyframes ios-overlay-hide {
0% { 0% {
opacity: 1; } opacity: 1; }
100% { 100% {
opacity: 0; } } opacity: 0; } }
@keyframes ios-overlay-hide { @keyframes ios-overlay-hide {
0% { 0% {
opacity: 1; } opacity: 1; }
100% { 100% {
opacity: 0; } } opacity: 0; } }
/* /*
@ -1337,10 +1353,7 @@ div.help {
z-index: 10; z-index: 10;
background-color: transparent; } background-color: transparent; }
#loginPage, #registrationPage, #unlockPage { #loginPage .content, #registrationPage .content, #unlockPage .content {
overflow: auto;
-webkit-overflow-scrolling: touch; }
#loginPage .content, #registrationPage .content, #unlockPage .content {
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
display: -moz-flex; display: -moz-flex;
@ -1352,6 +1365,8 @@ div.help {
-moz-flex-direction: column; -moz-flex-direction: column;
-ms-flex-direction: column; -ms-flex-direction: column;
flex-direction: column; flex-direction: column;
overflow: auto;
-webkit-overflow-scrolling: touch;
height: 100%; } height: 100%; }
#loginPage .content .miscInfo, #registrationPage .content .miscInfo, #unlockPage .content .miscInfo { #loginPage .content .miscInfo, #registrationPage .content .miscInfo, #unlockPage .content .miscInfo {
-webkit-box-flex: 0; -webkit-box-flex: 0;
@ -1375,27 +1390,40 @@ div.help {
#loginPage .content header .headerContent, #registrationPage .content header .headerContent, #unlockPage .content header .headerContent { #loginPage .content header .headerContent, #registrationPage .content header .headerContent, #unlockPage .content header .headerContent {
width: 100%; } width: 100%; }
#loginPage .content .body, #registrationPage .content .body, #unlockPage .content .body { #loginPage .content .body, #registrationPage .content .body, #unlockPage .content .body {
-webkit-box-flex: auto; -webkit-box-flex: none;
-webkit-flex: auto; -webkit-flex: none;
-moz-box-flex: auto; -moz-box-flex: none;
-moz-flex: auto; -moz-flex: none;
-ms-flex: auto; -ms-flex: none;
flex: auto; flex: none;
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
display: -moz-flex; display: -moz-flex;
display: -ms-flexbox; display: -ms-flexbox;
display: flex; } display: flex; }
#loginPage .content .body .bodyContent, #registrationPage .content .body .bodyContent, #unlockPage .content .body .bodyContent { #loginPage .content .body .bodyContent, #registrationPage .content .body .bodyContent, #unlockPage .content .body .bodyContent {
margin-left: auto;
margin-right: auto; }
#loginPage .content .other, #registrationPage .content .other, #unlockPage .content .other {
-webkit-box-flex: auto; -webkit-box-flex: auto;
-webkit-flex: auto; -webkit-flex: auto;
-moz-box-flex: auto; -moz-box-flex: auto;
-moz-flex: auto; -moz-flex: auto;
-ms-flex: auto; -ms-flex: auto;
flex: auto; flex: auto;
margin-left: auto;
margin-right: auto; }
#loginPage .content .afterBody, #registrationPage .content .afterBody, #unlockPage .content .afterBody {
-webkit-box-flex: auto;
-webkit-flex: auto;
-moz-box-flex: auto;
-moz-flex: auto;
-ms-flex: auto;
flex: auto; }
#loginPage .content .other, #registrationPage .content .other, #unlockPage .content .other {
-webkit-box-flex: none;
-webkit-flex: none;
-moz-box-flex: none;
-moz-flex: none;
-ms-flex: none;
flex: none;
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
display: -moz-flex; display: -moz-flex;
@ -1407,24 +1435,20 @@ div.help {
-moz-align-items: center; -moz-align-items: center;
align-items: center; } align-items: center; }
#loginPage .content .other .otherContent, #registrationPage .content .other .otherContent, #unlockPage .content .other .otherContent { #loginPage .content .other .otherContent, #registrationPage .content .other .otherContent, #unlockPage .content .other .otherContent {
width: 100%; }
#loginPage .content footer, #registrationPage .content footer, #unlockPage .content footer {
-webkit-box-flex: auto; -webkit-box-flex: auto;
-webkit-flex: auto; -webkit-flex: auto;
-moz-box-flex: auto; -moz-box-flex: auto;
-moz-flex: auto; -moz-flex: auto;
-ms-flex: auto; -ms-flex: auto;
flex: auto; flex: auto;
display: -webkit-box; width: 100%; }
display: -webkit-flex; #loginPage .content footer, #registrationPage .content footer, #unlockPage .content footer {
display: -moz-flex; -webkit-box-flex: none;
display: -ms-flexbox; -webkit-flex: none;
display: flex; -moz-box-flex: none;
-webkit-box-align: end; -moz-flex: none;
-ms-flex-align: end; -ms-flex: none;
-webkit-align-items: flex-end; flex: none; }
-moz-align-items: flex-end;
align-items: flex-end; }
#loginPage .content footer .footerContent, #registrationPage .content footer .footerContent, #unlockPage .content footer .footerContent { #loginPage .content footer .footerContent, #registrationPage .content footer .footerContent, #unlockPage .content footer .footerContent {
width: 100%; } width: 100%; }
@ -1537,10 +1561,7 @@ div.help {
#loginPage .content .body { #loginPage .content .body {
background-color: #ff9900; } background-color: #ff9900; }
#loginPage .content .other { #loginPage .content .other {
color: white; color: white; }
background-color: black; }
#loginPage .content .other a:before {
content: "> "; }
#loginPage .content footer { #loginPage .content footer {
color: white; color: white;
background-color: black; } background-color: black; }
@ -1550,10 +1571,7 @@ div.help {
#registrationPage .content .body { #registrationPage .content .body {
background-color: black; } background-color: black; }
#registrationPage .content .other { #registrationPage .content .other {
color: black; color: white; }
background-color: #ff9900; }
#registrationPage .content .other a:before {
content: "< "; }
#registrationPage .content footer { #registrationPage .content footer {
color: black; color: black;
background-color: #ff9900; } background-color: #ff9900; }
@ -1566,7 +1584,9 @@ div.help {
color: white; color: white;
background-color: black; } background-color: black; }
#loginPage .content, #registrationPage .content, #unlockPage .content { #loginPage, #registrationPage, #unlockPage {
background-color: black; }
#loginPage .content, #registrationPage .content, #unlockPage .content {
text-align: center; text-align: center;
/* /*
&.extra-short { &.extra-short {
@ -1754,7 +1774,8 @@ div.help {
*/ } */ }
#loginPage .content .body .pinForm label, #registrationPage .content .body .pinForm label, #unlockPage .content .body .pinForm label { #loginPage .content .body .pinForm label, #registrationPage .content .body .pinForm label, #unlockPage .content .body .pinForm label {
display: inherit; display: inherit;
text-align: left; } text-align: left;
color: #666; }
#loginPage .content .body .pinForm .pinValue, #registrationPage .content .body .pinForm .pinValue, #unlockPage .content .body .pinForm .pinValue { #loginPage .content .body .pinForm .pinValue, #registrationPage .content .body .pinForm .pinValue, #unlockPage .content .body .pinForm .pinValue {
font-family: clipperz-password; } font-family: clipperz-password; }
#loginPage .content .body .pinForm .pinValue::-webkit-input-placeholder, #registrationPage .content .body .pinForm .pinValue::-webkit-input-placeholder, #unlockPage .content .body .pinForm .pinValue::-webkit-input-placeholder { #loginPage .content .body .pinForm .pinValue::-webkit-input-placeholder, #registrationPage .content .body .pinForm .pinValue::-webkit-input-placeholder, #unlockPage .content .body .pinForm .pinValue::-webkit-input-placeholder {
@ -1770,29 +1791,53 @@ div.help {
color: #ff9900; color: #ff9900;
text-decoration: underline; text-decoration: underline;
cursor: pointer; } cursor: pointer; }
#loginPage .content .other, #registrationPage .content .other, #unlockPage .content .other { #loginPage .content .body .registrationLink, #loginPage .content .body .loginLink, #registrationPage .content .body .registrationLink, #registrationPage .content .body .loginLink, #unlockPage .content .body .registrationLink, #unlockPage .content .body .loginLink {
display: inline-block;
margin-top: 25px;
margin-bottom: 25px;
line-height: 34pt;
font-family: "clipperz-font";
min-height: 46px;
min-width: 46px;
color: white;
font-size: 24pt; font-size: 24pt;
padding: 20px; font-weight: 500;
max-height: 20%; } border: 0px;
padding: 10px 25px;
background-color: #c0c0c0;
-webkit-transition: background-color font-weight 0.5s linear;
-moz-transition: background-color font-weight 0.5s linear;
-o-transition: background-color font-weight 0.5s linear;
-ms-transition: background-color font-weight 0.5s linear;
transition: background-color font-weight 0.5s linear;
cursor: pointer; }
#loginPage .content .body .registrationLink:disabled, #loginPage .content .body .loginLink:disabled, #registrationPage .content .body .registrationLink:disabled, #registrationPage .content .body .loginLink:disabled, #unlockPage .content .body .registrationLink:disabled, #unlockPage .content .body .loginLink:disabled {
font-weight: 100;
background-color: #c0c0c0;
cursor: default; }
#loginPage .content .body .registrationLink:hover, #registrationPage .content .body .registrationLink:hover, #unlockPage .content .body .registrationLink:hover {
background-color: black; }
#loginPage .content .body .loginLink:hover, #registrationPage .content .body .loginLink:hover, #unlockPage .content .body .loginLink:hover {
background-color: #ff9900; }
#loginPage .content .other a, #registrationPage .content .other a, #unlockPage .content .other a { #loginPage .content .other a, #registrationPage .content .other a, #unlockPage .content .other a {
cursor: pointer; } cursor: pointer; }
#loginPage .content footer, #registrationPage .content footer, #unlockPage .content footer { #loginPage .content .other .links ul, #registrationPage .content .other .links ul, #unlockPage .content .other .links ul {
max-height: 50px; }
#loginPage .content footer .links ul, #registrationPage .content footer .links ul, #unlockPage .content footer .links ul {
padding: 3px; padding: 3px;
padding-bottom: 6px; } padding-bottom: 6px; }
#loginPage .content footer .links ul li, #registrationPage .content footer .links ul li, #unlockPage .content footer .links ul li { #loginPage .content .other .links ul li, #registrationPage .content .other .links ul li, #unlockPage .content .other .links ul li {
display: inline-block; display: inline-block;
cursor: pointer; } cursor: pointer; }
#loginPage .content footer .links ul li:after, #registrationPage .content footer .links ul li:after, #unlockPage .content footer .links ul li:after { #loginPage .content .other .links ul li:after, #registrationPage .content .other .links ul li:after, #unlockPage .content .other .links ul li:after {
content: '-'; content: '-';
padding-left: 4px; padding-left: 4px;
padding-right: 4px; padding-right: 4px;
cursor: default; } cursor: default; }
#loginPage .content footer .links ul li:last-child:after, #registrationPage .content footer .links ul li:last-child:after, #unlockPage .content footer .links ul li:last-child:after { #loginPage .content .other .links ul li:last-child:after, #registrationPage .content .other .links ul li:last-child:after, #unlockPage .content .other .links ul li:last-child:after {
content: ''; content: '';
padding-left: 0px; padding-left: 0px;
padding-right: 0px; } padding-right: 0px; }
#loginPage .content footer, #registrationPage .content footer, #unlockPage .content footer {
max-height: 50px; }
#loginPage .content footer .applicationVersion, #registrationPage .content footer .applicationVersion, #unlockPage .content footer .applicationVersion { #loginPage .content footer .applicationVersion, #registrationPage .content footer .applicationVersion, #unlockPage .content footer .applicationVersion {
padding: 2px; padding: 2px;
font-size: 8pt; } font-size: 8pt; }
@ -2221,13 +2266,13 @@ span.count {
#extraFeaturesPanel .extraFeatureIndex footer { #extraFeaturesPanel .extraFeatureIndex footer {
font-size: 8pt; font-size: 8pt;
padding: 5px 5px 5px 5px; padding: 5px 5px 5px 5px;
border-top: 1px solid #999; } border-top: 1px solid #999999; }
#extraFeaturesPanel .extraFeatureIndex footer span { #extraFeaturesPanel .extraFeatureIndex footer span {
color: #999; } color: #999999; }
#extraFeaturesPanel .extraFeatureIndex footer span:after { #extraFeaturesPanel .extraFeatureIndex footer span:after {
content: ":"; } content: ":"; }
#extraFeaturesPanel .extraFeatureIndex footer a { #extraFeaturesPanel .extraFeatureIndex footer a {
color: #999; color: #999999;
text-decoration: none; text-decoration: none;
padding-left: 5px; padding-left: 5px;
font-weight: bold; } font-weight: bold; }
@ -2613,6 +2658,13 @@ span.count {
margin-right: 1em; } margin-right: 1em; }
#extraFeaturesPanel .extraFeatureContent .devicePIN :enabled { #extraFeaturesPanel .extraFeatureContent .devicePIN :enabled {
border: 2px solid #ff9900; } border: 2px solid #ff9900; }
#extraFeaturesPanel .extraFeatureContent .devicePIN .content {
-webkit-box-flex: none;
-webkit-flex: none;
-moz-box-flex: none;
-moz-flex: none;
-ms-flex: none;
flex: none; }
#extraFeaturesPanel .extraFeatureContent .dataImport .content { #extraFeaturesPanel .extraFeatureContent .dataImport .content {
display: block; display: block;
height: 100%; height: 100%;
@ -3022,7 +3074,7 @@ div.cardList ul {
padding-right: 0px; padding-right: 0px;
box-shadow: -4px 0px 3px -1px rgba(0, 0, 0, 0.2); } box-shadow: -4px 0px 3px -1px rgba(0, 0, 0, 0.2); }
div.cardList ul li.archived { div.cardList ul li.archived {
background-color: #eee; background-color: #eeeeee;
color: #999; } color: #999; }
div.cardList ul li .favicon { div.cardList ul li .favicon {
width: 48px; width: 48px;
@ -3109,7 +3161,7 @@ div.cardList.narrow {
content: ""; } content: ""; }
#cardDetailPage .view.archived, .cardDetail .view.archived { #cardDetailPage .view.archived, .cardDetail .view.archived {
background-color: #eee; } background-color: #eeeeee; }
#cardDetailPage .view .cardDetailToolbar, .cardDetail .view .cardDetailToolbar { #cardDetailPage .view .cardDetailToolbar, .cardDetail .view .cardDetailToolbar {
background-color: #1863a1; background-color: #1863a1;
color: white; } color: white; }
@ -3339,7 +3391,7 @@ div.cardList.narrow {
cursor: grab; cursor: grab;
cursor: -moz-grab; cursor: -moz-grab;
cursor: -webkit-grab; cursor: -webkit-grab;
background: repeating-linear-gradient(0deg, white, white 2px, #ddd 2px, #ddd 3px); background: repeating-linear-gradient(0deg, white, white 2px, #dddddd 2px, #dddddd 3px);
width: 28px; width: 28px;
height: 20px; height: 20px;
margin-left: 6px; margin-left: 6px;
@ -3565,7 +3617,7 @@ div.cardList.narrow {
min-width: 220px; min-width: 220px;
width: 80%; width: 80%;
max-width: 400px; max-width: 400px;
background-color: #333; background-color: #333333;
color: #fff; color: #fff;
-webkit-border-radius: 6px; -webkit-border-radius: 6px;
-moz-border-radius: 6px; -moz-border-radius: 6px;
@ -3580,7 +3632,7 @@ div.cardList.narrow {
margin-left: 0px; margin-left: 0px;
width: 0; width: 0;
height: 0; height: 0;
border-top: 5px solid #333; border-top: 5px solid #333333;
border-left: 5px solid transparent; border-left: 5px solid transparent;
border-right: 5px solid transparent; } border-right: 5px solid transparent; }
.passwordGenerator .passwordGeneratorBaloon form span { .passwordGenerator .passwordGeneratorBaloon form span {

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

File diff suppressed because one or more lines are too long

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

@ -233,11 +233,7 @@ Clipperz.PM.UI.Components.Pages.LoginPageClass = React.createClass({
// React.DOM.a({'key':'signup', 'onClick':this.handleRegistrationLinkClick}, "Sign up") // React.DOM.a({'key':'signup', 'onClick':this.handleRegistrationLinkClick}, "Sign up")
// ]); // ]);
var registrationLink = React.DOM.div({'className':'other', 'key':'other'}, [ var registrationLink = React.DOM.a({'key':'signup', 'className':'registrationLink', 'onClick':this.handleRegistrationLinkClick}, "sign up");
React.DOM.div({'className':'otherContent'}, [
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']}, [
Clipperz.PM.UI.Components.AccountStatus(MochiKit.Base.update(this.props['proxyInfo'])), Clipperz.PM.UI.Components.AccountStatus(MochiKit.Base.update(this.props['proxyInfo'])),
@ -250,11 +246,12 @@ Clipperz.PM.UI.Components.Pages.LoginPageClass = React.createClass({
React.DOM.div({'key':'formWrapper', 'className':'form body'}, [ React.DOM.div({'key':'formWrapper', 'className':'form body'}, [
React.DOM.div({'className':'bodyContent'}, [ React.DOM.div({'className':'bodyContent'}, [
this.mode() == 'PIN' ? this.pinForm() : this.loginForm(), this.mode() == 'PIN' ? this.pinForm() : this.loginForm(),
]),
]),
this.props['isNewUserRegistrationAvailable'] ? registrationLink : null, this.props['isNewUserRegistrationAvailable'] ? registrationLink : null,
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.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"),
@ -262,6 +259,10 @@ Clipperz.PM.UI.Components.Pages.LoginPageClass = 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)

13
frontend/delta/js/Clipperz/PM/UI/Components/Pages/RegistrationPage.js
View File

@ -241,16 +241,13 @@ Clipperz.PM.UI.Components.Pages.RegistrationPageClass = React.createClass({
React.DOM.div({'className':'bodyContent'}, [ React.DOM.div({'className':'bodyContent'}, [
React.DOM.form({'key':'registrationForm', 'autoComplete':'off', 'onChange': this.handleChange}, [ React.DOM.form({'key':'registrationForm', 'autoComplete':'off', 'onChange': this.handleChange}, [
React.DOM.div({'key':'steps', 'className':'steps'}, MochiKit.Base.map(this.renderStep, this.props['steps'])) React.DOM.div({'key':'steps', 'className':'steps'}, MochiKit.Base.map(this.renderStep, this.props['steps']))
]) ]),
React.DOM.a({'key':'login', 'className':'loginLink', 'onClick':this.handleLoginLinkClick}, "login"),
]) ])
]), ]),
React.DOM.div({'key':'afterBody', 'className':'afterBody'}),
React.DOM.div({'className':'other', 'key':'other'}, [ React.DOM.div({'className':'other', 'key':'other'}, [
React.DOM.div({'className':'otherContent'}, [ React.DOM.div({'className':'otherContent'}, [
React.DOM.a({'key':'login', 'onClick':this.handleLoginLinkClick}, "Login"),
])
]),
React.DOM.footer({'key':'footer'}, [
React.DOM.div({'className':'footerContent'}, [
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"),
@ -258,6 +255,10 @@ Clipperz.PM.UI.Components.Pages.RegistrationPageClass = 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)

27
frontend/delta/scss/core/layout.scss
View File

@ -629,23 +629,20 @@ div.help {
#loginPage, #registrationPage, #unlockPage { #loginPage, #registrationPage, #unlockPage {
@include overflow-auto;
.content { .content {
@include flexbox(); @include flexbox();
@include flex-direction(column); @include flex-direction(column);
// @include align-items(stretch);
@include overflow-auto;
height: 100%; height: 100%;
.miscInfo { .miscInfo {
@include flex(0); @include flex(0);
// background-color: green;
} }
header { header {
@include flex(auto); @include flex(auto);
// background-color: yellow;
@include flexbox(); @include flexbox();
.headerContent { .headerContent {
@ -654,36 +651,38 @@ div.help {
} }
.body { .body {
@include flex(auto); @include flex(none);
// background-color: green; // width: 100%;
@include flexbox(); @include flexbox();
.bodyContent { .bodyContent {
@include flex(auto);
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
} }
} }
.other { .afterBody {
@include flex(auto); @include flex(auto);
// background-color: yellow; }
.other {
@include flex(none);
@include flexbox(); @include flexbox();
@include align-items(center); @include align-items(center);
.otherContent { .otherContent {
@include flex(auto);
width: 100%; width: 100%;
} }
} }
footer { footer {
@include flex(auto); @include flex(none);
// background-color: green;
@include flexbox();
@include align-items(flex-end);
.footerContent { .footerContent {
width: 100%; width: 100%;
.links { .links {
} }

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

@ -31,11 +31,11 @@ refer to http://www.clipperz.com.
.other { .other {
color: $main-alternate-text-color; color: $main-alternate-text-color;
background-color: $main-alternate-color; // background-color: $main-alternate-color;
a { a {
&:before { &:before {
content: "> "; // content: "> ";
}; };
} }
} }
@ -56,12 +56,13 @@ refer to http://www.clipperz.com.
} }
.other { .other {
color: $main-text-color; color: $main-alternate-text-color;
background-color: $main-color; // color: $main-text-color;
// background-color: $main-color;
a { a {
&:before { &:before {
content: "< "; // content: "< ";
}; };
} }
} }
@ -90,6 +91,7 @@ refer to http://www.clipperz.com.
//============================================================== //==============================================================
#loginPage, #registrationPage, #unlockPage { #loginPage, #registrationPage, #unlockPage {
background-color: black;
.content { .content {
text-align: center; text-align: center;
@ -306,7 +308,6 @@ refer to http://www.clipperz.com.
} }
} }
.pinForm { .pinForm {
/* /*
.pinContainer { .pinContainer {
@ -323,6 +324,7 @@ refer to http://www.clipperz.com.
label { label {
display: inherit; display: inherit;
text-align: left; text-align: left;
color: #666;
} }
.pinValue { .pinValue {
@ -342,20 +344,65 @@ refer to http://www.clipperz.com.
} }
.registrationLink, .loginLink {
display: inline-block;
margin-top: 25px;
margin-bottom: 25px;
line-height: 34pt;
font-family: "clipperz-font";
min-height: 46px;
min-width: 46px;
color: white;
font-size: 24pt;
font-weight: 500;
border: 0px;
padding: 10px 25px;
// border: 1px solid white;
background-color: #c0c0c0;
@include transition(background-color font-weight, 0.5s, linear);
cursor: pointer;
// &:hover {
// background-color: black;
// };
&:disabled {
font-weight: 100;
background-color: #c0c0c0;
cursor: default;
&:hover {
};
}
}
.registrationLink {
&:hover {
background-color: black;
};
}
.loginLink {
&:hover {
background-color: $main-color;
};
}
} }
.other { .other {
font-size: 24pt; // font-size: 24pt;
padding: 20px; // padding: 20px;
max-height: 20%; // max-height: 20%;
a { a {
cursor: pointer; cursor: pointer;
} }
}
footer {
max-height: 50px;
.links { .links {
ul { ul {
@ -381,7 +428,10 @@ refer to http://www.clipperz.com.
} }
} }
} }
}
footer {
max-height: 50px;
.applicationVersion { .applicationVersion {
padding: 2px; padding: 2px;

4
frontend/delta/scss/style/settingsPanel.scss
View File

@ -727,6 +727,10 @@ refer to http://www.clipperz.com.
:enabled { :enabled {
border:2px solid $clipperz-orange; border:2px solid $clipperz-orange;
} }
.content {
@include flex(none);
}
} }
.dataImport { .dataImport {