diff --git a/customize.dist/bkabout.jpg b/customize.dist/bkabout.jpg new file mode 100644 index 000000000..43de08268 Binary files /dev/null and b/customize.dist/bkabout.jpg differ diff --git a/customize.dist/pages.js b/customize.dist/pages.js index 89acf8e2f..7bc03f71a 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -14,7 +14,7 @@ define([ }; var footerCol = function (title, L, literal) { - return h('div.col', [ + return h('div.col-6.col-sm-3', [ h('ul.list-unstyled', [ h('li.footer-title', { 'data-localization': title, @@ -46,10 +46,13 @@ define([ h('div.container', [ h('div.row', [ footerCol(null, [ + setHTML(h('div.cp-bio-foot'), '
With CryptPad, you can make quick collaborative documents for taking notes and writing down ideas together.
'), + ], ''), + /* footerCol(null, [ footLink('/about.html', 'about'), footLink('/terms.html', 'terms'), footLink('/privacy.html', 'privacy'), - ], 'CryptPad'), + ], 'CryptPad'),*/ footerCol('footer_applications', [ footLink('/drive/', 'main_drive'), footLink('/pad/', 'main_richText'), @@ -109,13 +112,21 @@ define([ Pages['/about.html'] = function () { return h('div#cp-main', [ infopageTopbar(), + h('div.container-fluid.cp-about-intro', [ + h('div.container', [ + h('center', [ + h('h1', Msg.about), + setHTML(h('p'), 'CryptPad is created inside of the Research Team at XWiki SAS, a small business located in Paris France and Iasi Romania. There are 3 core team members working on CryptPad plus a number of contributors both inside and outside of XWiki SAS.'), + ]), + ]), + ]), h('div.container.cp-container', [ - h('center', [ + /*h('center', [ h('h1', Msg.about) ]), - setHTML(h('p'), 'CryptPad is created inside of the Research Team at XWiki SAS, a small business located in Paris France and Iasi Romania. There are 3 core team members working on CryptPad plus a number of contributors both inside and outside of XWiki SAS.'), - h('h2', 'Core Developers'), + setHTML(h('p'), 'CryptPad is created inside of the Research Team at XWiki SAS, a small business located in Paris France and Iasi Romania. There are 3 core team members working on CryptPad plus a number of contributors both inside and outside of XWiki SAS.'),*/ h('div.row', [ + h('h2.col-12', 'Core Developers'), h('div.col-md-4', [ h('img.bio-avatar', {'src': '/customize/images/aaron.jpg'}), h('h3', "Aaron MacSween"), diff --git a/customize.dist/src/less2/include/infopages.less b/customize.dist/src/less2/include/infopages.less index 390877b40..db5172c75 100644 --- a/customize.dist/src/less2/include/infopages.less +++ b/customize.dist/src/less2/include/infopages.less @@ -74,7 +74,7 @@ } footer { - background-color: @cryptpad_color_grey; + background-color: @cryptpad_color_blue; .container { .col { margin-top: 1em; @@ -82,20 +82,33 @@ a { color: #fff; &:visited { - color: darken(#fff, 20%); + color: darken(#fff, 10%); }; } margin-bottom: 1em; ul.list-unstyled { - margin: 0; + margin-top: 1em; + text-align: center; } } + .cp-bio-foot { + background-image: url(/customize/CryptPad-white-logo.svg); + background-size: 100%; + background-repeat: no-repeat; + p { + color: #fff; + padding-top: 30%; + margin-bottom: 0; + + } + } .cp-version-footer { - background-color: #6C6C6C; + background-color: @cryptpad_color_blue; color: #fff; text-align: center; padding: 0.5em; + border-top: 2px solid #fff; } } }; diff --git a/customize.dist/src/less2/pages/page-about.less b/customize.dist/src/less2/pages/page-about.less index 66c72eec9..afce3ac9e 100644 --- a/customize.dist/src/less2/pages/page-about.less +++ b/customize.dist/src/less2/pages/page-about.less @@ -9,4 +9,27 @@ margin: 1em 0; max-width: 300px; max-height: 300px; +} +.cp-about-intro { + padding-top: 3em; + padding-bottom: 3em; + background-image: url(/customize/bkabout.jpg); + background-size: cover; + background-repeat: no-repeat; + background-position: center; + .container { + color: #fff; + font-family: "Open Sans"; + h1 { + font-weight: bold; + } + a { + color: #fff; + text-decoration: underline; + } + p { + padding-top: 1em; + } + } + } \ No newline at end of file