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..0648650fd 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..78f6b274a 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..2567a5382 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..de16b3e02 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..6974aa5a3 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..47ae1a34f 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/pages.js b/customize.dist/pages.js index 082ece252..a5c6982f1 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -126,40 +126,112 @@ define([ ]), 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'), '

Yann is a mysterious person.

'), + h('a.cp-soc-media', { href : 'https://twitter.com/'}, [ + h('i.fa.fa-twitter') + ]), + 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() 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/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/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/pages/page-about.less b/customize.dist/src/less2/pages/page-about.less index afce3ac9e..3028b6741 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,77 @@ padding-top: 1em; } } - -} \ No newline at end of file +} +.cp-container { + .row { + background: #fff; + } + .cp-bio-avatar { + padding-right: 0; + } + .cp-bio-avatar-right { + padding-right: 15px; + padding-left: 0; + } +} +.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..daf84bc3d 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; @@ -75,7 +78,7 @@ a { color: #fff; &:visited { - color: rgba(255,255,255,.8); + color: rgba(255,255,255,.9); }; } .nav-link {