clipperz/password-manager-mirror
1
0
Fork 0
mirror of http://git.whoc.org.uk/git/password-manager.git synced 2025-10-30 19:07:35 +01:00
Code Issues Releases Wiki Activity

Fixed rendering of Registration page

Browse Source
This commit is contained in:
Giulio Cesare Solaroli
2015-07-05 09:28:19 +02:00
parent 755df7d360
commit cdfd739897
5 changed files with 80 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1405,7 +1405,7 @@ div.dialogBox {
margin-bottom: 5px; }
#loadingPage div h3 {
font-size: 18pt;
color: black;
color: white;
margin: 0px; }
#loginPage {
@@ -1634,17 +1634,16 @@ div.dialogBox {
-moz-flex: 1;
-ms-flex: 1;
flex: 1;
font-family: 'clipperz-icons';
-webkit-font-feature-settings: "liga" 1, "dlig" 1;
-moz-font-feature-settings: "liga" 1, "dlig" 1;
-ms-font-feature-settings: "liga" 1, "dlig" 1;
-o-font-feature-settings: "liga" 1, "dlig" 1;
font-feature-settings: "liga" 1, "dlig" 1;
-webkit-font-smoothing: antialiased;
text-rendering: optimizeLegibility;
font-size: 48pt;
line-height: 90pt;
color: white; }
#registrationPage .registrationForm header h3 {
font-weight: bold;
font-size: 38pt;
line-height: 1.7em; }
#registrationPage .registrationForm header h5 {
font-size: 16pt;
line-height: 1.0em; }
#registrationPage .registrationForm div.form {
-webkit-box-flex: 4;
-webkit-flex: 4;
@@ -1738,6 +1737,8 @@ div.dialogBox {
cursor: default; }
#registrationPage .registrationForm div.form form .steps .step .buttons .button.enabled {
background-color: #ff9900; }
#registrationPage .registrationForm div.links ul li {
display: inline-block; }
#registrationPage .registrationForm footer {
-webkit-box-flex: 1;
-webkit-flex: 1;
@@ -1753,6 +1754,23 @@ div.dialogBox {
content: "< "; }
#registrationPage .registrationForm footer a {
line-height: 50pt; }
#registrationPage .registrationForm footer .applicationVersion {
-webkit-box-flex: 1;
-webkit-flex: 1;
-moz-box-flex: 1;
-moz-flex: 1;
-ms-flex: 1;
flex: 1;
font-size: 8pt; }
#registrationPage .registrationForm footer .applicationVersion span {
color: black; }
#registrationPage .registrationForm footer .applicationVersion span:after {
content: ":"; }
#registrationPage .registrationForm footer .applicationVersion a {
color: black;
text-decoration: none;
padding-left: 5px;
font-weight: bold; }
#selections {
background-color: black;

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

File diff suppressed because one or more lines are too long

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

@@ -222,7 +222,10 @@ Clipperz.PM.UI.Components.Pages.RegistrationPageClass = React.createClass({
render: function () {
return React.DOM.div({'className':'registrationForm'},[
React.DOM.header({'key':'header'}, 'clipperz'),
React.DOM.header({'key':'header'}, [
React.DOM.h3({}, 'clipperz'),
React.DOM.h5({}, 'keep it to yourself'),
]),
React.DOM.div({'key':'body', 'className':'form'}, [
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']))
@@ -236,7 +239,11 @@ Clipperz.PM.UI.Components.Pages.RegistrationPageClass = React.createClass({
])
]),
React.DOM.footer({'key':'footer'}, [
React.DOM.a({'key':'login', 'onClick':this.handleLoginLinkClick}, "Login")
React.DOM.a({'key':'login', 'onClick':this.handleLoginLinkClick}, "Login"),
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)
])
])
]);
},

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

@@ -48,7 +48,8 @@ refer to http://www.clipperz.com.
h3 {
font-size: 18pt;
// color: $Loading_h3-color;
color: $main-text-color;
// color: $main-text-color;
color: $main-alternate-text-color;
margin: 0px;
}
}

44
frontend/delta/scss/style/registrationPage.scss
View File

@@ -37,12 +37,22 @@ refer to http://www.clipperz.com.
header {
@include flex(1);
@include icon-font();
// @include icon-font();
font-size: 48pt;
line-height: 90pt;
color: white;
// color: $main-color;
color: $main-alternate-text-color;
h3 {
font-weight: bold;
font-size: 38pt;
line-height: 1.7em;
}
h5 {
font-size: 16pt;
line-height: 1.0em;
}
}
div.form {
@@ -195,6 +205,14 @@ refer to http://www.clipperz.com.
}
}
div.links {
ul {
li {
display: inline-block;
}
}
}
footer {
@include flex(1);
@@ -211,6 +229,26 @@ refer to http://www.clipperz.com.
a {
line-height: 50pt;
}
.applicationVersion {
@include flex(1);
font-size: 8pt;
$applicationVersionColor: black;
span {
color: $applicationVersionColor;
&:after {
content: ":";
};
}
a {
color: $applicationVersionColor;
text-decoration: none;
padding-left: 5px;
font-weight: bold;
}
}
}
}
}