summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--frontend/gamma/css/web.css5
-rw-r--r--frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js2
2 files changed, 5 insertions, 2 deletions
diff --git a/frontend/gamma/css/web.css b/frontend/gamma/css/web.css
index 3540016..94cd715 100644
--- a/frontend/gamma/css/web.css
+++ b/frontend/gamma/css/web.css
@@ -344,392 +344,395 @@ div.modalDialogMask.userInfoBoxMask {
padding: 0px;
border: 0px;
}
.clear {
clear: both;
}
.hidden_none {
display: none;
visibility: hidden;
}
.keepTogether {
display: inline-block;
white-space: nowrap;
}
#mainDiv {
margin: 0 auto;
}
div.pageHeaderAndBody {
height: 100%;
}
div.pageHeaderAndBody div#pageBody {
min-width: 1013px;
padding-bottom: 90px;
}
div.pageHeaderAndBody div.pageHeader {
background-color: #1f2148;
min-width: 1013px;
}
div.pageHeaderAndBody div.pageHeader div#miscLinks {
float: right;
}
div.pageHeaderAndBody div.pageHeader div#miscLinks ul {
margin: 12px 0px 0px;
padding: 15px;
}
div.pageHeaderAndBody div.pageHeader div#miscLinks ul li {
display: inline;
margin: 0px;
padding: 0px;
border: 0px;
}
div.pageHeaderAndBody div.pageHeader div#miscLinks ul li a {
color: #ffffff;
margin: 0px;
padding: 0px;
border: 0px;
padding: 15px;
border-left: 1px solid #3e428f;
font-weight: normal;
text-decoration: none;
font-size: 12pt;
min-width: 70px;
}
div.pageHeaderAndBody div.pageHeader div#miscLinks ul li a:hover {
color: #b8bae1;
}
div.pageHeaderAndBody div.pageHeader div#miscLinks ul li a#donateHeaderLink {
border-left: 0px;
}
div.pageHeaderAndBody div.pageHeader div#logoFrame {
padding: 16px 16px 60px 16px;
min-height: 44px;
}
div.pageHeaderAndBody div.pageHeader div#logoFrame a {
color: white;
text-decoration: none;
}
div.pageHeaderAndBody div.pageHeader div#logoFrame a canvas {
margin: 0px;
padding: 0px;
border: 0px;
width: 150px;
height: 39px;
}
div.pageHeaderAndBody div.pageHeader div#logoFrame a h5.clipperzPayoff {
font-size: 13pt;
font-weight: normal;
white-space: nowrap;
margin: 0px;
padding-left: 4px;
}
div.pageHeaderAndBody div.pageHeader div#featureTabs table {
width: 100%;
padding: 6px;
padding-left: 15px;
padding-right: 15px;
padding-bottom: 46px;
}
div.pageHeaderAndBody div.pageHeader div#featureTabs table tr td {
width: 25%;
vertical-align: top;
font-size: 11pt;
color: white;
}
div.pageHeaderAndBody div.pageHeader div#featureTabs table tr td img {
float: left;
}
div.pageHeaderAndBody div.pageHeader div#featureTabs table tr td span {
display: block;
padding: 5 10 5 85;
}
div.pageHeaderAndBody div.pageHeader div#featureTabs canvas.featureIcon {
width: 76px;
height: 76px;
display: block;
float: left;
background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffad79), to(#ff6622));
background: -moz-linear-gradient(0% 100% 90deg, #ff6622, #ffad79);
border-radius: 38px;
-moz-border-radius: 38px;
-webkit-border-radius: 38px;
}
div.pageHeaderAndBody div.pageHeader div#news {
top: -82px;
left: 240px;
width: 310px;
height: 90px;
position: absolute;
background-color: #616475;
-webkit-border-bottom-left-radius: 8px;
-moz-border-radius-bottomleft: 8px;
border-bottom-left-radius: 8px;
-webkit-border-bottom-right-radius: 8px;
-moz-border-radius-bottomright: 8px;
border-bottom-right-radius: 8px;
-webkit-box-shadow: 2px 2px 9px #333333;
-moz-box-shadow: 2px 2px 9px #333333;
box-shadow: 2px 2px 9px #333333;
}
div.pageHeaderAndBody div.pageHeader div#news div#newsframe {
margin-left: 10px;
margin-right: 10px;
height: 75px;
overflow: hidden;
}
div.pageHeaderAndBody div.pageHeader div#news div#newsframe iframe {
width: 290px;
border: 0px;
color: #616475;
background-color: #616475;
}
div.pageHeaderAndBody div.pageHeader div#news div.grip {
width: 310px;
height: 6px;
margin-top: 2px;
cursor: pointer;
}
div.pageHeaderAndBody div.pageHeader div#news div.grip div.gripHandler {
margin-left: auto;
margin-right: auto;
margin-top: 8px;
width: 0;
height: 0;
border-left: 5px solid transparent;
border-right: 5px solid transparent;
}
div.pageHeaderAndBody div.pageHeader div#news.open div.grip div.gripHandler {
border-bottom: 5px solid #e9e9ec;
}
div.pageHeaderAndBody div.pageHeader div#news.hidden div.grip div.gripHandler {
border-top: 5px solid #e9e9ec;
}
div.pageFooter {
margin-top: -90px;
height: 90px;
clear: both;
}
div.pageFooter div.footerWrapper {
clear: both;
padding-top: 10px;
}
div.pageFooter div.footerWrapper div.footerContent {
background-color: #eaebe6;
padding: 20px;
font-size: 8pt;
}
div.pageFooter div.footerWrapper div.footerContent canvas.footerStarIcon {
width: 40px;
height: 40px;
float: left;
}
div.pageFooter div.footerWrapper div.footerContent span.copyright {
padding-left: 10px;
color: #a0a0a0;
}
div.pageFooter div.footerWrapper div.footerContent a {
padding-left: 50px;
display: block;
color: #888888;
font-weight: bold;
text-decoration: none;
}
-div.pageFooter div.footerWrapper div.footerContent span.applicationVersion {
+div.pageFooter div.footerWrapper div.footerContent div.applicationVersion {
padding: 8px;
color: #888888;
background-color: #d2d2d2;
position: relative;
top: -40px;
float: right;
}
+div.pageFooter div.footerWrapper div.footerContent div.applicationVersion a {
+ display: inline;
+}
/*
Color list:
- login box:
light #ff9955
dark #ff6622
- login button:
regular #dd5500
hover #773311
- login translations:
box: #cc6622;
not-selected:
color: #ddaa99
background: #994422
selected: #772211;
*/
html {
height: 100%;
}
body {
font-family: Helvetica-Neue, Helvetica, Arial, Geneva, sans-serif;
margin: 0px;
}
div.modalDialogMask.userInfoBoxMask {
-moz-opacity: 0.0;
opacity: .0;
filter: alpha(opacity=0);
z-index: 19000;
}
.reset-margin {
margin: 0px;
padding: 0px;
border: 0px;
}
.clear {
clear: both;
}
.hidden_none {
display: none;
visibility: hidden;
}
.keepTogether {
display: inline-block;
white-space: nowrap;
}
#mainDiv {
margin: 0 auto;
}
div#loginBox {
width: 273px;
z-index: 19000;
top: -30px;
right: 30px;
position: relative;
float: right;
}
div#loginBox div.header {
height: 25px;
width: 273px;
background-color: #ff9b5a;
-webkit-border-top-left-radius: 20px;
-moz-border-radius-topleft: 20px;
border-top-left-radius: 20px;
-webkit-border-top-right-radius: 20px;
-moz-border-radius-topright: 20px;
border-top-right-radius: 20px;
}
div#loginBox div.body {
background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ff9b5a), to(#ff6622));
background: -moz-linear-gradient(0% 100% 90deg, #ff6622, #ff9b5a);
}
div#loginBox div.body h4 {
color: #ffffff;
font-size: 16pt;
font-weight: normal;
padding-left: 20px;
margin: 0px;
}
div#loginBox div.body form.loginForm {
padding: 5px 20px 0px;
margin-bottom: 0px;
}
div#loginBox div.body form.loginForm label {
color: #ffffff;
font-size: 10pt;
display: block;
padding-top: 5px;
}
div#loginBox div.body form.loginForm label.checkbox {
display: inline;
}
div#loginBox div.body form.loginForm input {
width: 230px;
font-size: 14pt;
color: #333366;
background-color: #ffffff;
border: 1px solid #bb4924;
padding: 2px 5px;
height: 28px;
}
div#loginBox div.body form.loginForm input.checkbox {
margin: 10px 8px 0px 0px;
height: auto;
width: auto;
border: 0px;
}
div#loginBox div.body form.loginForm input.checkbox:hover {
cursor: pointer;
}
div#loginBox div.body form.loginForm input.otp {
width: 57px;
display: inline;
padding-left: 0px;
padding-right: 0px;
height: 28px;
font: 8pt monospace;
}
div#loginBox div.body form.loginForm input.submit {
margin: 0px 45px;
width: 140px;
color: #ffffff;
background-color: #d44100;
border: 1px solid #bb4924;
padding: 6px;
font-size: 12pt;
height: auto;
}
div#loginBox div.body form.loginForm input.submit:hover {
color: #ffffff;
background-color: #7e2700;
cursor: pointer;
}
div#loginBox div.body form.loginForm ul {
list-style-type: none;
padding: 0px;
margin: 0px;
}
div#loginBox div.body form.loginForm ul li {
display: block;
}
div#loginBox div.body form.loginForm div.translations {
margin: 15px -20px;
background-color: #c87b59;
}
div#loginBox div.body form.loginForm div.translations h4 {
font-size: 9pt;
padding: 6px 20px 0px;
}
div#loginBox div.body form.loginForm div.translations ul {
margin: 0px;
padding: 5px 10px 10px;
margin-bottom: 15px;
}
div#loginBox div.body form.loginForm div.translations ul li {
font-size: 8pt;
color: #ddaa99;
background-color: #994422;
display: inline-block;
padding: 2px 4px;
margin: 1px;
}
div#loginBox div.body form.loginForm div.translations ul li.selected {
color: #ffffff;
background-color: #772211;
}
div#loginBox div.body form.loginForm div.translations ul li.selected:hover {
cursor: default;
}
div#loginBox div.body form.loginForm div.translations ul li:hover {
cursor: pointer;
color: #ffffff;
}
div#loginBox div.footer {
height: 37px;
width: 273px;
background-color: #ff6622;
-webkit-border-bottom-left-radius: 20px;
-moz-border-radius-bottomleft: 20px;
border-bottom-left-radius: 20px;
-webkit-border-bottom-right-radius: 20px;
-moz-border-radius-bottomright: 20px;
border-bottom-right-radius: 20px;
}
body.ext-gecko div#loginBox form.loginForm div.translations ul li {
display: -moz-inline-box;
}
div#featurePoints {
min-width: 400px;
padding-top: 15px;
padding-bottom: 20px;
padding-left: 20px;
padding-right: 330px;
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js
index 2b2865c..e6ae72b 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js
@@ -1,67 +1,67 @@
/*
Copyright 2008-2011 Clipperz Srl
This file is part of Clipperz Community Edition.
Clipperz Community Edition is an online password manager.
For further information about its features and functionalities please
refer to http://www.clipperz.com.
* Clipperz Community Edition is free software: you can redistribute
it and/or modify it under the terms of the GNU Affero General Public
License as published by the Free Software Foundation, either version
3 of the License, or (at your option) any later version.
* Clipperz Community Edition is distributed in the hope that it will
be useful, but WITHOUT ANY WARRANTY; without even the implied
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU Affero General Public License for more details.
* You should have received a copy of the GNU Affero General Public
License along with Clipperz Community Edition. If not, see
<http://www.gnu.org/licenses/>.
*/
Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
Clipperz.PM.UI.Web.Components.PageFooter = function(args) {
args = args || {};
Clipperz.PM.UI.Web.Components.PageFooter.superclass.constructor.apply(this, arguments);
return this;
}
//=============================================================================
Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageFooter, Clipperz.PM.UI.Common.Components.BaseComponent, {
//-------------------------------------------------------------------------
'toString': function () {
return "Clipperz.PM.UI.Web.Components.PageFooter component";
},
//-------------------------------------------------------------------------
'renderSelf': function(/*aContainer, aPosition*/) {
this.append(this.element(), [
{tag:'div', cls:'footerWrapper', children:[
{tag:'div', cls:'footerContent', children:[
{tag:'canvas', id:this.getId('footerStarIcon'), cls:'footerStarIcon'},
{tag:'span', cls:'copyright', html:'Copyright &copy; 2009-2013 Clipperz Srl'},
{tag:'a', href:'http://www.clipperz.com/terms_of_service', target:'_blank', html:'terms of service'},
{tag:'a', href:'http://www.clipperz.com/privacy_policy', target:'_blank', html:'privacy policy'},
- {tag:'span', cls:'applicationVersion', htmlString:'application version: [<a href="https://github.com/clipperz/password-manager/tree/' + Clipperz_version + '" target="github">' + Clipperz_version + '</a>]'}
+ {tag:'div', cls:'applicationVersion', htmlString:'application version: [<a href="https://github.com/clipperz/password-manager/tree/' + Clipperz_version + '" target="github">' + Clipperz_version + '</a>]'}
]}
]}
]);
Clipperz.PM.UI.Canvas.star.normal(this.getElement('footerStarIcon'), "#7e7e7e");
},
//-------------------------------------------------------------------------
__syntaxFix__: "syntax fix"
});