author | Clipperz <info@clipperz.com> | 2013-01-09 11:05:50 (UTC) |
---|---|---|
committer | Clipperz <info@clipperz.com> | 2013-01-09 11:05:50 (UTC) |
commit | f6903b9a5670370ef742a02092ab72e4227ddcd9 (patch) (unidiff) | |
tree | 01a5c33671c05765729522dfd383d7434c1c0c35 /frontend/gamma | |
parent | 34726bbee84efbf0490f204d5d267b15fb4d3214 (diff) | |
download | clipperz-f6903b9a5670370ef742a02092ab72e4227ddcd9.zip clipperz-f6903b9a5670370ef742a02092ab72e4227ddcd9.tar.gz clipperz-f6903b9a5670370ef742a02092ab72e4227ddcd9.tar.bz2 |
Fixed application version display on /gamma
-rw-r--r-- | frontend/gamma/css/web.css | 1 | ||||
-rw-r--r-- | frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/frontend/gamma/css/web.css b/frontend/gamma/css/web.css index 94cd715..5d8bc20 100644 --- a/frontend/gamma/css/web.css +++ b/frontend/gamma/css/web.css | |||
@@ -537,16 +537,17 @@ div.pageFooter div.footerWrapper div.footerContent div.applicationVersion { | |||
537 | padding: 8px; | 537 | padding: 8px; |
538 | color: #888888; | 538 | color: #888888; |
539 | background-color: #d2d2d2; | 539 | background-color: #d2d2d2; |
540 | position: relative; | 540 | position: relative; |
541 | top: -40px; | 541 | top: -40px; |
542 | float: right; | 542 | float: right; |
543 | } | 543 | } |
544 | div.pageFooter div.footerWrapper div.footerContent div.applicationVersion a { | 544 | div.pageFooter div.footerWrapper div.footerContent div.applicationVersion a { |
545 | padding-left: 0px; | ||
545 | display: inline; | 546 | display: inline; |
546 | } | 547 | } |
547 | /* | 548 | /* |
548 | 549 | ||
549 | Color list: | 550 | Color list: |
550 | - login box: | 551 | - login box: |
551 | light#ff9955 | 552 | light#ff9955 |
552 | dark#ff6622 | 553 | dark#ff6622 |
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 e6ae72b..dcf506f 100644 --- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js +++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js | |||
@@ -48,17 +48,17 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageFooter, Clipperz.PM.UI.Co | |||
48 | 'renderSelf': function(/*aContainer, aPosition*/) { | 48 | 'renderSelf': function(/*aContainer, aPosition*/) { |
49 | this.append(this.element(), [ | 49 | this.append(this.element(), [ |
50 | {tag:'div', cls:'footerWrapper', children:[ | 50 | {tag:'div', cls:'footerWrapper', children:[ |
51 | {tag:'div', cls:'footerContent', children:[ | 51 | {tag:'div', cls:'footerContent', children:[ |
52 | {tag:'canvas', id:this.getId('footerStarIcon'), cls:'footerStarIcon'}, | 52 | {tag:'canvas', id:this.getId('footerStarIcon'), cls:'footerStarIcon'}, |
53 | {tag:'span', cls:'copyright', html:'Copyright © 2009-2013 Clipperz Srl'}, | 53 | {tag:'span', cls:'copyright', html:'Copyright © 2009-2013 Clipperz Srl'}, |
54 | {tag:'a', href:'http://www.clipperz.com/terms_of_service',target:'_blank', html:'terms of service'}, | 54 | {tag:'a', href:'http://www.clipperz.com/terms_of_service',target:'_blank', html:'terms of service'}, |
55 | {tag:'a', href:'http://www.clipperz.com/privacy_policy',target:'_blank', html:'privacy policy'}, | 55 | {tag:'a', href:'http://www.clipperz.com/privacy_policy',target:'_blank', html:'privacy policy'}, |
56 | {tag:'div', cls:'applicationVersion', htmlString:'application version: [<a href="https://github.com/clipperz/password-manager/tree/' + Clipperz_version + '" target="github">' + Clipperz_version + '</a>]'} | 56 | {tag:'div', cls:'applicationVersion', htmlString:'application version: <a href="https://github.com/clipperz/password-manager/tree/' + Clipperz_version + '" target="github">' + Clipperz_version + '</a>'} |
57 | ]} | 57 | ]} |
58 | ]} | 58 | ]} |
59 | ]); | 59 | ]); |
60 | 60 | ||
61 | Clipperz.PM.UI.Canvas.star.normal(this.getElement('footerStarIcon'), "#7e7e7e"); | 61 | Clipperz.PM.UI.Canvas.star.normal(this.getElement('footerStarIcon'), "#7e7e7e"); |
62 | }, | 62 | }, |
63 | 63 | ||
64 | //------------------------------------------------------------------------- | 64 | //------------------------------------------------------------------------- |