diff --git a/.jshintignore b/.jshintignore index 45011b5dc..aad5dea36 100644 --- a/.jshintignore +++ b/.jshintignore @@ -9,3 +9,5 @@ www/scratch www/common/toolbar.js www/common/hyperscript.js www/common/tippy.min.js + +www/pad/wysiwygarea-plugin.js diff --git a/config.example.js b/config.example.js index 73444b94c..2602549cc 100644 --- a/config.example.js +++ b/config.example.js @@ -81,23 +81,6 @@ module.exports = { */ websocketPath: '/cryptpad_websocket', - /* it is assumed that your websocket will bind to the same port as http - * you can override this behaviour by supplying a number via websocketPort - */ - //websocketPort: 3000, - - /* if you want to run a different version of CryptPad but using the same websocket - * server, you should use the other server port as websocketPort and disable - * the websockets on that server - */ - //useExternalWebsocket: false, - - /* If CryptPad is proxied without using https, the server needs to know. - * Specify 'useSecureWebsockets: true' so that it can send - * Content Security Policy Headers that prevent http and https from mixing - */ - useSecureWebsockets: false, - /* CryptPad can log activity to stdout * This may be useful for debugging */ @@ -237,14 +220,6 @@ module.exports = { */ suppressRPCErrors: false, - - /* WARNING: EXPERIMENTAL - * - * CryptPad features experimental support for encrypted file upload. - * Our encryption format is still liable to change. As such, we do not - * guarantee that files uploaded now will be supported in the future - */ - /* Setting this value to anything other than true will cause file upload * attempts to be rejected outright. */ diff --git a/customize.dist/bkregister.jpg b/customize.dist/bkregister.jpg new file mode 100644 index 000000000..03660433f Binary files /dev/null and b/customize.dist/bkregister.jpg differ diff --git a/customize.dist/code.svg b/customize.dist/code.svg new file mode 100644 index 000000000..29647b529 --- /dev/null +++ b/customize.dist/code.svg @@ -0,0 +1,14 @@ + + + + + + + + + + diff --git a/customize.dist/images/AaronMacSween.jpg b/customize.dist/images/AaronMacSween.jpg new file mode 100644 index 000000000..2ee96ea6f Binary files /dev/null and b/customize.dist/images/AaronMacSween.jpg differ diff --git a/customize.dist/images/CalebJames.jpg b/customize.dist/images/CalebJames.jpg new file mode 100644 index 000000000..65d5a6cae Binary files /dev/null and b/customize.dist/images/CalebJames.jpg differ diff --git a/customize.dist/images/Catalin.jpg b/customize.dist/images/Catalin.jpg index 3a7cb2f13..109a5404b 100644 Binary files a/customize.dist/images/Catalin.jpg and b/customize.dist/images/Catalin.jpg differ diff --git a/customize.dist/images/LudovicDuboist.jpg b/customize.dist/images/LudovicDuboist.jpg new file mode 100644 index 000000000..6a9988942 Binary files /dev/null and b/customize.dist/images/LudovicDuboist.jpg differ diff --git a/customize.dist/images/Pierre-new.jpg b/customize.dist/images/Pierre-new.jpg index b4fef2583..4f197aeb0 100644 Binary files a/customize.dist/images/Pierre-new.jpg and b/customize.dist/images/Pierre-new.jpg differ diff --git a/customize.dist/images/YannFlory.jpg b/customize.dist/images/YannFlory.jpg new file mode 100644 index 000000000..19d10ec56 Binary files /dev/null and b/customize.dist/images/YannFlory.jpg differ diff --git a/customize.dist/images/atest.jpg b/customize.dist/images/atest.jpg new file mode 100644 index 000000000..4ce7014fe Binary files /dev/null and b/customize.dist/images/atest.jpg differ diff --git a/customize.dist/main.js b/customize.dist/main.js index 2cf0ae61f..4049ec659 100644 --- a/customize.dist/main.js +++ b/customize.dist/main.js @@ -30,6 +30,9 @@ define([ return; } + $main.find('a[href="/drive/"] div.pad-button-text h4') + .text(Messages.main_yourCryptDrive); + var name = localStorage[Cryptpad.userNameKey] || sessionStorage[Cryptpad.userNameKey]; var $loggedInBlock = $main.find('#loggedIn'); var $hello = $loggedInBlock.find('#loggedInHello'); diff --git a/customize.dist/pages.js b/customize.dist/pages.js index de0a9968a..9e2759786 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -46,7 +46,9 @@ 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.

'), + h('div.cp-bio-foot', [ + h('p', Msg.main_footerText) + ]) ], ''), /* footerCol(null, [ footLink('/about.html', 'about'), @@ -84,11 +86,11 @@ define([ var username = window.localStorage.getItem('User_name'); if (username === null) { rightLinks = [ - h('a.nav-item.nav-link.cp-login-btn', { href: '/login'}, Msg.login_login), - h('a.nav-item.nav-link.cp-register-btn', { href: '/register'}, Msg.login_register) + h('a.nav-item.nav-link.cp-login-btn', { href: '/login/'}, Msg.login_login), + h('a.nav-item.nav-link.cp-register-btn', { href: '/register/'}, Msg.login_register) ]; } else { - rightLinks = h('a.nav-item.nav-link.cp-user-btn', { href: '/drive' }, [ + rightLinks = h('a.nav-item.nav-link.cp-user-btn', { href: '/drive/' }, [ h('i.fa.fa-user-circle'), " ", username @@ -121,45 +123,110 @@ define([ ]), ]), 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('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"), - 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.cp-develop-about.col-12',[ + h('div.cp-icon-cent'), + h('h2.text-center', 'Core Developers') + ]), ]), - h('div.col-md-4', [ - h('img.bio-avatar', {'src': '/customize/images/caleb.jpg'}), + h('div.row.align-items-center', [ + h('div.col-12.col-sm-12.col-md-12.col-lg-6.cp-bio-avatar', [ + h('img.img-fluid', {'src': '/customize/images/CalebJames.jpg'}) + ]), + h('div.col-12.col-sm-12.col-md-12.col-lg-6.cp-profile-det', [ 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('hr'), + setHTML(h('div#bioCaleb'), '

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('a.cp-soc-media', { href : 'https://twitter.com/cjdelisle'}, [ + h('i.fa.fa-twitter') + ]), + h('a.cp-soc-media', { href : 'https://github.com/cjdelisle'}, [ + h('i.fa.fa-github') + ]) + ]), + ]), + h('div.row.align-items-center',[ + h('div.col-12.col-sm-12.col-md-12.col-lg-6.push-lg-6.cp-bio-avatar.cp-bio-avatar-right', [ + h('img.img-fluid', {'src': '/customize/images/AaronMacSween.jpg'}) ]), - h('div.col-md-4', [ - h('img.bio-avatar', {'src': '/customize/images/yann.jpg'}), + h('div.col-12.col-sm-12.col-md-12.col-lg-6.pull-lg-6.cp-profile-det',[ + h('h3', "Aaron MacSween"), + h('hr'), + setHTML(h('div#bioAaron'), '

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('a.cp-soc-media', { href : 'https://twitter.com/fc00ansuz'}, [ + h('i.fa.fa-twitter') + ]), + h('a.cp-soc-media', { href : 'https://github.com/ansuz/'}, [ + h('i.fa.fa-github') + ]) + ]), + ]), + h('div.row.align-items-center', [ + h('div.col-12.col-sm-12.col-md-12.col-lg-6.cp-bio-avatar', [ + h('img.img-fluid', {'src': '/customize/images/YannFlory.jpg'}) + ]), + h('div.col-12.col-sm-12.col-md-12.col-lg-6.cp-profile-det', [ h('h3', "Yann Flory"), - setHTML(h('div#bio'), '

Yann is a mysterious person.

') + h('hr'), + setHTML(h('div#bioYann'), '

In 2015, Yann graduated with an engineering degree from Ecole Centrale de Lille majoring in Data Science. In his studies he worked on a project to detect defects in optical fiber using image processing technology.
Upon joining XWiki SAS, Yann developed a Wiki page recommendation system, a common API for accessing data server-side and client-side, and an integrated development environment for development of XWiki applications.
Yann is soft spoken but brutally efficient, he is known to say "It will take 5 minutes".

'), + h('a.cp-soc-media', { href : 'https://github.com/yflory/'}, [ + h('i.fa.fa-github') + ]) ]), ]), - h('h2', 'Key Contributors'), h('div.row', [ - h('div.col-md-4', [ - h('img.bio-avatar', {'src': '/customize/images/Pierre-new.jpg'}), + h('div.cp-develop-about.col-12.cp-contrib',[ + h('div.cp-icon-cent'), + h('h2.text-center', 'Key Contributors') + ]), + ]), + h('div.row.align-items-center', [ + h('div.col-12.col-sm-12.col-md-12.col-lg-6.cp-bio-avatar', [ + h('img.img-fluid', {'src': '/customize/images/Pierre-new.jpg'}) + ]), + h('div.col-12.col-sm-12.col-md-12.col-lg-6.cp-profile-det', [ 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('hr'), + setHTML(h('div#bioPierre'), '

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('a.cp-soc-media', { href : 'https://twitter.com/cjdelisle'}, [ + h('i.fa.fa-twitter') + ]), + h('a.cp-soc-media', { href : 'https://github.com/cjdelisle'}, [ + h('i.fa.fa-github') + ]) + ]), + ]), + h('div.row.align-items-center',[ + h('div.col-12.col-sm-12.col-md-12.col-lg-6.push-lg-6.cp-bio-avatar.cp-bio-avatar-right', [ + h('img.img-fluid', {'src': '/customize/images/Catalin.jpg'}) ]), - h('div.col-md-4', [ - h('img.bio-avatar', {'src': '/customize/images/Catalin.jpg'}), + h('div.col-12.col-sm-12.col-md-12.col-lg-6.pull-lg-6.cp-profile-det',[ h('h3', "Catalin Scripcariu"), - setHTML(h('div#bio'), '

Catalin is a Maths majour and has worked in B2B sales for 12 years. Design was always his passion and 3 years ago he started to dedicate himself to web design and front-end.

At the beginning of 2017 he joined the Xwiki family, where he worked both on the business and the community side of XWiki, including the research team and CryptPad.

') + h('hr'), + setHTML(h('div#bioCatalin'), '

Catalin is a Maths majour and has worked in B2B sales for 12 years. Design was always his passion and 3 years ago he started to dedicate himself to web design and front-end.
At the beginning of 2017 he joined the XWiki, where he worked both on the business and the community side of XWiki, including the research team and CryptPad.

'), + h('a.cp-soc-media', { href : 'https://twitter.com/catalinscr'}, [ + h('i.fa.fa-twitter') + ]), + h('a.cp-soc-media', { href : 'https://www.linkedin.com/in/catalinscripcariu/'}, [ + h('i.fa.fa-linkedin') + ]) ]), - h('div.col-md-4', [ - h('img.bio-avatar', {'src': '/customize/images/ludovic.jpg'}), + ]), + h('div.row.align-items-center.cp-margin-bot', [ + h('div.col-12.col-sm-12.col-md-12.col-lg-6.cp-bio-avatar', [ + h('img.img-fluid', {'src': '/customize/images/LudovicDuboist.jpg'}) + ]), + h('div.col-12.col-sm-12.col-md-12.col-lg-6.cp-profile-det', [ h('h3', "Ludovic Dubost"), - setHTML(h('div#bio'), '

A graduate of PolyTech (X90) and Telecom School in Paris, Ludovic Dubost started his career as a software architect for Netscape Communications Europe. He then became CTO of NetValue, one of the first French start-ups that went public. He left NetValue after the company was purchased by Nielsen/NetRatings and in 2004 launched XWiki, the next generation wiki.

Since the very beginning, Ludovic has been immensely helpful to the CryptPad project. He believed in the idea when there was nothing more than the collaborative pad and his help with sales strategy for the project.

') - ]) + h('hr'), + setHTML(h('div#bioLudovic'), '

A graduate of PolyTech (X90) and Telecom School in Paris, Ludovic Dubost started his career as a software architect for Netscape Communications Europe. He then became CTO of NetValue, one of the first French start-ups that went public. He left NetValue after the company was purchased by Nielsen/NetRatings and in 2004 launched XWiki, the next generation wiki.
Since the very beginning, Ludovic has been immensely helpful to the CryptPad project. He believed in the idea when there was nothing more than the collaborative pad and his help with sales strategy for the project.

'), + h('a.cp-soc-media', { href : 'https://twitter.com/ldubost'}, [ + h('i.fa.fa-twitter') + ]), + h('a.cp-soc-media', { href : 'https://github.com/ldubost'}, [ + h('i.fa.fa-github') + ]) + ]), ]), ]), infopageFooter() @@ -280,7 +347,7 @@ define([ { href: x[1] }, h('div.bs-callout.cp-callout-' + x[0], [ h('i.fa.' + x[3]), - h('div', [ h('h4', x[2]) ]) + h('div.pad-button-text', [ h('h4', x[2]) ]) ]) ]); }), @@ -325,7 +392,6 @@ define([ ]) ); }; - loadingScreen = loadingScreen; // TODO use this Pages['/user/'] = Pages['/user/index.html'] = function () { return h('div#container'); @@ -334,10 +400,18 @@ define([ Pages['/register/'] = Pages['/register/index.html'] = function () { return [h('div#cp-main', [ infopageTopbar(), + h('div.container-fluid.cp-register-wel',[ + h('div.container',[ + h('div.row',[ + h('div.col-12',[ + h('h1.text-center', Msg.register_header) + ]) + ]) + ]) + ]), h('div.container.cp-container', [ - h('div.row.align-items-center', [ + h('div.row.cp-register-det', [ h('div#data.hidden.col-md-6', [ - h('h1', Msg.register_header), setHTML(h('p.register-explanation'), Msg.register_explanation) ]), h('div#userForm.form-group.hidden.col-md-6', [ @@ -381,10 +455,18 @@ define([ 'for': 'accept-terms', }), Msg.register_acceptTerms),*/ ]), - h('button#register.btn.btn-primary', Msg.login_register) + h('button#register.btn.cp-login-register', Msg.login_register) ]) ]), + h('div.row.cp-register-test',[ + h('hr'), + h('div.col-12', [ + setHTML(h('p.test-details'), Msg.register_testimonial), + h('a.cp-test-source.pull-right', { href : 'http://boingboing.net/2016/09/26/cryptpad-a-freeopen-end-to.html'}, Msg.register_testimonial_name) + ]) + ]) ]), + infopageFooter(), ])]; }; @@ -412,8 +494,8 @@ define([ placeholder: Msg.login_password, }), h('div.extra', [ - h('button.btn.btn-primary.login.first', Msg.login_login), - h('button#register.btn.btn-success.register', Msg.login_register) + h('button.login.first.btn', Msg.login_login), + h('button#register.btn.register.cp-login-register', Msg.login_register) ]) ]) ]), diff --git a/customize.dist/source-branch.svg b/customize.dist/source-branch.svg new file mode 100644 index 000000000..b7aff2d83 --- /dev/null +++ b/customize.dist/source-branch.svg @@ -0,0 +1,17 @@ + + + + + + + + + + diff --git a/customize.dist/src/less/cryptpad.less b/customize.dist/src/less/cryptpad.less index 138ba5817..ca1fab6c5 100644 --- a/customize.dist/src/less/cryptpad.less +++ b/customize.dist/src/less/cryptpad.less @@ -4,6 +4,7 @@ @import "../less2/include/alertify.less"; @import "../less2/include/colortheme.less"; @import "../less2/include/modal.less"; +@import "../less2/include/font.less"; @import "./bar.less"; @import "./loading.less"; @import "./dropdown.less"; @@ -12,6 +13,8 @@ @toolbar-green: #5cb85c; +.font_open-sans(); + .alertify_main(); html.cp, .cp body { diff --git a/customize.dist/src/less/footer.less b/customize.dist/src/less/footer.less index fdfc69d7a..97b5bda8c 100644 --- a/customize.dist/src/less/footer.less +++ b/customize.dist/src/less/footer.less @@ -1,7 +1,7 @@ @import "./variables.less"; @import (once) "../less2/include/colortheme.less"; -.cp footer { +footer { background: @category-bg; font-family: @colortheme_font; padding-top: 1em; diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less index a035f5bf0..ff4a2abec 100644 --- a/customize.dist/src/less2/include/alertify.less +++ b/customize.dist/src/less2/include/alertify.less @@ -94,6 +94,7 @@ background-color: @alertify-dialog-bg; &.half { width: 50%; + max-width: 50%; @media (max-width: @browser_media-medium-screen) { width: 100%; } @@ -107,9 +108,9 @@ transform: translateY(-50%); > * { - width: 30%; - min-width: 500px; - max-width: 95%; + width: 100%; + min-width: 300px; + max-width: 500px; margin: 0 auto; text-align: left; padding: @alertify_padding-base; diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less index a62800442..4ecafb27a 100644 --- a/customize.dist/src/less2/include/colortheme.less +++ b/customize.dist/src/less2/include/colortheme.less @@ -66,3 +66,5 @@ @cryptpad_color_blue: #4591C4; @cryptpad_color_grey: #999999; +@cryptpad_header_col: #1E1F1F; +@cryptpad_text_col: #3F4141; \ No newline at end of file diff --git a/customize.dist/src/less2/include/font.less b/customize.dist/src/less2/include/font.less new file mode 100644 index 000000000..b1fdd0b19 --- /dev/null +++ b/customize.dist/src/less2/include/font.less @@ -0,0 +1,9 @@ +.font_neuropolitical () { + @font-face { + font-family: Neuropolitical; + src: url(./customize/fonts/neuropolitical.ttf) + } +} +.font_open-sans () { + @import (once) '/customize/fonts/open-sans.less'; +} diff --git a/customize.dist/src/less2/include/infopages.less b/customize.dist/src/less2/include/infopages.less index db5172c75..6d9b380ed 100644 --- a/customize.dist/src/less2/include/infopages.less +++ b/customize.dist/src/less2/include/infopages.less @@ -6,22 +6,18 @@ // Basic setup for info pages, this should be used at the global level .infopages_main () { background-color: @colortheme_info-background; - a { color: @cryptpad_color_blue; - &:visited { color: darken(@cryptpad_color_blue, 10%); } + &:visited { color: darken(@cryptpad_color_blue, 5%); } } a:hover { opacity: 1; } - border: 0; padding: 0; margin: 0; - font-size: 16px; font-family: @colortheme_font; - .cp-container { font-size: 16px; padding-top: @infopages_padding; @@ -41,24 +37,19 @@ 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; @@ -72,7 +63,6 @@ } } } - footer { background-color: @cryptpad_color_blue; .container { @@ -82,7 +72,7 @@ a { color: #fff; &:visited { - color: darken(#fff, 10%); + color: darken(#fff, 5%); }; } margin-bottom: 1em; @@ -130,12 +120,10 @@ z-index: 9001; position: fixed; top: 0; - display: flex; flex-direction: row; justify-content: space-between; align-items: center; - box-sizing: border-box; width: 100%; height: @infopages_infobar-height; @@ -144,24 +132,20 @@ vertical-align: middle; font-size: 1.25em; line-height: 1.25em; - cursor: default; user-select: none; -moz-user-select: none; -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 { margin-right: 0.5em; } diff --git a/customize.dist/src/less2/main.less b/customize.dist/src/less2/main.less index 2524b6d0f..3cab13fbb 100644 --- a/customize.dist/src/less2/main.less +++ b/customize.dist/src/less2/main.less @@ -1,8 +1,6 @@ -@font-face { - font-family: Neuropolitical; - src: url(./customize/fonts/neuropolitical.ttf) -} -@import (once) '/customize/fonts/open-sans.less'; +@import (once) './include/font.less'; +.font_neuropolitical(); +.font_open-sans(); body.cp-page-index { @import "./pages/page-index.less"; } body.cp-page-contact { @import "./pages/page-contact.less"; } diff --git a/customize.dist/src/less2/pages/page-about.less b/customize.dist/src/less2/pages/page-about.less index afce3ac9e..d356fecd0 100644 --- a/customize.dist/src/less2/pages/page-about.less +++ b/customize.dist/src/less2/pages/page-about.less @@ -3,12 +3,8 @@ .infopages_main(); .infopages_topbar(); - -.bio-avatar { - border-radius: 50%; - margin: 1em 0; - max-width: 300px; - max-height: 300px; +#cp-main { + background: #fff; } .cp-about-intro { padding-top: 3em; @@ -21,7 +17,7 @@ color: #fff; font-family: "Open Sans"; h1 { - font-weight: bold; + font-weight: 700; } a { color: #fff; @@ -31,5 +27,89 @@ padding-top: 1em; } } - -} \ No newline at end of file +} +.cp-container { + .row { + background: #fff; + } + .cp-bio-avatar { + padding-right: 0; + @media (max-width: 991px) { + padding-right: 15px; + } + img { + @media (max-width: 991px) { + margin: 0 auto; + display: block; + } + } + } + .cp-bio-avatar-right { + padding-right: 15px; + padding-left: 0; + @media (max-width: 991px) { + padding-left: 15px; + } + } +} +.cp-develop-about { + .cp-icon-cent { + width: 6rem; + background: #fff; + border-radius: 50%; + height: 6rem; + box-shadow: 0 5px 15px rgba(69,145,196, 0.3); + margin: 0 auto; + background-image: url(/customize/code.svg); + background-repeat: no-repeat; + margin-top: 1em; + margin-bottom: 1.5em; + background-position: 50%; + background-size: 4rem; + } + h2 { + margin-top: 0; + font-weight: 600; + color: #1E1F1F; + margin-bottom: 1.5em; + } +} +.cp-profile-det { + padding-left: 30px; + h3 { + color: #1E1F1F; + font-weight: 700; + } + p { + color: #3F4141; + margin-bottom: 1em; + } + hr { + margin-left: 0; + width: 15rem; + border-top: 2px solid @cryptpad_color_blue; + } + margin-bottom: 1em; +} +.cp-soc-media { + font-size: 1.5em; + color: @cryptpad_color_blue; + padding-right: 1em; + display: inline-block; + &:hover { + transform: scale(1.1); + } + &:visited { + color: @cryptpad_color_blue; + } +} +.cp-contrib { + margin-top: 3em; + .cp-icon-cent { + background-image: url(/customize/source-branch.svg); + background-position: 60%; + } +} +.cp-margin-bot { + margin-bottom: 1.5em; +} diff --git a/customize.dist/src/less2/pages/page-index.less b/customize.dist/src/less2/pages/page-index.less index 84ec8bab6..90a765a4a 100644 --- a/customize.dist/src/less2/pages/page-index.less +++ b/customize.dist/src/less2/pages/page-index.less @@ -25,6 +25,9 @@ } } } +body { + font-family: "Open Sans", Helvetica; +} .cp-right { .cp-register-btn { padding: 0.5em 1em 0.7em 1em; @@ -39,7 +42,7 @@ &:hover { transform: scale(1.05); } - } + } } .cp-title { display: flex; @@ -75,7 +78,7 @@ a { color: #fff; &:visited { - color: rgba(255,255,255,.8); + color: rgba(255,255,255,.9); }; } .nav-link { diff --git a/customize.dist/src/less2/pages/page-login.less b/customize.dist/src/less2/pages/page-login.less index 8bfc79c5c..cbde08893 100644 --- a/customize.dist/src/less2/pages/page-login.less +++ b/customize.dist/src/less2/pages/page-login.less @@ -17,3 +17,62 @@ } } } +.cp-container { + #data { + background: #4591C4; + padding-top: 3em; + padding-bottom: 7em; + padding-left: 30px; + padding-right: 30px; + p { + color: #fff; + } + h2 { + font-weight: 700; + color: @cryptpad_header_col; + } + } + #userForm { + padding-top: 3em; + padding-bottom: 2em; + .form-control { + border-radius: 0; + color: @cryptpad_text_col; + margin-top: 1em; + &:focus { + border-color: @cryptpad_color_blue; + } + } + .checkbox-container { + color: @cryptpad_text_col; + } + } + .align-items-center { + box-shadow: 0 5px 15px rgba(69,145,196, 0.3); + background: #fff; + } + .extra { + margin-top: 1em; + .cp-login-register { + color: @cryptpad_color_blue; + background: #fff; + border: 2px solid @cryptpad_color_blue; + border-radius: 0; + &:hover { + transform: scale(1.05); + } + } + .login { + background: transparent; + color: @cryptpad_color_blue; + padding: 0; + &:hover { + transform: scale(1.05); + } + } + } +} +.cp-container { + padding-top: 0; + min-height: 66vh; +} \ No newline at end of file diff --git a/customize.dist/src/less2/pages/page-register.less b/customize.dist/src/less2/pages/page-register.less index 06a5207c6..82c02edcd 100644 --- a/customize.dist/src/less2/pages/page-register.less +++ b/customize.dist/src/less2/pages/page-register.less @@ -19,14 +19,112 @@ #register { margin-top: 16px; font-size: 1.25em; + min-width: 30%; // conflict? width: 30%; + @media (max-width: 500px) { + width: 45%; + } } } + padding-bottom: 3em; + min-height: 5vh; } - .alertify { // workaround for alertify making empty p p:empty { display: none; } } +.cp-register-wel { + padding-top: 6em; + padding-bottom: 20em; + background-image: url(/customize/bkregister.jpg); + background-size: cover; + background-repeat: no-repeat; + background-position: center; + h1 { + font-weight: 700; + color: #fff; + text-shadow: 0 1px 5px rgba(0,0,0,.2); + } +} +.cp-register-det { + margin-top: -7em; + background: #fff; + box-shadow: 0 5px 15px rgba(69,145,196, 0.3); + #data { + background: #4591C4; /* fallback for old browsers */ + background: -webkit-linear-gradient(to right, #FF7C4F, #4592C4); /* Chrome 10-25, Safari 5.1-6 */ + background: linear-gradient(to right, #FF7C4F, #4592C4); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */ + padding-top: 3em; + padding-bottom: 7em; + padding-left: 30px; + padding-right: 30px; + p { + color: #fff; + li { + margin-bottom: 1em; + } + .fa { + font-size: 1.5em; + padding-right: 10px; + color: #000; + } + } + h3 { + font-weight: 700; + margin-bottom: 1em; + } + } + #userForm { + padding-top: 3em; + padding-bottom: 2em; + .form-control { + border-radius: 0; + color: @cryptpad_text_col; + margin-top: 1em; + &:focus { + border-color: @cryptpad_color_blue; + } + } + .checkbox-container { + color: @cryptpad_text_col; + } + } + .cp-login-register { + color: @cryptpad_color_blue; + background: #fff; + border: 2px solid @cryptpad_color_blue; + border-radius: 0; + &:hover { + transform: scale(1.05); + } + } +} +.cp-register-test { + margin-top: 3em; + hr { + width: 15rem; + border-top: 2px solid @cryptpad_color_blue; + margin-top: 0; + margin-bottom: 2em; + } + p { + margin-bottom: 0; + } + .cp-test-source { + font-style: italic; + } + .test-details { + padding-left: 4em; + background-image: url(/customize/testimonial.svg); + background-repeat: no-repeat; + background-position: left top; + background-size: 3em; + color: @cryptpad_text_col; + } + +} +#cp-main { + background: #fff; +} diff --git a/customize.dist/testimonial.svg b/customize.dist/testimonial.svg new file mode 100644 index 000000000..4c1b0074e --- /dev/null +++ b/customize.dist/testimonial.svg @@ -0,0 +1,19 @@ + + + + +testimonial + + + + + + + diff --git a/customize.dist/translations/messages.es.js b/customize.dist/translations/messages.es.js index 34b0b9f4a..82e7fc0a9 100644 --- a/customize.dist/translations/messages.es.js +++ b/customize.dist/translations/messages.es.js @@ -305,7 +305,7 @@ define(function () { out.codeInitialState = "/*\n Esto es CryptPad, el editor colaborativo en tiempo real zero knowledge.\n Lo que escribes aquí está cifrado de manera que sólo las personas con el enlace pueden acceder a ello.\n Incluso el servidor no puede ver lo que escribes.\n Lo que ves aquí, lo que escuchas aquí, cuando sales, se queda aquí\n*/"; out.slideInitialState = "# CryptSlide\n* Esto es CryptPad, el editor colaborativo en tiempo real zero knowledge.\n* Lo que escribes aquí está cifrado de manera que sólo las personas con el enlace pueden acceder a ello.\n* Incluso el servidor no puede ver lo que escribes.\n* Lo que ves aquí, lo que escuchas aquí, cuando sales, se queda aquí\n\n---\n# Cómo utilizarlo\n1. Escribe tu contenido en Markdown\n - Puedes aprender más sobre Markdown [aquí](http://www.markdowntutorial.com/)\n2. Separa tus diapositivas con ---\n3. Haz clic en \"Presentar\" para ver el resultado - Tus diapositivas se actualizan en tiempo real"; - out.driveReadmeTitle = "¿Qué es CryptDrive?"; + out.driveReadmeTitle = "¿Qué es CryptPad?"; out.readme_welcome = "¡Bienvenido a CryptPad!"; out.readme_p1 = "Bienvenido a CryptPad, aquí podrás anotar cosas solo o con otra gente."; out.readme_p2 = "Este pad es una guía rápida para aprender a usar a CryptPad para tomar notas, organizarlas y trabajar con más personas."; @@ -557,6 +557,27 @@ define(function () { // 1.13.0 - Naiad out.topbar_whatIsCryptpad = "Qué es CryptPad"; - + out.header_homeTitle = "Volver a la página de inicio"; + out.userListButton = "Lista de usuarios"; + out.userAccountButton = "Tu cuenta"; + out.canvas_saveToDrive = "Guardar esta imagen como archivo en tu CryptDrive"; + out.canvas_currentBrush = "Pincel actual"; + out.canvas_chooseColor = "Eligir un color"; + out.fm_viewListButton = "Lista"; + out.fm_viewGridButton = "Cuadrícula"; + out.settings_cat_code = "Código"; + out.settings_codeIndentation = "Indentación del editor de código (espacios)"; + out.settings_codeUseTabs = "Utilizar tabulaciones en vez de espacios"; + out.pad_showToolbar = "Mostrar la barra de herramientas"; + out.pad_hideToolbar = "Esconder la barra de herramientas"; + out.main_catch_phrase = "El Cloud Zero Knowledge"; + out.main_richTextPad = "Pad de Texto Enriquecido"; + out.main_codePad = "Pad de Código"; + out.main_slidePad = "Presentación Markdown"; + out.main_pollPad = "Encuesta"; + out.main_whiteboardPad = "Pizarra"; + out.main_localPads = "Pad Locales"; + out.main_yourCryptDrive = "Tu CryptDrive"; + return out; }); diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js index 5278a8be8..ed955b373 100644 --- a/customize.dist/translations/messages.fr.js +++ b/customize.dist/translations/messages.fr.js @@ -116,6 +116,10 @@ define(function () { out.shareButton = 'Partager'; out.shareSuccess = 'Lien copié dans le presse-papiers'; + out.userListButton = "Liste d'utilisateurs"; + + out.userAccountButton = "Votre compte"; + out.newButton = 'Nouveau'; out.newButtonTitle = 'Créer un nouveau pad'; out.uploadButton = 'Importer des fichiers'; @@ -240,10 +244,13 @@ define(function () { out.canvas_delete = "Supprimer la sélection"; out.canvas_disable = "Désactiver le dessin"; out.canvas_enable = "Activer le dessin"; - out.canvas_width = "Épaisseur"; + out.canvas_width = "Taille"; out.canvas_opacity = "Opacité"; - out.canvas_opacityLabel = "opacité: {0}"; - out.canvas_widthLabel = "taille: {0}"; + out.canvas_opacityLabel = "Opacité: {0}"; + out.canvas_widthLabel = "Taille: {0}"; + out.canvas_saveToDrive = "Sauvegarder cette image en tant que fichier dans CryptDrive"; + out.canvas_currentBrush = "Pinceau actuel"; + out.canvas_chooseColor = "Choisir une couleur"; // Profile out.profileButton = "Profil"; // dropdown menu @@ -257,6 +264,9 @@ define(function () { out.profile_description = "Description"; out.profile_fieldSaved = 'Nouvelle valeur enregistrée: {0}'; + out.profile_inviteButton = "Inviter"; + out.profile_inviteButtonTitle = 'Créer un lien pour inviter cet utilisateur à se connecter avec vous.'; + out.profile_inviteExplanation = "Cliquer sur OK créera un lien vers une session de messagerie sécurisée uniquement accessible par {0}.

Le lien peut être copié et partagé de manière publique."; out.profile_viewMyProfile = "Voir mon profil"; // contacts/userlist @@ -338,6 +348,8 @@ define(function () { out.fm_backup_title = 'Lien de secours'; out.fm_nameFile = 'Comment souhaitez-vous nommer ce fichier ?'; out.fm_error_cantPin = "Erreur interne du serveur. Veuillez recharger la page et essayer de nouveau."; + out.fm_viewListButton = "Liste"; + out.fm_viewGridButton = "Grille"; // File - Context menu out.fc_newfolder = "Nouveau dossier"; out.fc_rename = "Renommer"; @@ -383,8 +395,6 @@ define(function () { out.login_invalPass = 'Mot de passe requis'; out.login_unhandledError = "Une erreur inattendue s'est produite :("; - out.login_notRegistered = 'Pas encore inscrit ?'; - out.register_importRecent = "Importer l'historique (Recommendé)"; out.register_acceptTerms = "J'accepte les conditions d'utilisation"; out.register_passwordsDontMatch = "Les mots de passe doivent être identiques!"; @@ -403,11 +413,12 @@ define(function () { "
  • Vous pouvez importer les pads récents de ce navigateur pour les avoir dans votre compte utilisateur.
    • ", "
  • Si vous utilisez un ordinateur partagé, vous devez vous déconnecter avant de partir, fermer l'onglet n'est pas suffisant.
    • ", "" - ]; + ].join(''); // Settings out.settings_cat_account = "Compte"; out.settings_cat_drive = "CryptDrive"; + out.settings_cat_code = "Code"; out.settings_title = "Préférences"; out.settings_save = "Sauver"; @@ -454,6 +465,9 @@ define(function () { out.settings_logoutEverywhere = "Se déconnecter de force de toutes les autres sessions."; out.settings_logoutEverywhereConfirm = "Êtes-vous sûr ? Vous devrez vous reconnecter sur tous vos autres appareils."; + out.settings_codeIndentation = "Indentation dans l'éditeur de code (nombre d'espaces)"; + out.settings_codeUseTabs = "Utiliser des tabulations au lieu d'espaces"; + out.upload_title = "Hébergement de fichiers"; out.upload_serverError = "Erreur interne: impossible d'importer le fichier pour l'instant."; out.upload_uploadPending = "Vous avez déjà un fichier en cours d'importation. Souhaitez-vous l'annuler et importer ce nouveau fichier ?"; @@ -473,10 +487,14 @@ define(function () { out.todo_title = "CryptTodo"; out.todo_newTodoNamePlaceholder = "Décrivez votre tâche..."; out.todo_newTodoNameTitle = "Ajouter cette tâche à votre liste"; - out.todo_markAsCompleteTitle = "Marquer tâche comme terminée"; - out.todo_markAsIncompleteTitle = "Marquer tâche comme non incomplète"; + out.todo_markAsCompleteTitle = "Marquer cette tâche comme terminée"; + out.todo_markAsIncompleteTitle = "Marquer cette tâche comme incomplète"; out.todo_removeTaskTitle = "Enlever cette tâche de votre liste"; + // pad + out.pad_showToolbar = "Afficher la barre d'outils"; + out.pad_hideToolbar = "Cacher la barre d'outils"; + // general warnings out.warn_notPinned = "Ce pad n'est stocké dans aucun CryptDrive. Il va expirer après 3 mois d'inactivité. En savoir plus..."; @@ -488,7 +506,8 @@ define(function () { //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 notre salle Matrix ou IRC (#cryptpad sur irc.freenode.net), ou bien encore nous envoyer un email.'; - out.main_info = "

    Collaborez avec confiance


    Développez vos idées en groupe avec des document partagés; la technologie Zero Knowledge sécurise vos données."; + out.main_info = "

    Collaborez avec confiance


    Développez vos idées en groupe avec des documents partagés; la technologie Zero Knowledge sécurise vos données."; + out.main_catch_phrase = "Le Cloud Zero Knowledge"; out.main_howitworks = 'Comment ça fonctionne'; out.main_zeroKnowledge = 'Zero Knowledge'; @@ -510,6 +529,15 @@ define(function () { out.main_poll_p = 'Plannifiez vos réunions ou évènements, ou votez pour la meilleure solution concernant votre problème.'; out.main_drive = 'CryptDrive'; + out.main_richTextPad = 'Pad de Texte Riche'; + out.main_codePad = 'Pad de Code'; + out.main_slidePad = 'Présentation Markdown'; + out.main_pollPad = 'Sondage ou Planning'; + out.main_whiteboardPad = 'Tableau blanc'; + out.main_localPads = 'Pads Locaux'; + out.main_yourCryptDrive = 'Votre CryptDrive'; + out.main_footerText = "Avec CryptPad, vous pouvez créer des documents collaboratifs rapidement pour prendre des notes à plusieurs."; + out.footer_applications = "Applications"; out.footer_contact = "Contact"; out.footer_aboutUs = "À propos"; @@ -562,6 +590,7 @@ define(function () { out.header_support = ' OpenPaaS-ng'; out.updated_0_header_logoTitle = 'Retourner vers votre CryptDrive'; out.header_logoTitle = out.updated_0_header_logoTitle; + out.header_homeTitle = "Aller sur la page d'accueil"; // Initial states @@ -602,7 +631,7 @@ define(function () { ' - La présentation est mise à jour en temps-réel' ].join(''); - out.driveReadmeTitle = "Qu'est-ce que CryptDrive ?"; + out.driveReadmeTitle = "Qu'est-ce que CryptPad ?"; out.readme_welcome = "Bienvenue dans CryptPad !"; out.readme_p1 = "Bienvenue dans CryptPad, le lieu où vous pouvez prendre des notes seul ou avec des amis."; out.readme_p2 = "Ce pad va vous donner un aperçu de la manière dont vous pouvez utiliser CryptPad pour prendre des notes, les organiser et travailler en groupe sur celles-ci."; diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js index 7c5c64ceb..262f9890c 100644 --- a/customize.dist/translations/messages.js +++ b/customize.dist/translations/messages.js @@ -336,10 +336,10 @@ define(function () { out.updated_0_fm_info_trash = 'Empty your trash to free space in your CryptDrive.'; out.fm_info_trash = out.updated_0_fm_info_trash; out.fm_info_allFiles = 'Contains all the files from "Documents", "Unsorted" and "Trash". You can\'t move or remove files from here.'; // Same here - out.fm_info_anonymous = 'You are not logged in so these pads may be deleted (find out why). ' + + out.fm_info_anonymous = 'You are not logged in so your pads will expire after 3 months (find out more). ' + 'Sign up or Log in to keep them alive.'; out.fm_alert_backupUrl = "Backup link for this drive.
    " + - "It is highly recommended that you keep ip for yourself only.
    " + + "It is highly recommended that you keep it secret.
    " + "You can use it to retrieve all your files in case your browser memory got erased.
    " + "Anybody with that link can edit or remove all the files in your file manager.
    "; out.fm_alert_anonymous = "Hello there, you are currently using CryptPad anonymously, that's ok but your pads may be deleted after a period of " + @@ -404,13 +404,15 @@ define(function () { out.register_header = "Welcome to CryptPad"; out.register_explanation = [ - "

    Lets go over a couple things first

    ", - "