diff --git a/config.example.js b/config.example.js index 081f2a04b..f8c1499ae 100644 --- a/config.example.js +++ b/config.example.js @@ -119,6 +119,7 @@ module.exports = { 'terms', 'about', 'contact', + 'what-is-cryptpad' ], /* Limits, Donations, Subscriptions and Contact diff --git a/customize.dist/alt-favicon.png b/customize.dist/alt-favicon.png index 94e0b237f..3981f6b84 100644 Binary files a/customize.dist/alt-favicon.png and b/customize.dist/alt-favicon.png differ diff --git a/customize.dist/bg10.jpg b/customize.dist/bg10.jpg deleted file mode 100644 index 6a91b4f0a..000000000 Binary files a/customize.dist/bg10.jpg and /dev/null differ diff --git a/customize.dist/bg11.jpg b/customize.dist/bg11.jpg deleted file mode 100644 index 241587668..000000000 Binary files a/customize.dist/bg11.jpg and /dev/null differ diff --git a/customize.dist/bg12.jpg b/customize.dist/bg12.jpg deleted file mode 100644 index d6f657ce9..000000000 Binary files a/customize.dist/bg12.jpg and /dev/null differ diff --git a/customize.dist/bg13.jpg b/customize.dist/bg13.jpg deleted file mode 100644 index 1085d34aa..000000000 Binary files a/customize.dist/bg13.jpg and /dev/null differ diff --git a/customize.dist/bg3.jpg b/customize.dist/bg3.jpg deleted file mode 100644 index 04d3a04e0..000000000 Binary files a/customize.dist/bg3.jpg and /dev/null differ diff --git a/customize.dist/bg4.jpg b/customize.dist/bg4.jpg deleted file mode 100644 index 0953a485b..000000000 Binary files a/customize.dist/bg4.jpg and /dev/null differ diff --git a/customize.dist/bg5.jpg b/customize.dist/bg5.jpg deleted file mode 100644 index 692f2e582..000000000 Binary files a/customize.dist/bg5.jpg and /dev/null differ diff --git a/customize.dist/bg6.jpg b/customize.dist/bg6.jpg deleted file mode 100644 index c45a0d782..000000000 Binary files a/customize.dist/bg6.jpg and /dev/null differ diff --git a/customize.dist/bg7.jpg b/customize.dist/bg7.jpg deleted file mode 100644 index a421dfddf..000000000 Binary files a/customize.dist/bg7.jpg and /dev/null differ diff --git a/customize.dist/bg8.jpg b/customize.dist/bg8.jpg deleted file mode 100644 index cdaea07c5..000000000 Binary files a/customize.dist/bg8.jpg and /dev/null differ diff --git a/customize.dist/bg9.jpg b/customize.dist/bg9.jpg deleted file mode 100644 index e36d6705f..000000000 Binary files a/customize.dist/bg9.jpg and /dev/null differ diff --git a/customize.dist/cryptpad-logo-blue-black.png b/customize.dist/cryptpad-logo-blue-black.png deleted file mode 100644 index d4d5ba80c..000000000 Binary files a/customize.dist/cryptpad-logo-blue-black.png and /dev/null differ diff --git a/customize.dist/cryptpad-new-logo-big-white-logoonly.png b/customize.dist/cryptpad-new-logo-big-white-logoonly.png deleted file mode 100644 index b3ab2824c..000000000 Binary files a/customize.dist/cryptpad-new-logo-big-white-logoonly.png and /dev/null differ diff --git a/customize.dist/cryptpad-new-logo-big-white.png b/customize.dist/cryptpad-new-logo-big-white.png deleted file mode 100644 index d4c4c2996..000000000 Binary files a/customize.dist/cryptpad-new-logo-big-white.png and /dev/null differ diff --git a/customize.dist/cryptpad-new-logo-big.png b/customize.dist/cryptpad-new-logo-big.png deleted file mode 100644 index 23fcffcb8..000000000 Binary files a/customize.dist/cryptpad-new-logo-big.png and /dev/null differ diff --git a/customize.dist/images/drive_screenshot.png b/customize.dist/images/drive_screenshot.png new file mode 100644 index 000000000..b1170561c Binary files /dev/null and b/customize.dist/images/drive_screenshot.png differ diff --git a/customize.dist/images/pad_screenshot.png b/customize.dist/images/pad_screenshot.png new file mode 100644 index 000000000..cbc837f58 Binary files /dev/null and b/customize.dist/images/pad_screenshot.png differ diff --git a/customize.dist/pages.js b/customize.dist/pages.js index 6888e817b..abc0fb97f 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -13,6 +13,7 @@ define([ return e; }; +<<<<<<< HEAD var indexContent = function () { return [ h('div.page.category.first#knowmore', [ @@ -77,54 +78,161 @@ define([ ]) ]) ]; +======= + var footerCol = function (title, L, literal) { + return h('div.col', [ + h('ul.list-unstyled', [ + h('li.title', { + 'data-localization': title, + }, title? Msg[title]: literal ) + ].concat(L.map(function (l) { + return h('li', [ l ]); + })) + ) + ]); + }; + + var footLink = function (ref, loc, text) { + var attrs = { + href: ref, + }; + if (!/^\//.test(ref)) { + attrs.target = '_blank'; + attrs.rel = 'noopener noreferrer'; + } + if (loc) { + attrs['data-localization'] = loc; + text = Msg[loc]; + } + return h('a', attrs, text); + }; + + var infopageFooter = function () { + return h('footer', [ + h('div.container', [ + h('div.row', [ + footerCol(null, [ + footLink('/about.html', 'about'), + footLink('/terms.html', 'terms'), + footLink('/privacy.html', 'privacy'), + ], 'CryptPad'), + footerCol('footer_applications', [ + footLink('/drive/', 'main_drive'), + footLink('/pad/', 'main_richText'), + footLink('/code/', 'main_code'), + footLink('/slide/', 'main_slide'), + footLink('/poll/', 'main_poll'), + footLink('/whiteboard/', null, Msg.type.whiteboard) + ]), + footerCol('footer_aboutUs', [ + footLink('https://blog.cryptpad.fr', 'blog'), + footLink('https://labs.xwiki.com', null, 'XWiki Labs'), + footLink('http://www.xwiki.com', null, 'XWiki SAS'), + footLink('https://www.open-paas.org', null, 'OpenPaaS') + ]), + footerCol('footer_contact', [ + footLink('https://riot.im/app/#/room/#cryptpad:matrix.org', null, 'Chat'), + footLink('https://twitter.com/cryptpad', null, 'Twitter'), + footLink('https://github.com/xwiki-labs/cryptpad', null, 'GitHub'), + footLink('/contact.html', null, 'Email') + ]) + ]) + ]), + h('div.cp-version-footer', "CryptPad v1.13.0 (Naiad)") + ]); +>>>>>>> ae176b0465121f57e2147ed0c80c9e62ce65c3a5 }; Pages['/about.html'] = function () { - return h('div#main_other', [ - h('center', [ - h('h1', Msg.about) + return h('div#cp-main.cp-page-about', [ + infopageTopbar(), + h('div.container.cp-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('h2', 'Core Developers'), + h('div.row', [ + h('div.col-md-4', [ + h('img.bio-avatar', {'src': '/customize/images/avatar.png'}), + h('h3', "Aaron MacSween"), + setHTML(h('div#bio'), '
Aaron transitioned into distributed systems development from a background in jazz and live stage performance.
He appreciates the elegance of biological systems and functional programming, and focused on both as a student at the University of Toronto, where he studied cognitive and computer sciences.
He moved to Paris in 2015 to work as a research engineer at XWiki SAS, after having dedicated significant time to various cryptography-related software projects.
He spends his spare time experimenting with guitars, photography, science fiction, and spicy food.
') + ]), + h('div.col-md-4', [ + h('img.bio-avatar', {'src': '/customize/images/avatar.png'}), + h('h3', "Caleb James Delisle"), + setHTML(h('div#bio'), 'Caleb is a cryptography developer, Machine Technology graduate of the Franklin County Technical School and lifelong tinkerer.
In 2011, he started the cjdns Open Source project to show that secure networking could be invisible and easily deployed.
After joining XWiki SAS in 2014, he started the CryptPad project with the intent of bringing the same transparent security to collaborative editing.
He\'s always trying to learn from more experienced colleagues and when someone passes through the Research Team office, his favorite words are "Pull up a chair!".
') + ]), + h('div.col-md-4', [ + h('img.bio-avatar', {'src': '/customize/images/avatar.png'}), + h('h3', "Yann Flory"), + setHTML(h('div#bio'), 'Yann is a mysterious person.
') + ]), + ]), + h('h2', 'Key Contributors'), + h('div.row', [ + h('div.col-md-4', [ + h('img.bio-avatar', {'src': '/customize/images/avatar.png'}), + h('h3', "Pierre Bondoerffer"), + setHTML(h('div#bio'), 'Resident CSS wizard and emoji extraordinaire, Pierre is passionate about anything related to technology. He loves to hack around computers and put parts together.
He is currently studying at 42, where he learns about algorithms, networking, kernel programming and graphics.
As a part of an internship, he joined XWiki SAS and worked on CryptPad to improve user experience. He also maintains the Spanish translation.
') + ]), + h('div.col-md-4', [ + h('img.bio-avatar', {'src': '/customize/images/avatar.png'}), + h('h3', "Catalin Scripcariu"), + setHTML(h('div#bio'), '') + ]), + h('div.col-md-4', [ + h('img.bio-avatar', {'src': '/customize/images/avatar.png'}), + h('h3', "Ludovic Dubost"), + setHTML(h('div#bio'), '') + ]) + ]), ]), - setHTML(h('p'), Msg.main_p2), - h('h2', Msg.main_howitworks), - setHTML(h('p'), Msg.main_howitworks_p1) - ].concat(indexContent())); + infopageFooter() + ]); }; Pages['/privacy.html'] = function () { - return h('div#main_other', [ - h('center', h('h1', Msg.policy_title)), - h('h2', Msg.policy_whatweknow), - h('p', Msg.policywhatweknow_p1), - - h('h2', Msg.policy_howweuse), - h('p', Msg.policy_howweuse_p1), - h('p', Msg.policy_howweuse_p2), + return h('div#cp-main.cp-page-privacy', [ + infopageTopbar(), + h('div.container.cp-container', [ + h('center', h('h1', Msg.policy_title)), + h('h2', Msg.policy_whatweknow), + h('p', Msg.policywhatweknow_p1), - h('h2', Msg.policy_whatwetell), - h('p', Msg.policy_whatwetell_p1), + h('h2', Msg.policy_howweuse), + h('p', Msg.policy_howweuse_p1), + h('p', Msg.policy_howweuse_p2), - h('h2', Msg.policy_links), - h('p', Msg.policy_links_p1), + h('h2', Msg.policy_whatwetell), + h('p', Msg.policy_whatwetell_p1), - h('h2', Msg.policy_ads), - h('p', Msg.policy_ads_p1), + h('h2', Msg.policy_links), + h('p', Msg.policy_links_p1), - h('h2', Msg.policy_choices), - h('p', Msg.policy_choices_open), - setHTML(h('p'), Msg.policy_choices_vpn), + h('h2', Msg.policy_ads), + h('p', Msg.policy_ads_p1), - h('br') + h('h2', Msg.policy_choices), + h('p', Msg.policy_choices_open), + setHTML(h('p'), Msg.policy_choices_vpn), + ]), + infopageFooter() ]); }; Pages['/terms.html'] = function () { - return h('div#main_other', [ - h('center', h('h1', Msg.tos_title)), - h('p', Msg.tos_legal), - h('p', Msg.tos_availability), - h('p', Msg.tos_e2ee), - h('p', Msg.tos_logs), - h('p', Msg.tos_3rdparties), + return h('div#cp-main.cp-page-terms', [ + infopageTopbar(), + h('div.container.cp-container', [ + h('center', h('h1', Msg.tos_title)), + h('p', Msg.tos_legal), + h('p', Msg.tos_availability), + h('p', Msg.tos_e2ee), + h('p', Msg.tos_logs), + h('p', Msg.tos_3rdparties), + ]), + infopageFooter() ]); }; @@ -135,46 +243,40 @@ define([ ]); }; - var userForm = function () { - return h('div#userForm.form-group.hidden', [ - h('input#name.form-control', { - name: 'name', - type: 'text', - placeholder: Msg.login_username - }), - h('input#password.form-control', { - name: 'password', - type: 'password', - placeholder: Msg.login_password - }), - h('div', { - style: { display: 'none' } - }, [ - h('span.remember.form-check', [ - h('label.form-check-label', { - 'for': 'rememberme', - placeholder: Msg.login_remember, - }, [ - h('input#rememberme.form-check-input', { - type: 'checkbox', - checked: true - }) - ]) - ]) + Pages['/what-is-cryptpad.html'] = function () { + return h('div#cp-main.cp-page-what-is-cryptpad', [ + infopageTopbar(), + h('div.container.cp-container', [ + h('center', h('h1', Msg.whatis_title)), + setHTML(h('h2'), Msg.whatis_collaboration), + setHTML(h('p'), Msg.whatis_collaboration_p1), + h('img', { src: '/customize/images/pad_screenshot.png?' + urlArgs }), + setHTML(h('p'), Msg.whatis_collaboration_p2), + setHTML(h('p'), Msg.whatis_collaboration_p3), + setHTML(h('h2'), Msg.whatis_zeroknowledge), + h('div.row', [ + h('div.col-md-4.align-self-center', [ + h('img#zeroknowledge', { src: '/customize/images/zeroknowledge_small.png?' + urlArgs }), + ]), + h('div.col-md-8', [ + setHTML(h('p'), Msg.whatis_zeroknowledge_p1), + setHTML(h('p'), Msg.whatis_zeroknowledge_p2), + setHTML(h('p'), Msg.whatis_zeroknowledge_p3), + ]), + ]), + setHTML(h('h2'), Msg.whatis_drive), + setHTML(h('p'), Msg.whatis_drive_p1), + h('img', { src: '/customize/images/drive_screenshot.png?' + urlArgs }), + setHTML(h('p'), Msg.whatis_drive_p2), + setHTML(h('p'), Msg.whatis_drive_p3), + setHTML(h('h2'), Msg.whatis_business), + setHTML(h('p'), Msg.whatis_business_p1), + setHTML(h('p'), Msg.whatis_business_p2), ]), - h('button.btn.btn-secondary.login.half.first', Msg.login_login), - h('button.btn.btn-success.register.half', Msg.login_register), - h('p.separator', Msg.login_orNoLogin), - h('p#buttons.buttons'), - h('p.driveLink', [ - h('a.gotodrive', { - href: '/drive/' - }, Msg.login_nologin) - ]) + infopageFooter(), ]); }; - var appButton = function (alt, h2, img, p, url, btn, id) { return h('div.app', [ h('center', [ @@ -195,52 +297,9 @@ define([ ]); }; - var tryIt = function () { - return [ - h('div.class.category#tryit', [ - h('center', [ - h('h1', Msg.tryIt) - ]) - ]), - h('div.page', [ - h('div.app-container', [ - h('div.app-row', [ - appButton("Rich Text application", - Msg.main_richText, - '/customize/images/pad.png?' + urlArgs, - Msg.main_richText_p, - '/pad/', - Msg.button_newpad, - 'create-pad'), - appButton('Code application', - Msg.main_code, - '/customize/images/code.png?' + urlArgs, - Msg.main_code_p, - '/code/', - Msg.button_newcode, - 'create-code'), - appButton('Slide application', - Msg.main_slide, - '/customize/images/slide.png?' + urlArgs, - Msg.main_slide_p, - '/slide/', - Msg.button_newslide, - 'create-slide'), - appButton('Poll application', - Msg.main_poll, - '/customize/images/poll.png?' + urlArgs, - Msg.main_poll_p, - '/poll/', - Msg.button_newpoll, - 'create-poll') - ]) - ]) - ]) - ]; - }; - var infopageTopbar = function () { return h('div.cp-topbar', +<<<<<<< HEAD h('div.cp-left', h('a.navbar-brand', { href: 'index.html'}, [ h( 'img', { src: '/customize/CryptPad-white-logo.svg' }) @@ -258,6 +317,35 @@ define([ h('a.cp-login-btn', { href: '/login'}, 'Log in'), h('a.cp-register-btn', { href: '/register'}, 'Register') ]), +======= + h('div.navbar.navbar-toggleable-sm.navbar-light.navbar-inverse', + h('button.navbar-toggler.navbar-toggler-left', {'type':'button'}, {'data-toggle':'collapse'}, {'data-target':'#menuCollapse'}, {'aria-controls': 'menuCollapse'}, {'aria-expanded':'false'}, {'aria-label':'Toggle navigation'}, + [h('i.fa.fa-bars ') + ]), + h('div.collapse.navbar-collapse#menuCollapse', [ + h('ul.navbar-nav', [ + h('a.cp-logo', { href: '/' }, [ + h('img', { src: '/customize/cryptpad-new-logo-colors-logoonly.png?' + urlArgs }) + ]), + h('li.nav-item', [ + h('a.nav-link', { href: '/what-is-cryptpad.html'}, Msg.topbar_whatIsCryptpad), + ]), + h('li.nav-item', [ + h('a.nav-link', { href: 'https://blog.cryptpad.fr/'}, Msg.blog), + ]), + h('li.nav-item', [ + h('a.nav-link', { href: '/contact.html'}, Msg.contact), + ]), + h('li.nav-item', [ + h('a.nav-link', { href: '/about.html'}, Msg.about), + ]), + ]), + ]), + ), + h('div.cp-right', + h('a.cp-register-btn', { href: '/register'}, Msg.login_register), + h('a.cp-login-btn', { href: '/login'}, Msg.login_login) +>>>>>>> ae176b0465121f57e2147ed0c80c9e62ce65c3a5 ) ); } @@ -274,7 +362,6 @@ define([ h('h1', 'CryptPad'), h('p', Msg.main_catch_phrase) ]), - /*userForm(),*/ h('div.col-12.col-sm-6', [ [ [ 'pad', '/pad/', Msg.main_richTextPad, 'fa-file-word-o' ], @@ -317,20 +404,18 @@ define([ ]) ]) ]), - //h('footer.cp-more', "More") ]) ]; - //.concat(tryIt()); }; var loadingScreen = function () { return h('div#loading', h('div.loadingContainer', [ h('img.cryptofist', { - src: '/customize/cryptofist_small.png?' + urlArgs + src: '/customize/cryptpad-new-logo-colors-logoonly.png?' + urlArgs }), h('div.spinnerContainer', - h('span.fa.fa-spinner.fa-pulse.fa-4x.fa-fw')), + h('span.fa.fa-circle-o-notch.fa-spin.fa-4x.fa-fw')), h('p', Msg.loading) ]) ); @@ -342,15 +427,15 @@ define([ }; Pages['/register/'] = Pages['/register/index.html'] = function () { - return [h('div#main', [ - h('div.mainOverlay'), - h('div#align-container', [ - h('div#data.hidden', [ + return [h('div#cp-main.cp-page-register', [ + infopageTopbar(), + h('div.container.cp-container', [ + h('div.row.align-items-center', [ + h('div#data.hidden.col-md-6', [ h('h1', Msg.register_header), - h('br'), - setHTML(h('p.left.register-explanation'), Msg.register_explanation) + setHTML(h('p.register-explanation'), Msg.register_explanation) ]), - h('div#userForm.form-group.hidden', [ + h('div#userForm.form-group.hidden.col-md-6', [ h('input.form-control#username', { type: 'text', autocomplete: 'off', @@ -368,34 +453,38 @@ define([ type: 'password', placeholder: Msg.login_confirm, }), - h('input#import-recent', { - type: 'checkbox', - checked: true - }), - h('label', { - 'for': 'import-recent', - }, Msg.register_importRecent), - h('br'), - h('input#accept-terms', { - type: 'checkbox' - }), - setHTML(h('label', { - 'for': 'accept-terms', - }), Msg.register_acceptTerms), - h('br'), + h('div.checkbox-container', [ + h('input#import-recent', { + type: 'checkbox', + checked: true + }), + h('label', { + 'for': 'import-recent', + }, Msg.register_importRecent), + ]), + h('div.checkbox-container', [ + h('input#accept-terms', { + type: 'checkbox' + }), + setHTML(h('label', { + 'for': 'accept-terms', + }), Msg.register_acceptTerms), + ]), h('button#register.btn.btn-primary', Msg.login_register) ]) - ]) + ]), + ]), + infopageFooter(), ])]; }; Pages['/login/'] = Pages['/login/index.html'] = function () { - return [h('div#main', [ - h('div.mainOverlay'), - h('div#align-container', - h('div#main-container', [ - h('div#data.hidden', setHTML(h('p.left'), Msg.main_info)), - h('div#userForm.form-group.hidden', [ + return [h('div#cp-main.cp-page-login', [ + infopageTopbar(), + h('div.container.cp-container', [ + h('div.row.align-items-center', [ + h('div#data.hidden.col-md-6', setHTML(h('p.left'), Msg.main_info)), + h('div#userForm.form-group.hidden.col-md-6', [ h('input.form-control#name', { name: 'name', type: 'text', @@ -411,14 +500,14 @@ define([ 'name': 'password', placeholder: Msg.login_password, }), - h('button.btn.btn-primary.login.first', Msg.login_login), h('div.extra', [ - h('p', Msg.login_notRegistered), + h('button.btn.btn-primary.login.first', Msg.login_login), h('button#register.btn.btn-success.register', Msg.login_register) ]) ]) - ]) - ) + ]), + ]), + infopageFooter(), ])]; }; diff --git a/customize.dist/src/less/loading.less b/customize.dist/src/less/loading.less index 3f2ac0381..cf93330cb 100644 --- a/customize.dist/src/less/loading.less +++ b/customize.dist/src/less/loading.less @@ -19,6 +19,7 @@ margin-left: auto; margin-right: auto; height: 300px; + margin-bottom: 2em; @media screen and (max-height: @media-short-screen) { display: none; } diff --git a/customize.dist/src/less/variables.less b/customize.dist/src/less/variables.less index 04a753b8d..ad7695c00 100644 --- a/customize.dist/src/less/variables.less +++ b/customize.dist/src/less/variables.less @@ -64,7 +64,7 @@ @slide-default-bg: #000; -@bg-loading: @old-base; +@bg-loading: #222; @color-loading: @old-fore; @media-not-big: 800px; diff --git a/customize.dist/src/less2/include/infopages.less b/customize.dist/src/less2/include/infopages.less index c5d09dabe..a6149b2cd 100644 --- a/customize.dist/src/less2/include/infopages.less +++ b/customize.dist/src/less2/include/infopages.less @@ -1,17 +1,15 @@ @import (once) "./colortheme.less"; @infopages_infobar-height: 64px; +@infopages_padding: 32px; // Basic setup for info pages, this should be used at the global level .infopages_main () { - min-height: 100vh; background-color: @colortheme_info-background; a { color: @colortheme_link-color; - &:visited { - color: @colortheme_link-color-visited; - } + &:visited { color: @colortheme_link-color-visited; } //opacity: 0.8; //transition: opacity 0.2s; } @@ -20,14 +18,86 @@ } border: 0; - padding: 0; - margin: 0; + padding: 0; + margin: 0; - font-size: 14px; + font-size: 14px; font-family: 'Open Sans', 'Helvetica Neue', sans-serif; .cp-container { - padding-top: @infopages_infobar-height; + margin-top: @infopages_infobar-height; + padding-top: @infopages_padding; + padding-bottom: @infopages_padding; + min-height: 75vh; + h1 { + font-size: 3em; + margin-bottom: 0.5em; + } + h2 { + font-size: 2em; + margin-top: 1em; + margin-bottom: 0.5em; + } + h3 { + font-size: 1.5em; + margin-top: 1em; + margin-bottom: 0.5em; + } + + img { + &.left { + float: left; + } + + max-width: 100%; + } + + .form-group { + & > * { + margin-top: 0.5em; + } + + display: flex; + flex-direction: column; + align-items: center; + + .checkbox-container { + width: 100%; + display: flex; + align-items: center; + label { + margin: 0; + } + input { + margin-right: 0.5em; + } + } + } + } + + footer { + background-color: white; + + .container { + .col { + margin-top: 1em; + } + + width: 100%; + text-align: center; + margin-bottom: 1em; + + ul.list-unstyled { + margin: 0; + } + } + + .cp-version-footer { + background-color: @colortheme_info-background; + color: black; + text-align: center; + padding: 0.5em; + } } }; @@ -69,10 +139,22 @@ -webkit-user-select: none; -ms-user-select: none; + .navbar-nav { + display: flex; + align-items: center; + } + a { font-weight: 500; padding: 0.6em; .infopages_link() } + + .cp-logo { + img { + height: @infopages_infobar-height / 2; + } + margin-right: 0.5em; + } } -} \ No newline at end of file +} diff --git a/customize.dist/src/less2/main.less b/customize.dist/src/less2/main.less index 05ee01c8b..068db5c7e 100644 --- a/customize.dist/src/less2/main.less +++ b/customize.dist/src/less2/main.less @@ -5,4 +5,8 @@ div#cp-main.cp-page-index { @import "./pages/page-index.less"; } div#cp-main.cp-page-contact { @import "./pages/page-contact.less"; } div#cp-main.cp-page-login { @import "./pages/page-login.less"; } -div#cp-main.cp-page-register { @import "./pages/page-register.less"; } \ No newline at end of file +div#cp-main.cp-page-register { @import "./pages/page-register.less"; } +div#cp-main.cp-page-what-is-cryptpad { @import "./pages/page-what-is-cryptpad.less"; } +div#cp-main.cp-page-about { @import "./pages/page-about.less"; } +div#cp-main.cp-page-privacy { @import "./pages/page-privacy.less"; } +div#cp-main.cp-page-terms { @import "./pages/page-terms.less"; } diff --git a/customize.dist/src/less2/pages/page-about.less b/customize.dist/src/less2/pages/page-about.less new file mode 100644 index 000000000..7e9cb81a4 --- /dev/null +++ b/customize.dist/src/less2/pages/page-about.less @@ -0,0 +1,12 @@ +@import (once) "../include/infopages.less"; +@import (once) "../include/colortheme.less"; + +.infopages_main(); +.infopages_topbar(); + +.bio-avatar { + border-radius: 50%; + margin: 1em 0; + max-width: 300px; + max-height: 300px; +} diff --git a/customize.dist/src/less2/pages/page-contact.less b/customize.dist/src/less2/pages/page-contact.less index 6c7f0ac04..56a60022c 100644 --- a/customize.dist/src/less2/pages/page-contact.less +++ b/customize.dist/src/less2/pages/page-contact.less @@ -1,4 +1,9 @@ @import (once) "../include/infopages.less"; +@import (once) "../include/colortheme.less"; .infopages_main(); .infopages_topbar(); + +.fa { + padding-right: 0.25em; +} diff --git a/customize.dist/src/less2/pages/page-index.less b/customize.dist/src/less2/pages/page-index.less index bbe43d6ad..cff494bad 100644 --- a/customize.dist/src/less2/pages/page-index.less +++ b/customize.dist/src/less2/pages/page-index.less @@ -13,6 +13,7 @@ color: #FFF; background: linear-gradient( @background_darker, @background_lighter ), url('/customize/bg14.jpg'); background-size: cover; + min-height: 100vh; display: flex; flex-direction: column; justify-content: space-around; @@ -84,6 +85,7 @@ font-size: 1.6rem; } } +<<<<<<< HEAD img { height: 5vh; margin-top: -4px; @@ -93,6 +95,11 @@ transform: none; } }; +======= + a.cp-logo { + display: none; + } +>>>>>>> ae176b0465121f57e2147ed0c80c9e62ce65c3a5 } @callout-padding: 15px; a:hover { @@ -213,10 +220,14 @@ h4 { .navbar-nav a { text-align: right !important; } +<<<<<<< HEAD .cp-right .cp-login-btn { padding: 0.5em; } } .collapsing a { text-align: right !important; -} \ No newline at end of file +} +======= +} +>>>>>>> ae176b0465121f57e2147ed0c80c9e62ce65c3a5 diff --git a/customize.dist/src/less2/pages/page-login.less b/customize.dist/src/less2/pages/page-login.less index e69de29bb..6909ecdc7 100644 --- a/customize.dist/src/less2/pages/page-login.less +++ b/customize.dist/src/less2/pages/page-login.less @@ -0,0 +1,17 @@ +@import (once) "../include/infopages.less"; +@import (once) "../include/colortheme.less"; + +.infopages_main(); +.infopages_topbar(); + +.form-group { + .extra { + display: flex; + align-items: center; + justify-content: space-between; + + width: 100%; + .login { + } + } +} diff --git a/customize.dist/src/less2/pages/page-privacy.less b/customize.dist/src/less2/pages/page-privacy.less new file mode 100644 index 000000000..59fa4b1fd --- /dev/null +++ b/customize.dist/src/less2/pages/page-privacy.less @@ -0,0 +1,5 @@ +@import (once) "../include/infopages.less"; +@import (once) "../include/colortheme.less"; + +.infopages_main(); +.infopages_topbar(); diff --git a/customize.dist/src/less2/pages/page-register.less b/customize.dist/src/less2/pages/page-register.less index e69de29bb..e057e2b20 100644 --- a/customize.dist/src/less2/pages/page-register.less +++ b/customize.dist/src/less2/pages/page-register.less @@ -0,0 +1,23 @@ +@import (once) "../include/infopages.less"; +@import (once) "../include/colortheme.less"; + +.infopages_main(); +.infopages_topbar(); + +.cp-container { + .form-group { + .checkbox-container { + &:nth-of-type(1) { + margin-top: 2em; + } + &:last-of-type { + margin-bottom: 1em; + } + } + #register { + margin-top: 16px; + font-size: 1.25em; + width: 30%; + } + } +} diff --git a/customize.dist/src/less2/pages/page-terms.less b/customize.dist/src/less2/pages/page-terms.less new file mode 100644 index 000000000..59fa4b1fd --- /dev/null +++ b/customize.dist/src/less2/pages/page-terms.less @@ -0,0 +1,5 @@ +@import (once) "../include/infopages.less"; +@import (once) "../include/colortheme.less"; + +.infopages_main(); +.infopages_topbar(); diff --git a/customize.dist/src/less2/pages/page-what-is-cryptpad.less b/customize.dist/src/less2/pages/page-what-is-cryptpad.less new file mode 100644 index 000000000..b57517a01 --- /dev/null +++ b/customize.dist/src/less2/pages/page-what-is-cryptpad.less @@ -0,0 +1,9 @@ +@import (once) "../include/infopages.less"; +@import (once) "../include/colortheme.less"; + +.infopages_main(); +.infopages_topbar(); + +img#zeroknowledge { + width: 100%; +} diff --git a/customize.dist/translations/messages.es.js b/customize.dist/translations/messages.es.js index 987cb5261..f73731b01 100644 --- a/customize.dist/translations/messages.es.js +++ b/customize.dist/translations/messages.es.js @@ -104,7 +104,7 @@ define(function () { out.main_p2 = 'Este proyecto utiliza el editor de texto visual CKEditor, CodeMirror, y el motor en tiempo real ChainPad.'; out.main_howitworks = '¿Cómo funciona?'; out.main_howitworks_p1 = "CryptPad utiliza una variante del algoritmo de transformación operacional (página en inglés) que es capaz de encontrar un consenso distribuido usando un Blockchain Nakamoto (página en inglés), popularizado por Bitcoin. De esta manera el algoritmo puede evitar la necesidad de un servidor central para resolver conflictos de edición de la transformación operacional y sin necesidad de resolver conflictos, el servidor puede mantenerse inconsciente del contenido que se está editando en el pad."; - out.main_about_p2 = 'Si tienes preguntas o comentarios, puedes enviarnos un tweet, abrir un issue en GitHub, saludarnos en nuestro canal IRC (irc.freenode.net), o envianos un email.'; + out.main_about_p2 = 'Si tienes preguntas o comentarios, puedes enviarnos un tweet, abrir un issue en GitHub. saludarnos en nuestro canal Matrix o en IRC (#cryptpad on irc.freenode.net), o envianos un email.'; out.button_newpad = 'Crear nuevo pad de texto enriquezido'; out.button_newcode = 'Crear nuevo pad de código'; @@ -542,5 +542,8 @@ define(function () { out.settings_logoutEverywhereButton = "Cerar sesión"; out.upload_title = "Subir archivo"; + // 1.13.0 - Naiad + out.topbar_whatIsCryptpad = "Qué es CryptPad"; + return out; }); diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js index 1effcfca7..71ea73314 100644 --- a/customize.dist/translations/messages.fr.js +++ b/customize.dist/translations/messages.fr.js @@ -474,7 +474,7 @@ define(function () { out.main_p2 = 'Ce projet utilise l\'éditeur visuel (WYSIWYG) CKEditor, l\'éditeur de code source CodeMirror, et le moteur temps-réel ChainPad.'; out.main_howitworks_p1 = 'CryptPad utilise une variante de l\'algorithme d\'Operational transformation qui est capable de trouver un consensus distribué en utilisant une chaîne de bloc Nakamoto, un outil popularisé par le Bitcoin. De cette manière, l\'algorithme évite la nécessité d\'utiliser un serveur central pour résoudre les conflits d\'édition de l\'Operational Transformation, et sans ce besoin de résolution des conflits le serveur peut rester ignorant du contenu qui est édité dans le pad.'; //contact.html - out.main_about_p2 = 'Si vous avez des questions ou commentaires, vous pouvez nous tweeter, ouvrir une issue sur Github, venir dire bonjour sur IRC (irc.freenode.net), ou nous envoyer un email.'; + out.main_about_p2 = 'Si vous avez des questions ou commentaires, vous pouvez nous tweeter, ouvrir une issue sur GitHub, venir dire bonjour sur notre salle Matrix ou IRC (#cryptpad sur irc.freenode.net), ou bien encore nous envoyer un email.'; out.main_info = "